diff --git a/swad_attendance.c b/swad_attendance.c index 1782ae297..65cba5542 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -88,14 +88,12 @@ static void Att_PutIconsInListOfAttEvents (void); static void Att_PutIconToCreateNewAttEvent (void); static void Att_PutButtonToCreateNewAttEvent (void); static void Att_PutParamsToCreateNewAttEvent (void); +static void Att_PutParamsToListUsrsAttendance (void); + static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAttEventComplete); static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att); static void Att_GetParamAttOrder (void); -static void Att_PutFormToListMyAttendance (void); -static void Att_PutFormToListStdsAttendance (void); -static void Att_PutFormToListStdsParams (void); - static void Att_PutFormsToRemEditOneAttEvent (const struct AttendanceEvent *Att, const char *Anchor); static void Att_PutParams (void); @@ -172,27 +170,6 @@ void Att_SeeAttEvents (void) /***** Get list of attendance events *****/ Att_GetListAttEvents (Att_NEWEST_FIRST); - /***** Contextual menu *****/ - if (Gbl.AttEvents.Num && - Gbl.Usrs.Me.UsrDat.Nickname[0]) - switch (Gbl.Usrs.Me.Role.Logged) - { - case Rol_STD: - Mnu_ContextMenuBegin (); - Att_PutFormToListMyAttendance (); // List my attendance - Mnu_ContextMenuEnd (); - break; - case Rol_NET: - case Rol_TCH: - case Rol_SYS_ADM: - Mnu_ContextMenuBegin (); - Att_PutFormToListStdsAttendance (); // List students' attendance - Mnu_ContextMenuEnd (); - break; - default: - break; - } - /***** Show all the attendance events *****/ Att_ShowAllAttEvents (); } @@ -325,6 +302,23 @@ static void Att_PutIconsInListOfAttEvents (void) if (ICanEdit) Att_PutIconToCreateNewAttEvent (); + /***** Put icon to show attendance list *****/ + if (Gbl.AttEvents.Num) + switch (Gbl.Usrs.Me.Role.Logged) + { + case Rol_STD: + Ico_PutContextualIconToShowAttendanceList (ActSeeLstMyAtt,NULL); + break; + case Rol_NET: + case Rol_TCH: + case Rol_SYS_ADM: + Ico_PutContextualIconToShowAttendanceList (ActReqLstUsrAtt, + Att_PutParamsToListUsrsAttendance); + break; + default: + break; + } + /***** Put icon to print my QR code *****/ QR_PutLinkToPrintQRCode (ActPrnUsrQR,Usr_PutParamMyUsrCodEncrypted); } @@ -368,6 +362,17 @@ static void Att_PutParamsToCreateNewAttEvent (void) Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); } +/*****************************************************************************/ +/***************** Put parameters to list users attendance *******************/ +/*****************************************************************************/ + +static void Att_PutParamsToListUsrsAttendance (void) + { + Att_PutHiddenParamAttOrder (); + Grp_PutParamWhichGrps (); + Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); + } + /*****************************************************************************/ /************************* Show one attendance event *************************/ /*****************************************************************************/ @@ -532,40 +537,6 @@ void Att_PutHiddenParamAttOrder (void) Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Gbl.AttEvents.SelectedOrder); } -/*****************************************************************************/ -/**** Put a link (form) to list assistance of students to several events *****/ -/*****************************************************************************/ - -static void Att_PutFormToListMyAttendance (void) - { - extern const char *Txt_Attendance_list; - - Lay_PutContextualLinkIconText (ActSeeLstMyAtt,NULL,NULL, - "list-ol.svg", - Txt_Attendance_list); - } - -/*****************************************************************************/ -/** Put a link (form) to list my assistance (as student) to several events ***/ -/*****************************************************************************/ - -static void Att_PutFormToListStdsAttendance (void) - { - extern const char *Txt_Attendance_list; - - Lay_PutContextualLinkIconText (ActReqLstUsrAtt,NULL, - Att_PutFormToListStdsParams, - "list-ol.svg", - Txt_Attendance_list); - } - -static void Att_PutFormToListStdsParams (void) - { - Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps (); - Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); - } - /*****************************************************************************/ /************** Put a link (form) to edit one attendance event ***************/ /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 8e06ec7e3..975618485 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,7 +490,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.85 (2019-12-06)" +#define Log_PLATFORM_VERSION "SWAD 19.85.1 (2019-12-06)" #define CSS_FILE "swad19.85.css" #define JS_FILE "swad19.70.js" /* @@ -498,6 +498,7 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: En cada juego, poder listar los resultados en una tabla como la de resultados globales + Version 19.85.1: Dec 06, 2019 Contextual icon to show users' attendance. (247840 lines) Version 19.85: Dec 06, 2019 Changes in layout of pagination. Code refactoring in surveys. (247855 lines) Version 19.84.3: Dec 06, 2019 Contextual icon to show matches results. diff --git a/swad_icon.c b/swad_icon.c index 2be435bb9..664c710eb 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -335,6 +335,15 @@ void Ico_PutContextualIconToShowResults (Act_Action_t NextAction,void (*FuncPara Txt_Results); } +void Ico_PutContextualIconToShowAttendanceList (Act_Action_t NextAction,void (*FuncParams) (void)) + { + extern const char *Txt_Attendance_list; + + Lay_PutContextualLinkOnlyIcon (NextAction,NULL,FuncParams, + "list-ol.svg", + Txt_Attendance_list); + } + void Ico_PutContextualIconToZIP (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Txt_Create_ZIP_file; diff --git a/swad_icon.h b/swad_icon.h index a8c9a7a5e..6dce986b5 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -70,6 +70,7 @@ void Ico_PutContextualIconToCopy (Act_Action_t NextAction,void (*FuncParams) (vo void Ico_PutContextualIconToPaste (Act_Action_t NextAction,void (*FuncParams) (void)); void Ico_PutContextualIconToCreateInFolder (Act_Action_t NextAction,void (*FuncParams) (void),bool Open); void Ico_PutContextualIconToShowResults (Act_Action_t NextAction,void (*FuncParams) (void)); +void Ico_PutContextualIconToShowAttendanceList (Act_Action_t NextAction,void (*FuncParams) (void)); void Ico_PutContextualIconToZIP (Act_Action_t NextAction,void (*FuncParams) (void)); void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title);