Version 16.223.2

This commit is contained in:
Antonio Cañas Vargas 2017-05-25 11:04:38 +02:00
parent 44a23d1af0
commit c2ebc5e72d
10 changed files with 67 additions and 13 deletions

View File

@ -1928,7 +1928,10 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,Hlp_USERS_Attendance); Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,Hlp_USERS_Attendance);
/***** Form to select groups *****/ /***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt); Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{ {
@ -1994,6 +1997,9 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
else else
Usr_ShowWarningNoUsersFound (Rol_STD); Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -2658,7 +2664,10 @@ void Usr_ReqListStdsAttendanceCrs (void)
NULL,Hlp_USERS_Attendance_attendance_list); NULL,Hlp_USERS_Attendance_attendance_list);
/***** Form to select groups *****/ /***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqLstStdAtt); Grp_ShowFormToSelectSeveralGroups (ActReqLstStdAtt,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{ {
@ -2693,6 +2702,9 @@ void Usr_ReqListStdsAttendanceCrs (void)
else else
Usr_ShowWarningNoUsersFound (Rol_STD); Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();

View File

@ -229,17 +229,22 @@
// TODO: Al listar administradores, debería estar marcado por defecto "Incluir fotos" // TODO: Al listar administradores, debería estar marcado por defecto "Incluir fotos"
// TODO: Statistics of hits in course accessible by non-editing teachers.
// TODO: "Mostrar de todos modos" button integrated in alert
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.223.1 (2017-05-25)" #define Log_PLATFORM_VERSION "SWAD 16.223.2 (2017-05-25)"
#define CSS_FILE "swad16.222.css" #define CSS_FILE "swad16.222.css"
#define JS_FILE "swad16.206.3.js" #define JS_FILE "swad16.206.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.223.2: May 25, 2017 User lists are shown when clicking on "Update students". (220435 lines)
Version 16.223.1: May 25, 2017 Alerts closable or not depending on their type. (220400 lines) Version 16.223.1: May 25, 2017 Alerts closable or not depending on their type. (220400 lines)
Version 16.223: May 24, 2017 Changes in lists of users related with new role. (220384 lines) Version 16.223: May 24, 2017 Changes in lists of users related with new role. (220384 lines)
Version 16.222.2: May 24, 2017 Fixed bug in course records related with new role. (220369 lines) Version 16.222.2: May 24, 2017 Fixed bug in course records related with new role. (220369 lines)

View File

@ -3120,7 +3120,10 @@ void Brw_AskEditWorksCrs (void)
NULL,Hlp_FILES_Homework_for_teachers); NULL,Hlp_FILES_Homework_for_teachers);
/***** Show form to select the groups *****/ /***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqAsgWrkCrs); Grp_ShowFormToSelectSeveralGroups (ActReqAsgWrkCrs,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (NumTotalUsrs) if (NumTotalUsrs)
{ {
@ -3152,6 +3155,9 @@ void Brw_AskEditWorksCrs (void)
else else
Usr_ShowWarningNoUsersFound (Rol_UNK); Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();

View File

@ -328,15 +328,15 @@ static void Grp_PutIconToCreateNewGroup (void)
/*************** Show form to select one or several groups *******************/ /*************** Show form to select one or several groups *******************/
/*****************************************************************************/ /*****************************************************************************/
void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction) void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,const char *Anchor)
{ {
extern const char *Hlp_USERS_Groups; extern const char *Hlp_USERS_Groups;
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Groups; extern const char *Txt_Groups;
extern const char *Txt_All_groups; extern const char *Txt_All_groups;
extern const char *Txt_Update_students;
extern const char *Txt_Update_students_according_to_selected_groups; extern const char *Txt_Update_students_according_to_selected_groups;
extern const char *Txt_Update_students;
unsigned NumGrpTyp; unsigned NumGrpTyp;
bool ICanEdit; bool ICanEdit;
@ -354,7 +354,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
/***** Start form to update the students listed /***** Start form to update the students listed
depending on the groups selected *****/ depending on the groups selected *****/
Act_FormStart (NextAction); Act_FormStartAnchor (NextAction,Anchor);
Usr_PutParamsPrefsAboutUsrList (); Usr_PutParamsPrefsAboutUsrList ();
/***** Put parameters needed depending on the action *****/ /***** Put parameters needed depending on the action *****/

View File

@ -135,7 +135,7 @@ typedef enum
void Grp_WriteNamesOfSelectedGrps (void); void Grp_WriteNamesOfSelectedGrps (void);
void Grp_ReqEditGroups (void); void Grp_ReqEditGroups (void);
void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction); void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,const char *Anchor);
void Grp_PutParamsCodGrps (void); void Grp_PutParamsCodGrps (void);
void Grp_GetParCodsSeveralGrpsToShowUsrs (void); void Grp_GetParCodsSeveralGrpsToShowUsrs (void);
void Grp_GetParCodsSeveralGrps (void); void Grp_GetParCodsSeveralGrps (void);

View File

@ -887,7 +887,10 @@ void Mai_ListEmails (void)
NULL,Hlp_MESSAGES_Email); NULL,Hlp_MESSAGES_Email);
/***** Form to select groups *****/ /***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActMaiStd); Grp_ShowFormToSelectSeveralGroups (ActMaiStd,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{ {
@ -978,6 +981,9 @@ void Mai_ListEmails (void)
else else
Usr_ShowWarningNoUsersFound (Rol_STD); Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End of the frame used to list the emails *****/ /***** End of the frame used to list the emails *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();

View File

@ -237,7 +237,10 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
if (GetUsrsInCrs) if (GetUsrsInCrs)
{ {
/***** Form to select groups *****/ /***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqMsgUsr); Grp_ShowFormToSelectSeveralGroups (ActReqMsgUsr,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (NumUsrsInCrs) if (NumUsrsInCrs)
{ {
@ -251,6 +254,9 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
/***** Get lists of selected users *****/ /***** Get lists of selected users *****/
Usr_GetListsSelectedUsrsCods (); Usr_GetListsSelectedUsrsCods ();
} }
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
} }
/***** Get list of users' IDs or nicknames written explicitely *****/ /***** Get list of users' IDs or nicknames written explicitely *****/

View File

@ -474,7 +474,10 @@ void Sta_AskShowCrsHits (void)
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_STATS_Visits_visits_to_course); Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_STATS_Visits_visits_to_course);
/***** Show form to select the groups *****/ /***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqAccCrs); Grp_ShowFormToSelectSeveralGroups (ActReqAccCrs,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (NumTotalUsrs) if (NumTotalUsrs)
{ {
@ -604,6 +607,9 @@ void Sta_AskShowCrsHits (void)
else // No teachers nor students found else // No teachers nor students found
Ale_ShowAlert (Ale_WARNING,Txt_No_teachers_or_students_found); Ale_ShowAlert (Ale_WARNING,Txt_No_teachers_or_students_found);
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();

View File

@ -6980,7 +6980,10 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
NULL,Hlp_ASSESSMENT_Tests_test_results); NULL,Hlp_ASSESSMENT_Tests_test_results);
/***** Show form to select the groups *****/ /***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes); Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (NumTotalUsrs) if (NumTotalUsrs)
{ {
@ -7025,6 +7028,9 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
else else
Usr_ShowWarningNoUsersFound (Rol_UNK); Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();

View File

@ -7447,7 +7447,10 @@ void Usr_SeeStudents (void)
/***** Form to select groups *****/ /***** Form to select groups *****/
if (Gbl.Scope.Current == Sco_SCOPE_CRS) if (Gbl.Scope.Current == Sco_SCOPE_CRS)
Grp_ShowFormToSelectSeveralGroups (ActLstStd); Grp_ShowFormToSelectSeveralGroups (ActLstStd,"user_list");
/***** Start section with user list *****/
fprintf (Gbl.F.Out,"<section id=\"user_list\">");
if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs,NULL)) if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs,NULL))
{ {
@ -7456,6 +7459,7 @@ void Usr_SeeStudents (void)
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{ {
/***** Form to select type of list of users *****/ /***** Form to select type of list of users *****/
Usr_ShowFormsToSelectUsrListType (ActLstStd); Usr_ShowFormsToSelectUsrListType (ActLstStd);
@ -7529,6 +7533,9 @@ void Usr_SeeStudents (void)
} }
} }
/***** End section with user list *****/
fprintf (Gbl.F.Out,"</section>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();