diff --git a/icon/iconset/awesome/file-signature.svg b/icon/iconset/awesome/file-signature.svg new file mode 100644 index 00000000..bddd6af1 --- /dev/null +++ b/icon/iconset/awesome/file-signature.svg @@ -0,0 +1 @@ + diff --git a/icon/iconset/nuvola/file-signature.png b/icon/iconset/nuvola/file-signature.png new file mode 100644 index 00000000..10354feb Binary files /dev/null and b/icon/iconset/nuvola/file-signature.png differ diff --git a/swad_action.c b/swad_action.c index 90dcaf8b..61d110bc 100644 --- a/swad_action.c +++ b/swad_action.c @@ -546,7 +546,7 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = [ActSeeAsg ] = { 801, 1,TabAss,ActSeeAsg ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_SeeAssignments ,"edit" }, [ActSeePrj ] = {1674, 2,TabAss,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_SeeProjects ,"file-invoice" }, [ActReqTst ] = { 103, 3,TabAss,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_RequestTest ,"check" }, - [ActSeeAllExa ] = {1848, 4,TabAss,ActSeeAllExa ,0x200,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Exa_SeeAllExams ,"file-contract" }, + [ActSeeAllExa ] = {1848, 4,TabAss,ActSeeAllExa ,0x200,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Exa_SeeAllExams ,"file-signature" }, [ActSeeAllGam ] = {1649, 4,TabAss,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Gam_SeeAllGames ,"gamepad" }, [ActSeeAllSvy ] = { 966, 5,TabAss,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_SeeAllSurveys ,"poll" }, [ActSeeAllExaAnn ] = { 85, 6,TabAss,ActSeeAllExaAnn ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ExaAnn_ListExamAnnouncementsSee,"bullhorn" }, diff --git a/swad_changelog.h b/swad_changelog.h index 91181535..eb1eb11b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.192 (2020-04-22)" +#define Log_PLATFORM_VERSION "SWAD 19.192.1 (2020-04-22)" #define CSS_FILE "swad19.190.css" #define JS_FILE "swad19.172.1.js" /* @@ -552,6 +552,11 @@ Funci // TODO: Cambiar icono notificaciones nuevas con "bell-on.svg" // TODO: Ahmed El Moukhtari Koubaa: Cuando le damos a la opción de mostrar solo los mensajes no leídos, se muestran estos mensajes, pero cuando los intentamos leer, es decir, hacemos clic sobre ellos se recarga toda la página por así decirlo y vuelve a dar una lista con los mensajes, pero descartando aquel que clicamos porque, entiendo yo al menos, que ya lo ha marcado como leído. + Version 19.192.1: Apr 22, 2020 Changed icon for exams. (296807 lines) + Copy the following 2 icons to icon public directory: +sudo cp icon/iconset/awesome/file-signature.svg /var/www/html/swad/icon/iconset/awesome +sudo cp icon/iconset/nuvola/file-signature.png /var/www/html/swad/icon/iconset/nuvola + Version 19.192: Apr 22, 2020 Changes in exams. (296803 lines) Copy the following 4 icons to icon public directory: sudo cp icon/iconset/awesome/file-contract.svg /var/www/html/swad/icon/iconset/awesome diff --git a/swad_exam.c b/swad_exam.c index db2111ef..0b3af50c 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -2552,7 +2552,7 @@ static bool Exa_CheckIfEditable (const struct Exa_Exam *Exam) /********************* Put button to create a new match **********************/ /*****************************************************************************/ -void Exa_PutButtonNewMatch (struct Exa_Exams *Exams,long ExaCod) +void Exa_PutButtonNewEvent (struct Exa_Exams *Exams,long ExaCod) { extern const char *Txt_New_match; diff --git a/swad_exam.h b/swad_exam.h index 886747df..21dd317a 100644 --- a/swad_exam.h +++ b/swad_exam.h @@ -155,7 +155,7 @@ void Exa_RemoveQst (void); void Exa_MoveUpQst (void); void Exa_MoveDownQst (void); -void Exa_PutButtonNewMatch (struct Exa_Exams *Exams,long ExaCod); +void Exa_PutButtonNewEvent (struct Exa_Exams *Exams,long ExaCod); void Exa_RequestNewEvent (void); unsigned Exa_GetNumCoursesWithExams (Hie_Level_t Scope); diff --git a/swad_exam_event.c b/swad_exam_event.c index 0967c02d..c32aa3aa 100644 --- a/swad_exam_event.c +++ b/swad_exam_event.c @@ -141,7 +141,7 @@ static void ExaEvt_RemoveUsrEvtResultsInCrs (long UsrCod,long CrsCod,const char static void ExaEvt_PutParamsPlay (void *EvtCod); static void ExaEvt_PutParamEvtCod (long EvtCod); -static void ExaEvt_PutFormNewMatch (const struct Exa_Exam *Exam); +static void ExaEvt_PutFormNewEvent (const struct Exa_Exam *Exam); static void ExaEvt_ShowLstGrpsToCreateEvent (void); static long ExaEvt_CreateEvent (long ExaCod,char Title[Exa_MAX_BYTES_TITLE + 1]); @@ -334,9 +334,9 @@ void ExaEvt_ListEvents (struct Exa_Exams *Exams, case Rol_TCH: case Rol_SYS_ADM: if (PutFormNewEvent) - ExaEvt_PutFormNewMatch (Exam); // Form to fill in data and start playing a new exam event + ExaEvt_PutFormNewEvent (Exam); // Form to fill in data and start playing a new exam event else - Gam_PutButtonNewMatch (Exams,Exam->ExaCod); // Button to create a new exam event + Exa_PutButtonNewEvent (Exams,Exam->ExaCod); // Button to create a new exam event break; default: break; @@ -875,8 +875,8 @@ void ExaEvt_ToggleVisibilResultsEvtUsr (void) struct Exa_Exam Exam; struct ExaEvt_Event Event; - /***** Reset games *****/ - Gam_ResetGames (&Exams); + /***** Reset exams *****/ + Exa_ResetExams (&Exams); /***** Get and check parameters *****/ ExaEvt_GetAndCheckParameters (&Exams,&Exam,&Event); @@ -896,7 +896,7 @@ void ExaEvt_ToggleVisibilResultsEvtUsr (void) Event.EvtCod); /***** Show current exam *****/ - Gam_ShowOnlyOneGame (&Exams,&Exam, + Exa_ShowOnlyOneExam (&Exams,&Exam, false, // Do not list exam questions false); // Do not put form to start new exam event } @@ -1017,8 +1017,8 @@ void ExaEvt_RequestRemoveEvent (void) struct Exa_Exam Exam; struct ExaEvt_Event Event; - /***** Reset games *****/ - Gam_ResetGames (&Exams); + /***** Reset exams *****/ + Exa_ResetExams (&Exams); /***** Get and check parameters *****/ ExaEvt_GetAndCheckParameters (&Exams,&Exam,&Event); @@ -1033,7 +1033,7 @@ void ExaEvt_RequestRemoveEvent (void) Event.Title); /***** Show current exam *****/ - Gam_ShowOnlyOneGame (&Exams,&Exam, + Exa_ShowOnlyOneExam (&Exams,&Exam, false, // Do not list exam questions false); // Do not put form to start new exam event } @@ -1049,8 +1049,8 @@ void ExaEvt_RemoveEvent (void) struct Exa_Exam Exam; struct ExaEvt_Event Event; - /***** Reset games *****/ - Gam_ResetGames (&Exams); + /***** Reset exams *****/ + Exa_ResetExams (&Exams); /***** Get and check parameters *****/ ExaEvt_GetAndCheckParameters (&Exams,&Exam,&Event); @@ -1067,7 +1067,7 @@ void ExaEvt_RemoveEvent (void) Event.Title); /***** Show current exam *****/ - Gam_ShowOnlyOneGame (&Exams,&Exam, + Exa_ShowOnlyOneExam (&Exams,&Exam, false, // Do not list exam questions false); // Do not put form to start new exam event } @@ -1253,10 +1253,10 @@ void ExaEvt_GetAndCheckParameters (struct Exa_Exams *Exams, { /***** Get parameters *****/ /* Get parameters of exam */ - if ((Exam->ExaCod = Gam_GetParams (Exams)) <= 0) + if ((Exam->ExaCod = Exa_GetParams (Exams)) <= 0) Lay_ShowErrorAndExit ("Code of exam is missing."); Grp_GetParamWhichGroups (); - Gam_GetDataOfGameByCod (Exam); + Exa_GetDataOfExamByCod (Exam); /* Get exam event code */ if ((Event->EvtCod = ExaEvt_GetParamEvtCod ()) <= 0) @@ -1284,7 +1284,7 @@ long ExaEvt_GetParamEvtCod (void) /* Put a big button to play exam event (start a new exam event) as a teacher */ /*****************************************************************************/ -static void ExaEvt_PutFormNewMatch (const struct Exa_Exam *Exam) +static void ExaEvt_PutFormNewEvent (const struct Exa_Exam *Exam) { extern const char *Hlp_ASSESSMENT_Games_matches; extern const char *Txt_New_match; @@ -1416,7 +1416,7 @@ void ExaEvt_CreateNewEventTch (void) /* Get exam event title */ Par_GetParToText ("Title",Title,Exa_MAX_BYTES_TITLE); - /* Get groups for this games */ + /* Get groups for this exams */ Grp_GetParCodsSeveralGrps (); /***** Create a new exam event *****/ @@ -3129,7 +3129,7 @@ static bool ExaEvt_ShowQuestionAndAnswersStd (const struct ExaEvt_Event *Event, unsigned NumOpt; char *Class; - /***** Trivial check: this question must be valid for games *****/ + /***** Trivial check: this question must be valid for exams *****/ if (!Tst_CheckIfQuestionIsValidForGame (Event->Status.QstCod)) return false; diff --git a/swad_exam_result.c b/swad_exam_result.c index 0d81ad85..c9993f76 100644 --- a/swad_exam_result.c +++ b/swad_exam_result.c @@ -1122,7 +1122,7 @@ void ExaRes_ShowOneExaResult (void) { /***** Get questions and user's answers of the event result from database *****/ ExaRes_GetExamResultQuestionsFromDB (Event.EvtCod,UsrDat->UsrCod, - &Exam); + &Result); /***** Begin box *****/ Box_BoxBegin (NULL,Event.Title,