mirror of
https://github.com/acanas/swad-core.git
synced 2024-05-31 22:05:23 +02:00
Version19.66.3
This commit is contained in:
parent
3521819e73
commit
9cd0ebed7f
|
@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
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 CSS_FILE "swad19.47.css"
|
||||||
#define JS_FILE "swad19.65.js"
|
#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: 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
|
// 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.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.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)
|
Version 19.66: Nov 13, 2019 Changes in selection of which users in projects. (246638 lines)
|
||||||
|
|
|
@ -383,6 +383,7 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void),
|
||||||
Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action
|
Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action
|
||||||
Usr_USER_LIST_SECTION_ID);
|
Usr_USER_LIST_SECTION_ID);
|
||||||
Usr_PutParamsPrefsAboutUsrList ();
|
Usr_PutParamsPrefsAboutUsrList ();
|
||||||
|
Usr_PutHiddenParamRequestUsrs ();
|
||||||
if (FuncParams)
|
if (FuncParams)
|
||||||
FuncParams ();
|
FuncParams ();
|
||||||
|
|
||||||
|
|
|
@ -689,9 +689,6 @@ void Prj_PutParams (struct Prj_Filter *Filter,
|
||||||
if (Filter->Who != Prj_FILTER_WHO_DEFAULT)
|
if (Filter->Who != Prj_FILTER_WHO_DEFAULT)
|
||||||
Usr_PutHiddenParamWho (Filter->Who);
|
Usr_PutHiddenParamWho (Filter->Who);
|
||||||
|
|
||||||
if (Filter->Who == Usr_WHO_SELECTED)
|
|
||||||
Par_PutHiddenParamChar ("SelUsrs",'Y');
|
|
||||||
|
|
||||||
if (Filter->Assign != ((unsigned) Prj_FILTER_ASSIGNED_DEFAULT |
|
if (Filter->Assign != ((unsigned) Prj_FILTER_ASSIGNED_DEFAULT |
|
||||||
(unsigned) Prj_FILTER_NONASSIG_DEFAULT))
|
(unsigned) Prj_FILTER_NONASSIG_DEFAULT))
|
||||||
Prj_PutHiddenParamAssign (Filter->Assign);
|
Prj_PutHiddenParamAssign (Filter->Assign);
|
||||||
|
@ -835,13 +832,16 @@ static void Prj_GetParamWho (void)
|
||||||
if (Gbl.Prjs.Filter.Who == Usr_WHO_UNKNOWN)
|
if (Gbl.Prjs.Filter.Who == Usr_WHO_UNKNOWN)
|
||||||
Gbl.Prjs.Filter.Who = Prj_FILTER_WHO_DEFAULT;
|
Gbl.Prjs.Filter.Who = Prj_FILTER_WHO_DEFAULT;
|
||||||
|
|
||||||
/***** Select users? *****/
|
/***** Request users? / Some users should have been selected? *****/
|
||||||
Gbl.Prjs.Filter.ReqUsrs = false;
|
|
||||||
Gbl.Prjs.Filter.SelUsrs = false;
|
|
||||||
if (Gbl.Prjs.Filter.Who == Usr_WHO_SELECTED)
|
if (Gbl.Prjs.Filter.Who == Usr_WHO_SELECTED)
|
||||||
{
|
{
|
||||||
Gbl.Prjs.Filter.ReqUsrs = Par_GetParToBool ("RequestUsrs");
|
Gbl.Prjs.Filter.ReqUsrs = Usr_GetHiddenParamRequestUsrs ();
|
||||||
Gbl.Prjs.Filter.SelUsrs = Par_GetParToBool ("SelectedUsrs");
|
Gbl.Prjs.Filter.SelUsrs = Usr_GetHiddenParamSelectedUsrs ();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Gbl.Prjs.Filter.ReqUsrs = false;
|
||||||
|
Gbl.Prjs.Filter.SelUsrs = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
37
swad_user.c
37
swad_user.c
|
@ -6199,16 +6199,15 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams
|
||||||
Frm_StartForm (NextAction);
|
Frm_StartForm (NextAction);
|
||||||
|
|
||||||
/* Hidden parameters */
|
/* Hidden parameters */
|
||||||
if (FuncParams)
|
|
||||||
FuncParams ();
|
|
||||||
Grp_PutParamsCodGrps ();
|
Grp_PutParamsCodGrps ();
|
||||||
Par_PutHiddenParamChar ("SelectedUsrs",'Y'); // This parameter says to receiver of form
|
Usr_PutHiddenParamSelectedUsrs ();
|
||||||
// that some users should be selected
|
|
||||||
if (NextAction == ActAdmAsgWrkCrs)
|
if (NextAction == ActAdmAsgWrkCrs)
|
||||||
{
|
{
|
||||||
Gbl.FileBrowser.FullTree = true; // By default, show all files
|
Gbl.FileBrowser.FullTree = true; // By default, show all files
|
||||||
Brw_PutHiddenParamFullTreeIfSelected ();
|
Brw_PutHiddenParamFullTreeIfSelected ();
|
||||||
}
|
}
|
||||||
|
if (FuncParams)
|
||||||
|
FuncParams ();
|
||||||
|
|
||||||
/* Put list of users to select some of them */
|
/* Put list of users to select some of them */
|
||||||
HTM_TABLE_BeginCenter ();
|
HTM_TABLE_BeginCenter ();
|
||||||
|
@ -9755,7 +9754,7 @@ void Usr_PutWhoIcon (Usr_Who_t Who)
|
||||||
"ICO_HIGHLIGHT PHOTO15x20");
|
"ICO_HIGHLIGHT PHOTO15x20");
|
||||||
break;
|
break;
|
||||||
case Usr_WHO_SELECTED:
|
case Usr_WHO_SELECTED:
|
||||||
Par_PutHiddenParamChar ("RequestUsrs",'Y');
|
Usr_PutHiddenParamRequestUsrs ();
|
||||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg",
|
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg",
|
||||||
Txt_WHO[Who],
|
Txt_WHO[Who],
|
||||||
"ICO_HIGHLIGHT ICOx20");
|
"ICO_HIGHLIGHT ICOx20");
|
||||||
|
@ -9793,3 +9792,31 @@ Usr_Who_t Usr_GetHiddenParamWho (void)
|
||||||
Usr_NUM_WHO - 1,
|
Usr_NUM_WHO - 1,
|
||||||
Usr_WHO_UNKNOWN);
|
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");
|
||||||
|
}
|
||||||
|
|
|
@ -501,5 +501,9 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows);
|
||||||
void Usr_PutWhoIcon (Usr_Who_t Who);
|
void Usr_PutWhoIcon (Usr_Who_t Who);
|
||||||
void Usr_PutHiddenParamWho (Usr_Who_t Who);
|
void Usr_PutHiddenParamWho (Usr_Who_t Who);
|
||||||
Usr_Who_t Usr_GetHiddenParamWho (void);
|
Usr_Who_t Usr_GetHiddenParamWho (void);
|
||||||
|
void Usr_PutHiddenParamRequestUsrs (void);
|
||||||
|
bool Usr_GetHiddenParamRequestUsrs (void);
|
||||||
|
void Usr_PutHiddenParamSelectedUsrs (void);
|
||||||
|
bool Usr_GetHiddenParamSelectedUsrs (void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user