From 96f8bf799cf19ae1b52a715adbb9a478f42b0df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Wed, 1 Feb 2017 11:23:48 +0100
Subject: [PATCH] Version 16.132.12

---
 swad_changelog.h |  5 ++++-
 swad_group.c     |  4 +---
 swad_photo.c     | 14 +++++---------
 swad_user.c      | 31 ++++++++++++++++++-------------
 swad_user.h      |  1 +
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/swad_changelog.h b/swad_changelog.h
index 914f82730..3763c5c40 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -187,17 +187,20 @@
 // TODO: Fix bug when creating a new attendance event: if title is repeated, form is cleared
 // TODO: Fix bug: When registering an administrator, the user's name changes are ignored
 
+// TODO: In list of indicators, alternate background colors also when not all the number of indicators are selected
+
 /*****************************************************************************/
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.132.11 (2017-02-01)"
+#define Log_PLATFORM_VERSION	"SWAD 16.132.12 (2017-02-01)"
 #define CSS_FILE		"swad16.132.4.css"
 #define JS_FILE			"swad16.123.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.132.12:Feb 01, 2017	Code refactoring and bug fixing in parameters related to users list type. (211900 lines)
         Version 16.132.11:Feb 01, 2017	Help on indicators of courses. (211900 lines)
         Version 16.132.10:Feb 01, 2017	Help on stats about visits. (211896 lines)
         Version 16.132.9: Jan 31, 2017	Help on degrees stats. (211890 lines)
diff --git a/swad_group.c b/swad_group.c
index e6639b8d2..83d8f8041 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -251,9 +251,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
       /***** Start form to update the students listed
 	     depending on the groups selected *****/
       Act_FormStart (NextAction);
-      Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-      Usr_PutParamColsClassPhoto ();
-      Usr_PutParamListWithPhotos ();
+      Usr_PutParamsPrefsAboutUsrList ();
 
       /***** Put parameters needed depending on the action *****/
       Usr_PutExtraParamsUsrList (NextAction);
diff --git a/swad_photo.c b/swad_photo.c
index ff1ec1536..b02c2a343 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1674,7 +1674,7 @@ static void Pho_PutSelectorForTypeOfAvg (void)
    Act_FormStart (ActSeePhoDeg);
    Pho_PutHiddenParamPhotoSize ();
    Pho_PutHiddenParamOrderDegrees ();
-   Usr_PutParamColsClassPhoto ();
+   Usr_PutParamsPrefsAboutUsrList ();
    fprintf (Gbl.F.Out,"<select id=\"AvgType\" name=\"AvgType\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
@@ -1735,7 +1735,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
    Act_FormStart (ActSeePhoDeg);
    Pho_PutHiddenParamTypeOfAvg ();
    Pho_PutHiddenParamOrderDegrees ();
-   Usr_PutParamColsClassPhoto ();
+   Usr_PutParamsPrefsAboutUsrList ();
    fprintf (Gbl.F.Out,"<select id=\"PhotoSize\" name=\"PhotoSize\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
@@ -1796,7 +1796,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
    Act_FormStart (ActSeePhoDeg);
    Pho_PutHiddenParamTypeOfAvg ();
    Pho_PutHiddenParamPhotoSize ();
-   Usr_PutParamColsClassPhoto ();
+   Usr_PutParamsPrefsAboutUsrList ();
    fprintf (Gbl.F.Out,"<select id=\"Order\" name=\"Order\""
                       " onchange=\"document.getElementById('%s').submit();\">",
             Gbl.Form.Id);
@@ -1856,9 +1856,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void)
    Pho_PutHiddenParamTypeOfAvg ();
    Pho_PutHiddenParamPhotoSize ();
    Pho_PutHiddenParamOrderDegrees ();
-   Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-   Usr_PutParamColsClassPhoto ();
-   Usr_PutParamListWithPhotos ();
+   Usr_PutParamsPrefsAboutUsrList ();
   }
 
 /*****************************************************************************/
@@ -1895,9 +1893,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
       Pho_PutHiddenParamTypeOfAvg ();
       Pho_PutHiddenParamPhotoSize ();
       Pho_PutHiddenParamOrderDegrees ();
-      Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-      Usr_PutParamColsClassPhoto ();
-      Usr_PutParamListWithPhotos ();
+      Usr_PutParamsPrefsAboutUsrList ();
       Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,
                                   The_ClassFormBold[Gbl.Prefs.Theme],
                                   NULL);
diff --git a/swad_user.c b/swad_user.c
index 43b12afd5..ea4e70d0e 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -5097,9 +5097,7 @@ static void Usr_PutButtonToConfirmIWantToSeeBigList (unsigned NumUsrs,const char
    /***** Put form to confirm that I want to see the big list *****/
    Act_FormStartOnSubmit (Gbl.Action.Act,OnSubmit);
    Grp_PutParamsCodGrps ();
-   Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-   Usr_PutParamColsClassPhoto ();
-   Usr_PutParamListWithPhotos ();
+   Usr_PutParamsPrefsAboutUsrList ();
    Usr_PutExtraParamsUsrList (Gbl.Action.Act);
    Par_PutHiddenParamChar ("ShowBigList",'Y');
 
@@ -5566,8 +5564,8 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
 
    Act_FormStart (NextAction);
    Grp_PutParamsCodGrps ();
-   Usr_PutParamListWithPhotos ();
    Usr_PutParamUsrListType (ListType);
+   Usr_PutParamListWithPhotos ();
    Usr_PutExtraParamsUsrList (NextAction);
    Act_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],
                        The_ClassFormNoWrap[Gbl.Prefs.Theme],
@@ -6734,6 +6732,19 @@ void Usr_ListDataAdms (void)
    Usr_FreeUsrsList (Rol_DEG_ADM);
   }
 
+/*****************************************************************************/
+/****************** Put hidden parameters with type of list, *****************/
+/****************** number of columns in class photo *************************/
+/****************** and preference about view photos *************************/
+/*****************************************************************************/
+
+void Usr_PutParamsPrefsAboutUsrList (void)
+  {
+   Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
+   Usr_PutParamColsClassPhoto ();
+   Usr_PutParamListWithPhotos ();
+  }
+
 /*****************************************************************************/
 /********************* Get and update type of list,     **********************/
 /********************* number of columns in class photo **********************/
@@ -7140,9 +7151,7 @@ void Usr_SeeGuests (void)
 	 case Rol_SYS_ADM:
 	    fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
 	    Act_FormStart (ActLstGst);
-	    Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-	    Usr_PutParamColsClassPhoto ();
-	    Usr_PutParamListWithPhotos ();
+	    Usr_PutParamsPrefsAboutUsrList ();
 	    fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 		     The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
 	    Sco_PutSelectorScope ("ScopeUsr",true);
@@ -7299,9 +7308,7 @@ void Usr_SeeStudents (void)
 	 case Rol_SYS_ADM:
 	    fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
 	    Act_FormStart (ActLstStd);
-	    Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-	    Usr_PutParamColsClassPhoto ();
-	    Usr_PutParamListWithPhotos ();
+	    Usr_PutParamsPrefsAboutUsrList ();
 	    fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 		     The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
 	    Sco_PutSelectorScope ("ScopeUsr",true);
@@ -7462,9 +7469,7 @@ void Usr_SeeTeachers (void)
       /***** Form to select scope *****/
       fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
       Act_FormStart (ActLstTch);
-      Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
-      Usr_PutParamColsClassPhoto ();
-      Usr_PutParamListWithPhotos ();
+      Usr_PutParamsPrefsAboutUsrList ();
       fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
 	       The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
       Sco_PutSelectorScope ("ScopeUsr",true);
diff --git a/swad_user.h b/swad_user.h
index 0aca61bf0..e3767d0a8 100644
--- a/swad_user.h
+++ b/swad_user.h
@@ -372,6 +372,7 @@ void Usr_ListAllDataTchs (void);
 unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *SearchQuery);
 void Usr_ListDataAdms (void);
 
+void Usr_PutParamsPrefsAboutUsrList (void);
 void Usr_GetAndUpdatePrefsAboutUsrList (void);
 void Usr_PutParamUsrListType (Usr_ShowUsrsType_t ListType);
 void Usr_GetAndUpdateColsClassPhoto (void);