Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.88.3

This commit is contained in:
Antonio Cañas Vargas 2019-12-09 11:50:03 +01:00
parent f28b2a03b1
commit bac28830d9
8 changed files with 46 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_attendance.c
View File

@ -2631,7 +2631,8 @@ void Att_ReqListUsrsAttendanceCrs (void)
ActSeeLstUsrAtt,NULL,
Txt_Attendance_list,
Hlp_USERS_Attendance_attendance_list,
Txt_View_attendance);
Txt_View_attendance,
false); // Do not put form with date range
/***** Free list of attendance events *****/
Att_FreeListAttEvents ();

5
swad_changelog.h
View File

@ -490,14 +490,15 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.88.2 (2019-12-08)"
#define Log_PLATFORM_VERSION "SWAD 19.88.3 (2019-12-09)"
#define CSS_FILE "swad19.85.css"
#define JS_FILE "swad19.70.js"
/*
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
// TODO: Impedir la creación y edición de proyectos si no son editables.
Version 19.88.2: Dec 08, 2019 Changes in matches results. (248224 lines)
Version 19.88.3: Dec 09, 2019 Code refactoring in selection of users in tests results. (248181 lines)
Version 19.88.2: Dec 09, 2019 Changes in matches results. (248224 lines)
Version 19.88.1: Dec 08, 2019 Changes in layout of matches results. (248219 lines)
Version 19.88: Dec 08, 2019 Show matches results in a match. (248151 lines)
Version 19.87.5: Dec 08, 2019 Results of a game are integrated in the box of that game. (248008 lines)

3
swad_file_browser.c
View File

@ -3109,7 +3109,8 @@ void Brw_AskEditWorksCrs (void)
ActAdmAsgWrkCrs,NULL,
Txt_Assignments_and_other_works,
Hlp_FILES_Homework_for_teachers,
Txt_View_homework);
Txt_View_homework,
false); // Do not put form with date range
}
/*****************************************************************************/

3
swad_mail.c
View File

@ -874,7 +874,8 @@ void Mai_ReqUsrsToListEmails (void)
ActMaiUsr,NULL,
Txt_Email,
Hlp_MESSAGES_Email,
Txt_View_email_addresses);
Txt_View_email_addresses,
false); // Do not put form with date range
}
/*****************************************************************************/

6
swad_project.c
View File

@ -277,7 +277,8 @@ static void Prj_ReqUsrsToSelect (void)
ActSeePrj,Prj_PutCurrentParams,
Txt_Projects,
Hlp_ASSESSMENT_Projects,
Txt_View_projects);
Txt_View_projects,
false); // Do not put form with date range
}
/*****************************************************************************/
@ -2292,7 +2293,8 @@ static void Prj_ReqAddUsrs (Prj_RoleInProject_t RoleInProject)
ActionAddUsr[RoleInProject],Prj_PutCurrentParams,
TxtButton,
Hlp_ASSESSMENT_Projects_add_user,
TxtButton);
TxtButton,
false); // Do not put form with date range
/***** Put a form to create/edit project *****/
Prj_RequestCreatOrEditPrj (Gbl.Prjs.PrjCod);

98
swad_test.c
View File

@ -7425,101 +7425,15 @@ static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Hie_Level_t Scope,Ts
void Tst_SelUsrsToViewUsrsTstResults (void)
{
extern const char *Hlp_ASSESSMENT_Tests_results;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Results;
extern const char *Txt_Users;
extern const char *Txt_View_test_results;
unsigned NumTotalUsrs;
/***** Get and update type of list,
number of columns in class photo
and preference about viewing photos *****/
Usr_GetAndUpdatePrefsAboutUsrList ();
/***** Get groups to show ******/
Grp_GetParCodsSeveralGrpsToShowUsrs ();
/***** Get and order lists of users from this course *****/
Usr_GetListUsrs (Hie_CRS,Rol_STD);
Usr_GetListUsrs (Hie_CRS,Rol_NET);
Usr_GetListUsrs (Hie_CRS,Rol_TCH);
NumTotalUsrs = Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs +
Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs +
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Results,NULL,
Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE);
/***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (NULL,
Grp_MY_GROUPS);
/***** Start section with user list *****/
HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID);
if (NumTotalUsrs)
{
if (Usr_GetIfShowBigList (NumTotalUsrs,NULL,NULL))
{
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (NULL);
/***** Begin form *****/
Frm_StartForm (ActSeeUsrTstRes);
Grp_PutParamsCodGrps ();
/***** Put list of users to select some of them *****/
HTM_TABLE_BeginCenterPadding (2);
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtF ("%s:",Txt_Users);
HTM_TD_End ();
HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TABLE_BeginPadding (2);
Usr_ListUsersToSelect (Rol_TCH,&Gbl.Usrs.Selected);
Usr_ListUsersToSelect (Rol_NET,&Gbl.Usrs.Selected);
Usr_ListUsersToSelect (Rol_STD,&Gbl.Usrs.Selected);
HTM_TABLE_End ();
HTM_TD_End ();
HTM_TR_End ();
/***** Starting and ending dates in the search *****/
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
HTM_TABLE_End ();
/***** Send button *****/
Btn_PutConfirmButton (Txt_View_test_results);
/***** End form *****/
Frm_EndForm ();
}
}
else // NumTotalUsrs == 0
/***** Show warning indicating no students found *****/
Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End section with user list *****/
HTM_SECTION_End ();
/***** End box *****/
Box_BoxEnd ();
/***** Free memory for users' list *****/
Usr_FreeUsrsList (Rol_TCH);
Usr_FreeUsrsList (Rol_NET);
Usr_FreeUsrsList (Rol_STD);
/***** Free memory used by list of selected users' codes *****/
Usr_FreeListsSelectedEncryptedUsrsCods (&Gbl.Usrs.Selected);
/***** Free memory for list of selected groups *****/
Grp_FreeListCodSelectedGrps ();
Usr_PutFormToSelectUsrsToGoToAct (&Gbl.Usrs.Selected,
ActSeeUsrTstRes,Grp_PutParamsCodGrps,
Txt_Results,
Hlp_ASSESSMENT_Tests_results,
Txt_View_test_results,
true); // Put form with date range
}
/*****************************************************************************/

29
swad_user.c
View File

@ -6322,9 +6322,12 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs,
Act_Action_t NextAction,void (*FuncParams) (),
const char *Title,
const char *HelpLink,
const char *TxtButton)
const char *TxtButton,
bool PutFormDateRange)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Select_users;
extern const char *Txt_Users;
unsigned NumTotalUsrs;
/***** Begin box *****/
@ -6366,7 +6369,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs,
/***** Link to register students *****/
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** Form to select users ****/
/***** Form to select users and select date range ****/
/* Begin form */
Frm_StartForm (NextAction);
@ -6380,17 +6383,35 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs,
if (FuncParams)
FuncParams ();
HTM_TABLE_BeginCenterPadding (2);
/* Put list of users to select some of them */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtF ("%s:",Txt_Users);
HTM_TD_End ();
HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TABLE_BeginCenter ();
Usr_ListUsersToSelect (Rol_TCH,SelectedUsrs);
Usr_ListUsersToSelect (Rol_NET,SelectedUsrs);
Usr_ListUsersToSelect (Rol_STD,SelectedUsrs);
HTM_TABLE_End ();
HTM_TD_End ();
/* Send button */
HTM_TR_End ();
/* Starting and ending dates in the search */
if (PutFormDateRange)
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
HTM_TABLE_End ();
/***** Send button *****/
Btn_PutConfirmButton (TxtButton);
/* End form */
/***** End form *****/
Frm_EndForm ();
}
}

3
swad_user.h
View File

@ -470,7 +470,8 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs,
Act_Action_t NextAction,void (*FuncParams) (),
const char *Title,
const char *HelpLink,
const char *TxtButton);
const char *TxtButton,
bool PutFormDateRange);
void Usr_GetSelectedUsrsAndGoToAct (struct SelectedUsrs *SelectedUsrs,
void (*FuncWhenUsrsSelected) (),
void (*FuncWhenNoUsrsSelected) ());