diff --git a/swad_attendance.c b/swad_attendance.c
index c339ba450..b5d72b439 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -1928,7 +1928,10 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,Hlp_USERS_Attendance);
/***** Form to select groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt);
+ Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{
@@ -1994,6 +1997,9 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
else
Usr_ShowWarningNoUsersFound (Rol_STD);
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End frame *****/
Lay_EndRoundFrame ();
@@ -2658,7 +2664,10 @@ void Usr_ReqListStdsAttendanceCrs (void)
NULL,Hlp_USERS_Attendance_attendance_list);
/***** Form to select groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActReqLstStdAtt);
+ Grp_ShowFormToSelectSeveralGroups (ActReqLstStdAtt,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{
@@ -2693,6 +2702,9 @@ void Usr_ReqListStdsAttendanceCrs (void)
else
Usr_ShowWarningNoUsersFound (Rol_STD);
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End frame *****/
Lay_EndRoundFrame ();
diff --git a/swad_changelog.h b/swad_changelog.h
index 23f1809ea..0845f21d8 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -229,17 +229,22 @@
// 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 *****************************/
/*****************************************************************************/
-#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 JS_FILE "swad16.206.3.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.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: 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)
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 735a117a0..0c4487410 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -3120,7 +3120,10 @@ void Brw_AskEditWorksCrs (void)
NULL,Hlp_FILES_Homework_for_teachers);
/***** Show form to select the groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActReqAsgWrkCrs);
+ Grp_ShowFormToSelectSeveralGroups (ActReqAsgWrkCrs,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (NumTotalUsrs)
{
@@ -3152,6 +3155,9 @@ void Brw_AskEditWorksCrs (void)
else
Usr_ShowWarningNoUsersFound (Rol_UNK);
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End frame *****/
Lay_EndRoundFrame ();
diff --git a/swad_group.c b/swad_group.c
index f3d4ab586..79bd20388 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -328,15 +328,15 @@ static void Grp_PutIconToCreateNewGroup (void)
/*************** 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 *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_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;
unsigned NumGrpTyp;
bool ICanEdit;
@@ -354,7 +354,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
/***** Start form to update the students listed
depending on the groups selected *****/
- Act_FormStart (NextAction);
+ Act_FormStartAnchor (NextAction,Anchor);
Usr_PutParamsPrefsAboutUsrList ();
/***** Put parameters needed depending on the action *****/
diff --git a/swad_group.h b/swad_group.h
index e2910ffbb..7c50bb053 100644
--- a/swad_group.h
+++ b/swad_group.h
@@ -135,7 +135,7 @@ typedef enum
void Grp_WriteNamesOfSelectedGrps (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_GetParCodsSeveralGrpsToShowUsrs (void);
void Grp_GetParCodsSeveralGrps (void);
diff --git a/swad_mail.c b/swad_mail.c
index 4481ccb34..31f73f041 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -887,7 +887,10 @@ void Mai_ListEmails (void)
NULL,Hlp_MESSAGES_Email);
/***** Form to select groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActMaiStd);
+ Grp_ShowFormToSelectSeveralGroups (ActMaiStd,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{
@@ -978,6 +981,9 @@ void Mai_ListEmails (void)
else
Usr_ShowWarningNoUsersFound (Rol_STD);
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End of the frame used to list the emails *****/
Lay_EndRoundFrame ();
diff --git a/swad_message.c b/swad_message.c
index 50f859dd2..04c0b5a5f 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -237,7 +237,10 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
if (GetUsrsInCrs)
{
/***** Form to select groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActReqMsgUsr);
+ Grp_ShowFormToSelectSeveralGroups (ActReqMsgUsr,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (NumUsrsInCrs)
{
@@ -251,6 +254,9 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
/***** Get lists of selected users *****/
Usr_GetListsSelectedUsrsCods ();
}
+
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
}
/***** Get list of users' IDs or nicknames written explicitely *****/
diff --git a/swad_statistic.c b/swad_statistic.c
index ad0289270..f2424b71d 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -474,7 +474,10 @@ void Sta_AskShowCrsHits (void)
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_STATS_Visits_visits_to_course);
/***** Show form to select the groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActReqAccCrs);
+ Grp_ShowFormToSelectSeveralGroups (ActReqAccCrs,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (NumTotalUsrs)
{
@@ -604,6 +607,9 @@ void Sta_AskShowCrsHits (void)
else // No teachers nor students found
Ale_ShowAlert (Ale_WARNING,Txt_No_teachers_or_students_found);
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End frame *****/
Lay_EndRoundFrame ();
diff --git a/swad_test.c b/swad_test.c
index cae19d4d1..14554ca6c 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -6980,7 +6980,10 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
NULL,Hlp_ASSESSMENT_Tests_test_results);
/***** Show form to select the groups *****/
- Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes);
+ Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
if (NumTotalUsrs)
{
@@ -7025,6 +7028,9 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
else
Usr_ShowWarningNoUsersFound (Rol_UNK);
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End frame *****/
Lay_EndRoundFrame ();
diff --git a/swad_user.c b/swad_user.c
index 57df6c98e..c7e367a6c 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -7447,7 +7447,10 @@ void Usr_SeeStudents (void)
/***** Form to select groups *****/
if (Gbl.Scope.Current == Sco_SCOPE_CRS)
- Grp_ShowFormToSelectSeveralGroups (ActLstStd);
+ Grp_ShowFormToSelectSeveralGroups (ActLstStd,"user_list");
+
+ /***** Start section with user list *****/
+ fprintf (Gbl.F.Out,"");
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)
{
+
/***** Form to select type of list of users *****/
Usr_ShowFormsToSelectUsrListType (ActLstStd);
@@ -7529,6 +7533,9 @@ void Usr_SeeStudents (void)
}
}
+ /***** End section with user list *****/
+ fprintf (Gbl.F.Out,"");
+
/***** End frame *****/
Lay_EndRoundFrame ();