From 77509727924f2eff67224655ca1d046e6b74c25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 18 Mar 2016 21:28:45 +0100 Subject: [PATCH] Version 15.150.9 --- swad_changelog.h | 3 +- swad_user.c | 188 +++++++++++++++++++++++------------------------ 2 files changed, 94 insertions(+), 97 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index bd015a461..bd0afd8e9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.150.8 (2016-03-18)" +#define Log_PLATFORM_VERSION "SWAD 15.150.9 (2016-03-18)" #define CSS_FILE "swad15.150.2.css" #define JS_FILE "swad15.131.3.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 15.150.9: Mar 18, 2016 Icons to print/show-all students/teachers integrated in frame. (195957 lines) Version 15.150.8: Mar 18, 2016 Icons to print/show-all guests integrated in frame. (195967 lines) Version 15.150.7: Mar 18, 2016 Icon to print degree configuration integrated in frame. (195970 lines) Version 15.150.6: Mar 18, 2016 Icon to print centre configuration integrated in frame. (195959 lines) diff --git a/swad_user.c b/swad_user.c index 860203891..d0e22920e 100644 --- a/swad_user.c +++ b/swad_user.c @@ -172,11 +172,16 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void); static void Usr_PutLinkToSeeAdmins (void); static void Usr_PutLinkToSeeGuests (void); -static void Usr_PutIconToPrintGuests (void); -static void Usr_PutIconToShowAllDataGuests (void); -static void Usr_PutLinkToShowGuestsAllDataParams (void); -static void Usr_PutLinkToShowStdsAllDataParams (void); -static void Usr_PutLinkToShowTchsAllDataParams (void); + +static void Usr_PutIconToPrintGsts (void); +static void Usr_PutIconToPrintStds (void); +static void Usr_PutIconToPrintTchs (void); +static void Usr_PutIconToShowGstsAllData (void); +static void Usr_PutIconToShowStdsAllData (void); +static void Usr_PutIconToShowTchsAllData (void); +static void Usr_ShowGstsAllDataParams (void); +static void Usr_ShowStdsAllDataParams (void); +static void Usr_ShowTchsAllDataParams (void); static void Usr_PutLinkToListOfficialStudents (void); @@ -6661,8 +6666,8 @@ void Usr_SeeGuests (void) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], - (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) ? Usr_PutIconToPrintGuests : - Usr_PutIconToShowAllDataGuests); + (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) ? Usr_PutIconToPrintGsts : + Usr_PutIconToShowGstsAllData); /***** Form to select type of list of users *****/ Usr_ShowFormsToSelectUsrListType (ActLstGst); @@ -6718,42 +6723,6 @@ void Usr_SeeGuests (void) Usr_FreeUsrsList (&Gbl.Usrs.LstGsts); } -static void Usr_PutIconToPrintGuests (void) - { - extern const char *Txt_Print; - - Lay_PutContextualLink (ActPrnGstPho,Usr_PutLinkToShowGuestsAllDataParams, - "print64x64.png",Txt_Print,NULL); - } - -static void Usr_PutIconToShowAllDataGuests (void) - { - extern const char *Txt_Show_all_data; - - Lay_PutContextualLink (ActLstGstAll,Usr_PutLinkToShowGuestsAllDataParams, - "table64x64.gif",Txt_Show_all_data,NULL); - } - -static void Usr_PutLinkToShowGuestsAllDataParams (void) - { - Usr_PutParamListWithPhotos (); - Usr_PutExtraParamsUsrList (ActLstGstAll); - } - -static void Usr_PutLinkToShowStdsAllDataParams (void) - { - Grp_PutParamsCodGrps (); - Usr_PutParamListWithPhotos (); - Usr_PutExtraParamsUsrList (ActLstStdAll); - } - -static void Usr_PutLinkToShowTchsAllDataParams (void) - { - Sco_PutParamScope (Gbl.Scope.Current); - Usr_PutParamListWithPhotos (); - Usr_PutExtraParamsUsrList (ActLstTchAll); - } - /*****************************************************************************/ /******************** Show list or class photo of students *******************/ /*****************************************************************************/ @@ -6762,8 +6731,6 @@ void Usr_SeeStudents (void) { extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Scope; - extern const char *Txt_Print; - extern const char *Txt_Show_all_data; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Show_records; bool ICanViewRecords; @@ -6846,31 +6813,11 @@ void Usr_SeeStudents (void) /***** Get list of selected users *****/ Usr_GetListsSelectedUsrs (); - switch (Gbl.Usrs.Me.ListType) - { - case Usr_CLASS_PHOTO: - /***** Link to print view *****/ - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActPrnStdPho,Usr_PutLinkToShowStdsAllDataParams, - "print64x64.png", - Txt_Print,Txt_Print); - fprintf (Gbl.F.Out,"
"); - break; - case Usr_LIST: - if (Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER) - { - /****** Link to show all the data ******/ - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActLstStdAll,Usr_PutLinkToShowStdsAllDataParams, - "table64x64.gif", - Txt_Show_all_data,Txt_Show_all_data); - fprintf (Gbl.F.Out,"
"); - } - break; - } - /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],NULL); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN], + (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) ? Usr_PutIconToPrintStds : + ((Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER) ? Usr_PutIconToShowStdsAllData : + NULL)); /***** Form to select type of list of users *****/ Usr_ShowFormsToSelectUsrListType (ActLstStd); @@ -6957,8 +6904,6 @@ void Usr_SeeTeachers (void) { extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Scope; - extern const char *Txt_Print; - extern const char *Txt_Show_all_data; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Show_records; extern const char *Txt_No_users_found[Rol_NUM_ROLES]; @@ -7015,32 +6960,11 @@ void Usr_SeeTeachers (void) { if (Usr_GetIfShowBigList (Gbl.Usrs.LstTchs.NumUsrs)) { - /***** Link to print view *****/ - switch (Gbl.Usrs.Me.ListType) - { - case Usr_CLASS_PHOTO: - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActPrnTchPho,Usr_PutLinkToShowTchsAllDataParams, - "print64x64.png", - Txt_Print,Txt_Print); - fprintf (Gbl.F.Out,"
"); - break; - case Usr_LIST: - if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM) - { - /****** Link to show all the data ******/ - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActLstTchAll,Usr_PutLinkToShowTchsAllDataParams, - "table64x64.gif", - Txt_Show_all_data,Txt_Show_all_data); - fprintf (Gbl.F.Out,"
"); - } - break; - } - /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],NULL); - + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN], + (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) ? Usr_PutIconToPrintTchs : + ((Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM) ? Usr_PutIconToShowTchsAllData : + NULL)); /***** Form to select type of list of users *****/ Usr_ShowFormsToSelectUsrListType (ActLstTch); @@ -7105,6 +7029,78 @@ void Usr_SeeTeachers (void) Usr_FreeUsrsList (&Gbl.Usrs.LstTchs); } +/*****************************************************************************/ +/***************** Functions used to print lists of users ********************/ +/*****************************************************************************/ + +static void Usr_PutIconToPrintGsts (void) + { + extern const char *Txt_Print; + + Lay_PutContextualLink (ActPrnGstPho,Usr_ShowGstsAllDataParams, + "print64x64.png",Txt_Print,NULL); + } + +static void Usr_PutIconToPrintStds (void) + { + extern const char *Txt_Print; + + Lay_PutContextualLink (ActPrnStdPho,Usr_ShowStdsAllDataParams, + "print64x64.png",Txt_Print,NULL); + } + +static void Usr_PutIconToPrintTchs (void) + { + extern const char *Txt_Print; + + Lay_PutContextualLink (ActPrnTchPho,Usr_ShowTchsAllDataParams, + "print64x64.png",Txt_Print,NULL); + } + +static void Usr_PutIconToShowGstsAllData (void) + { + extern const char *Txt_Show_all_data; + + Lay_PutContextualLink (ActLstGstAll,Usr_ShowGstsAllDataParams, + "table64x64.gif",Txt_Show_all_data,NULL); + } + +static void Usr_PutIconToShowStdsAllData (void) + { + extern const char *Txt_Show_all_data; + + Lay_PutContextualLink (ActLstStdAll,Usr_ShowStdsAllDataParams, + "table64x64.gif",Txt_Show_all_data,NULL); + } + +static void Usr_PutIconToShowTchsAllData (void) + { + extern const char *Txt_Show_all_data; + + Lay_PutContextualLink (ActLstTchAll,Usr_ShowTchsAllDataParams, + "table64x64.gif",Txt_Show_all_data,NULL); + } + +static void Usr_ShowGstsAllDataParams (void) + { + Usr_PutParamListWithPhotos (); + Usr_PutExtraParamsUsrList (ActLstGstAll); + } + +static void Usr_ShowStdsAllDataParams (void) + { + Grp_PutParamsCodGrps (); + Usr_PutParamListWithPhotos (); + Usr_PutExtraParamsUsrList (ActLstStdAll); + } + +static void Usr_ShowTchsAllDataParams (void) + { + Sco_PutParamScope (Gbl.Scope.Current); + Usr_PutParamListWithPhotos (); + Usr_PutExtraParamsUsrList (ActLstTchAll); + } + /*****************************************************************************/ /******************* Put a link to list official students ********************/ /*****************************************************************************/