From 37d9ed9448d381395c3d432d4491da995b6ae918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 14 Sep 2015 17:25:21 +0200 Subject: [PATCH] Version 14.130.3 --- swad_action.c | 12 ++++++------ swad_action.h | 4 ++-- swad_changelog.h | 3 ++- swad_enrollment.c | 15 +++++++-------- swad_text.c | 20 ++++++++++---------- swad_user.c | 11 +++++------ 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/swad_action.c b/swad_action.c index f49f99704..b0610d0af 100644 --- a/swad_action.c +++ b/swad_action.c @@ -896,8 +896,8 @@ Users: 743. ActChgVisFie Request change in visibility of a record field 744. ActRcvRecCrs Receive and update fields of my record in this course - 699b. ActReqMdfSevStd Request the enrollment/removing of several users to / from current course - 699c. ActReqMdfSevTch Request the enrollment/removing of several users to / from current course + 699b. ActReqEnrSevStd Request the enrollment/removing of several users to / from current course + 699c. ActReqEnrSevTch Request the enrollment/removing of several users to / from current course 745. ActReqLstAttStd Request listing of attendance of several students to several events 746. ActSeeLstAttStd List attendance of several students to several events @@ -2288,8 +2288,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgVisFie */{ 297,-1,TabUsr,ActLstStd ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ChangeVisibilityField ,NULL}, /* ActRcvRecCrs */{ 301,-1,TabUsr,ActLstStd ,0x108,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_UpdateAndShowMyCrsRecord ,NULL}, - /* ActReqMdfSevStd */{1426,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqAdminStds ,NULL}, - /* ActReqMdfSevTch */{1427,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqAdminTchs ,NULL}, + /* ActReqEnrSevStd */{1426,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqAdminStds ,NULL}, + /* ActReqEnrSevTch */{1427,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqAdminTchs ,NULL}, /* ActReqLstAttStd */{1073,-1,TabUsr,ActSeeAtt ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ReqListAttendanceStdsCrs ,NULL}, /* ActSeeLstAttStd */{1074,-1,TabUsr,ActSeeAtt ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ListAttendanceStdsCrs ,NULL}, @@ -4128,8 +4128,8 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq ActUpdOthStd, // #1423 ActUpdOthTch, // #1424 ActUpdOthAdm, // #1425 - ActReqMdfSevStd, // #1426 - ActReqMdfSevTch, // #1427 + ActReqEnrSevStd, // #1426 + ActReqEnrSevTch, // #1427 ActRcvFrmEnrSevStd, // #1428 ActRcvFrmEnrSevTch, // #1429 }; diff --git a/swad_action.h b/swad_action.h index 545ea0f39..19e32f6bd 100644 --- a/swad_action.h +++ b/swad_action.h @@ -922,8 +922,8 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica #define ActChgVisFie (ActChgNumRowFooGrp+ 52) #define ActRcvRecCrs (ActChgNumRowFooGrp+ 53) -#define ActReqMdfSevStd (ActChgNumRowFooGrp+ 54) -#define ActReqMdfSevTch (ActChgNumRowFooGrp+ 55) +#define ActReqEnrSevStd (ActChgNumRowFooGrp+ 54) +#define ActReqEnrSevTch (ActChgNumRowFooGrp+ 55) #define ActReqLstAttStd (ActChgNumRowFooGrp+ 56) #define ActSeeLstAttStd (ActChgNumRowFooGrp+ 57) diff --git a/swad_changelog.h b/swad_changelog.h index 74f43b933..4513d50cb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -98,11 +98,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.130.2 (2015/09/14)" +#define Log_PLATFORM_VERSION "SWAD 14.130.3 (2015/09/14)" // 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 14.130.3: Sep 14, 2015 Changes in user enrollment. (184358 lines) Version 14.130.2: Sep 14, 2015 Changes in user enrollment. (184359 lines) Version 14.130.1: Sep 14, 2015 Changes and bug fixing in user enrollment. (184416 lines) 3 changes necessary in database: diff --git a/swad_enrollment.c b/swad_enrollment.c index 26071ce1d..5301e82cf 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -464,16 +464,15 @@ static void Enr_ReqAdminUsrs (Rol_Role_t Role) Enr_AskIfRegRemMe (Rol_STUDENT); break; case Rol_TEACHER: - if (Gbl.CurrentCrs.Crs.CrsCod > 0) - Enr_ShowFormRegRemSeveralUsrs (Role); + if (Gbl.CurrentCrs.Crs.CrsCod > 0 && + Role == Rol_STUDENT) + Enr_ShowFormRegRemSeveralUsrs (Rol_STUDENT); else Enr_AskIfRegRemMe (Rol_TEACHER); break; case Rol_DEG_ADM: case Rol_CTR_ADM: case Rol_INS_ADM: - Enr_ReqRegRemUsr (Rol_DEG_ADM); - break; case Rol_SYS_ADM: if (Gbl.CurrentCrs.Crs.CrsCod > 0) Enr_ShowFormRegRemSeveralUsrs (Role); @@ -1105,7 +1104,7 @@ void Enr_ReceiveFormAdminTchs (void) static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) { - extern const char *Txt_You_must_specify_in_step_3_the_action_to_perform; + extern const char *Txt_You_must_specify_in_step_2_the_action_to_perform; extern const char *Txt_In_a_type_of_group_with_single_enrollment_students_can_not_be_registered_in_more_than_one_group; extern const char *Txt_No_user_has_been_eliminated; extern const char *Txt_One_user_has_been_eliminated; @@ -1218,7 +1217,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) Lay_ShowErrorAndExit ("Wrong registering / removing specification."); else { - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_in_step_3_the_action_to_perform); + Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_in_step_2_the_action_to_perform); /* Show form again */ Enr_ShowFormRegRemSeveralUsrs (Role); @@ -2569,8 +2568,8 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role) extern const char *Txt_Admin_several_students; extern const char *Txt_Admin_several_teachers; - Act_PutContextualLink (Role == Rol_STUDENT ? ActReqMdfSevStd : - ActReqMdfSevTch, + Act_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd : + ActReqEnrSevTch, NULL,"configtest", Role == Rol_STUDENT ? Txt_Admin_several_students : Txt_Admin_several_teachers); diff --git a/swad_text.c b/swad_text.c index bdc41ed91..a4bbaa950 100644 --- a/swad_text.c +++ b/swad_text.c @@ -50728,25 +50728,25 @@ const char *Txt_You_must_send_your_photo_because_ = " allowed without photo."; // Necessita de tradução #endif -const char *Txt_You_must_specify_in_step_3_the_action_to_perform = +const char *Txt_You_must_specify_in_step_2_the_action_to_perform = #if L==0 - "S'ha d'especificar en el pas 3 l'acció a realitzar."; + "S'ha d'especificar en el pas 2 l'acció a realitzar."; #elif L==1 - "Sie müssen in Schritt 3 die auszuführende Aktion festzulegen."; + "Sie müssen in Schritt 2 die auszuführende Aktion festzulegen."; #elif L==2 - "You must specify in step 3 the action to perform."; + "You must specify in step 2 the action to perform."; #elif L==3 - "Debe especificar en el paso 3 la acción a realizar."; + "Debe especificar en el paso 2 la acción a realizar."; #elif L==4 - "Vous devez spécifier à l'étape 3 l'action à effectuer."; + "Vous devez spécifier à l'étape 2 l'action à effectuer."; #elif L==5 - "Debe especificar en el paso 3 la acción a realizar."; // Okoteve traducción + "Debe especificar en el paso 2 la acción a realizar."; // Okoteve traducción #elif L==6 - "È necessario specificare al punto 3 l'azione da eseguire."; + "È necessario specificare al punto 2 l'azione da eseguire."; #elif L==7 - "You must specify in step 3 the action to perform."; // Potrzebujesz tlumaczenie + "You must specify in step 2 the action to perform."; // Potrzebujesz tlumaczenie #elif L==8 - "Você deve especificar no passo 3 a ação a ser executada."; + "Você deve especificar no passo 2 a ação a ser executada."; #endif const char *Txt_You_must_specify_the_image_of_the_new_banner = diff --git a/swad_user.c b/swad_user.c index 6df87686f..d2720f583 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6424,9 +6424,8 @@ void Usr_SeeStudents (void) bool ICanViewRecords; /***** Put contextual links *****/ - if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected - (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || // My role in current course is teacher... - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)) // ...or system admin + if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected + Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER) // I am logged as teacher or admin { fprintf (Gbl.F.Out,"
"); @@ -6604,8 +6603,7 @@ void Usr_SeeTeachers (void) /***** Put contextual links *****/ if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected - (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || // My role in current course is teacher... - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)) // ...or system admin + Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER) // ...or I am logged as teacher or admin { fprintf (Gbl.F.Out,"
"); @@ -6613,7 +6611,8 @@ void Usr_SeeTeachers (void) Enr_PutLinkToAdminOneUsr (ActReqMdfOneTch); /* Put link to go to admin several users */ - Enr_PutLinkToAdminSeveralUsrs (Rol_TEACHER); + if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM) // I am logged as admin + Enr_PutLinkToAdminSeveralUsrs (Rol_TEACHER); fprintf (Gbl.F.Out,"
"); }