From 8a58de2b72b6fd959e23297fc06ab25ac63acf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 7 Nov 2016 01:23:17 +0100 Subject: [PATCH] Version 16.47.13 --- swad_changelog.h | 3 ++- swad_user.c | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 604cef8fe..237fe02ce 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.47.12 (2016-11-07)" +#define Log_PLATFORM_VERSION "SWAD 16.47.13 (2016-11-07)" #define CSS_FILE "swad16.32.1.css" #define JS_FILE "swad16.46.1.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 16.47.13: Nov 07, 2016 Icon in list of guests to show figure (statistics). (206295 lines) Version 16.47.12: Nov 07, 2016 Icon in list of teachers to show figure (statistics). (206278 lines) Version 16.47.11: Nov 07, 2016 Icon in list of students to show figure (statistics). (206262 lines) Version 16.47.10: Nov 07, 2016 Icon in list of surveys to show figure (statistics). (206246 lines) diff --git a/swad_user.c b/swad_user.c index 023d79eab..c95f3cd92 100644 --- a/swad_user.c +++ b/swad_user.c @@ -178,6 +178,7 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void); static void Usr_PutLinkToSeeAdmins (void); static void Usr_PutLinkToSeeGuests (void); +static void Usr_PutIconsListGsts (void); static void Usr_PutIconsListStds (void); static void Usr_PutIconsListTchs (void); @@ -6733,10 +6734,7 @@ void Usr_SeeGuests (void) Usr_GetListsSelectedUsrsCods (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], - (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) ? (Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs ? Usr_PutIconToPrintGsts : - NULL) : - Usr_PutIconToShowGstsAllData); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN],Usr_PutIconsListGsts); /***** Form to select range of guests *****/ switch (Gbl.Usrs.Me.LoggedRole) @@ -7113,6 +7111,27 @@ void Usr_SeeTeachers (void) Usr_FreeUsrsList (Rol_TEACHER); } +/*****************************************************************************/ +/***************** Put contextual icons in list of guests ********************/ +/*****************************************************************************/ + +static void Usr_PutIconsListGsts (void) + { + if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) + { + if (Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs) + /***** Put icon to print guests *****/ + Usr_PutIconToPrintGsts (); + } + else + /***** Put icon to show all data of guests *****/ + Usr_PutIconToShowGstsAllData (); + + /***** Put icon to show a figure *****/ + Gbl.Stat.FigureType = Sta_USERS; + Sta_PutIconToShowFigure (); + } + /*****************************************************************************/ /**************** Put contextual icons in list of students *******************/ /*****************************************************************************/