diff --git a/swad_changelog.h b/swad_changelog.h index ca2bd61c2..630946d06 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -36,17 +36,17 @@ // Sería completa esta aplicación, si la asistencia se incluyera, automáticamente, en el apartado de evaluación de cada alumno. De esta forma podríamos ver sus trabajos y asistencias de forma personalizada. // TODO: OpenSWAD.org: ¿Qué debería tener una buena gestión de grupos? Es para tomar ideas ;) // José Raúl Canay @raulcanay: por ejemplo, que puedas sacar un listado exportable de en qué grupos está una persona de quienes están en un grupo. -// TODO: Remove debug in PRADO /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.74.6 (2015/02/08)" +#define Log_PLATFORM_VERSION "SWAD 14.74.7 (2015/02/08)" // 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 | tail -1 /* + Version 14.74.7: Feb 08, 2015 Link to register/remove several users. (178029 lines) Version 14.74.6: Feb 08, 2015 Changes in layout of form to register/remove one user. (178009 lines) Version 14.74.5: Feb 08, 2015 Changes in layout of form to register/remove users. (178038 lines) Version 14.74.4: Feb 08, 2015 Changes in layout of form to register/remove users. (178000 lines) diff --git a/swad_enrollment.c b/swad_enrollment.c index 3a6d367a1..54beb5f57 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -88,7 +88,7 @@ extern struct Globals Gbl; static void Enr_ShowFormRegRemSeveralUsrs (void); -static void Enr_PutFormToRemOldUsrs (void); +static void Enr_PutLinkToRemOldUsrs (void); static void Enr_PutAreaToEnterUsrsIDs (void); static bool Enr_PutActionsRegRemOneUsr (bool ItsMe); static void Enr_PutActionsRegRemSeveralUsrs (void); @@ -97,9 +97,10 @@ static void Enr_RegisterUsr (struct UsrData *UsrDat,Rol_Role_t RegRemRole, struct ListCodGrps *LstGrps,unsigned *NumUsrsRegistered); static void Enr_MarkOfficialStdsAsRemovable (long ImpGrpCod,bool RemoveSpecifiedUsrs); -static void Enr_PutFormToRemAllStdsThisCrs (void); +static void Enr_PutLinkToRemAllStdsThisCrs (void); static void Enr_RemoveEnrollmentRequest (long CrsCod,long UsrCod); -static void Enr_PutFormToAdminOneUsr (void); +static void Enr_PutLinkToAdminOneUsr (void); +static void Enr_PutLinkToAdminSeveralUsrs (void); static void Enr_ReqAnotherUsrIDToRegisterRemove (void); static void Enr_AskIfRegRemMe (void); @@ -500,7 +501,7 @@ void Enr_ReqAdminUsrs (void) static void Enr_ShowFormRegRemSeveralUsrs (void) { extern const char *The_ClassTitle[The_NUM_THEMES]; - extern const char *Txt_Admin_users; + extern const char *Txt_Admin_several_users; extern const char *Txt_Step_1_Provide_a_list_of_users; extern const char *Txt_Option_a_Import_students_from_the_official_lists; extern const char *Txt_Select_the_groups_of_students_you_want_to_register_in_remove_from_this_course; @@ -515,21 +516,24 @@ static void Enr_ShowFormRegRemSeveralUsrs (void) extern const char *Txt_Confirm; bool ExternalUsrsServiceAvailable = (Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND[0] != '\0'); + /***** Put contextual links *****/ fprintf (Gbl.F.Out,"
"); - /***** Put form to go to admin one user *****/ - Enr_PutFormToAdminOneUsr (); + /* Put link to go to admin one user */ + Enr_PutLinkToAdminOneUsr (); - /***** Put link to remove all the students in the current course *****/ + /* Put link to remove all the students in the current course */ if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected - Enr_PutFormToRemAllStdsThisCrs (); + Enr_PutLinkToRemAllStdsThisCrs (); - /***** Put link to remove old users *****/ + /* Put link to remove old users */ if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM) - Enr_PutFormToRemOldUsrs (); + Enr_PutLinkToRemOldUsrs (); + + fprintf (Gbl.F.Out,"
"); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_users); + Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_several_users); fprintf (Gbl.F.Out,"" ""); @@ -614,8 +618,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void) Lay_PutSendButton (Txt_Confirm); /***** End of form *****/ - fprintf (Gbl.F.Out,"" - "
"); + fprintf (Gbl.F.Out,""); /***** End frame *****/ fprintf (Gbl.F.Out,"" @@ -627,7 +630,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void) /******************** Put a link (form) to remove old users ******************/ /*****************************************************************************/ -static void Enr_PutFormToRemOldUsrs (void) +static void Enr_PutLinkToRemOldUsrs (void) { extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_Remove_old_users; @@ -778,7 +781,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void) "%s: " "" "" - "