Version19.66.3

swad_changelog.h

@@ -487,7 +487,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.66.2 (2019-11-13)"
+#define Log_PLATFORM_VERSION	"SWAD 19.66.3 (2019-11-13)"
 #define CSS_FILE		"swad19.47.css"
 #define JS_FILE			"swad19.65.js"
 /*
@@ -496,7 +496,8 @@ ps2pdf source.ps destination.pdf
 // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
 // TODO: Code refactoring in HTML h1, title, meta, video, p, iframe, input hidden, area
 
-	Version 19.66.3:  Nov 13, 2019	Filter projects by selected users. (? lines)
+	Version 19.66.4:  Nov 13, 2019	Filter projects by selected users. (? lines)
+	Version 19.66.3:  Nov 13, 2019	Filter projects by selected users. Not finished. (246656 lines)
 	Version 19.66.2:  Nov 13, 2019	Fixed bug in edition of test question. (246628 lines)
 	Version 19.66.1:  Nov 13, 2019	Filter projects by selected users. Not finished. (246627 lines)
 	Version 19.66:    Nov 13, 2019	Changes in selection of which users in projects. (246638 lines)

swad_group.c

@@ -383,6 +383,7 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void),
    Frm_StartFormAnchor (Gbl.Action.Act,			// Repeat current action
 			Usr_USER_LIST_SECTION_ID);
    Usr_PutParamsPrefsAboutUsrList ();
+   Usr_PutHiddenParamRequestUsrs ();
    if (FuncParams)
       FuncParams ();
 

swad_project.c

@@ -689,9 +689,6 @@ void Prj_PutParams (struct Prj_Filter *Filter,
    if (Filter->Who != Prj_FILTER_WHO_DEFAULT)
       Usr_PutHiddenParamWho (Filter->Who);
 
-   if (Filter->Who == Usr_WHO_SELECTED)
-      Par_PutHiddenParamChar ("SelUsrs",'Y');
-
    if (Filter->Assign != ((unsigned) Prj_FILTER_ASSIGNED_DEFAULT |
 	                  (unsigned) Prj_FILTER_NONASSIG_DEFAULT))
       Prj_PutHiddenParamAssign (Filter->Assign);
@@ -835,13 +832,16 @@ static void Prj_GetParamWho (void)
    if (Gbl.Prjs.Filter.Who == Usr_WHO_UNKNOWN)
       Gbl.Prjs.Filter.Who = Prj_FILTER_WHO_DEFAULT;
 
-   /***** Select users? *****/
-   Gbl.Prjs.Filter.ReqUsrs = false;
-   Gbl.Prjs.Filter.SelUsrs = false;
+   /***** Request users? / Some users should have been selected? *****/
    if (Gbl.Prjs.Filter.Who == Usr_WHO_SELECTED)
      {
-      Gbl.Prjs.Filter.ReqUsrs = Par_GetParToBool ("RequestUsrs");
-      Gbl.Prjs.Filter.SelUsrs = Par_GetParToBool ("SelectedUsrs");
+      Gbl.Prjs.Filter.ReqUsrs = Usr_GetHiddenParamRequestUsrs ();
+      Gbl.Prjs.Filter.SelUsrs = Usr_GetHiddenParamSelectedUsrs ();
+     }
+   else
+     {
+      Gbl.Prjs.Filter.ReqUsrs = false;
+      Gbl.Prjs.Filter.SelUsrs = false;
      }
   }
 

swad_user.c

@@ -6199,16 +6199,15 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams
          Frm_StartForm (NextAction);
 
          /* Hidden parameters */
-         if (FuncParams)
-            FuncParams ();
          Grp_PutParamsCodGrps ();
-         Par_PutHiddenParamChar ("SelectedUsrs",'Y');	// This parameter says to receiver of form
-							// that some users should be selected
+         Usr_PutHiddenParamSelectedUsrs ();
          if (NextAction == ActAdmAsgWrkCrs)
            {
             Gbl.FileBrowser.FullTree = true;	// By default, show all files
             Brw_PutHiddenParamFullTreeIfSelected ();
            }
+         if (FuncParams)
+            FuncParams ();
 
          /* Put list of users to select some of them */
          HTM_TABLE_BeginCenter ();
@@ -9755,7 +9754,7 @@ void Usr_PutWhoIcon (Usr_Who_t Who)
 	                  "ICO_HIGHLIGHT PHOTO15x20");
 	 break;
       case Usr_WHO_SELECTED:
-	 Par_PutHiddenParamChar ("RequestUsrs",'Y');
+	 Usr_PutHiddenParamRequestUsrs ();
          HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg",
 			  Txt_WHO[Who],
 			  "ICO_HIGHLIGHT ICOx20");
@@ -9793,3 +9792,31 @@ Usr_Who_t Usr_GetHiddenParamWho (void)
                                                 Usr_NUM_WHO - 1,
                                                 Usr_WHO_UNKNOWN);
   }
+
+/*****************************************************************************/
+/************* Put hidden param to request a form to select users ************/
+/*****************************************************************************/
+
+void Usr_PutHiddenParamRequestUsrs (void)
+  {
+   Par_PutHiddenParamChar ("RequestUsrs",'Y');
+  }
+
+bool Usr_GetHiddenParamRequestUsrs (void)
+  {
+   return Par_GetParToBool ("RequestUsrs");
+  }
+
+/*****************************************************************************/
+/**** Hidden param to indicate that some users should have been selected *****/
+/*****************************************************************************/
+
+void Usr_PutHiddenParamSelectedUsrs (void)
+  {
+   Par_PutHiddenParamChar ("SelectedUsrs",'Y');
+  }
+
+bool Usr_GetHiddenParamSelectedUsrs (void)
+  {
+   return Par_GetParToBool ("SelectedUsrs");
+  }

swad_user.h

@@ -501,5 +501,9 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows);
 void Usr_PutWhoIcon (Usr_Who_t Who);
 void Usr_PutHiddenParamWho (Usr_Who_t Who);
 Usr_Who_t Usr_GetHiddenParamWho (void);
+void Usr_PutHiddenParamRequestUsrs (void);
+bool Usr_GetHiddenParamRequestUsrs (void);
+void Usr_PutHiddenParamSelectedUsrs (void);
+bool Usr_GetHiddenParamSelectedUsrs (void);
 
 #endif