diff --git a/swad_account.c b/swad_account.c index 48daf996..71f938b0 100644 --- a/swad_account.c +++ b/swad_account.c @@ -313,7 +313,7 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD Gbl.RowEvenOdd); UsrDat->Sex = Usr_SEX_UNKNOWN; Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_TCH); - Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_NED_TCH); + Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_NET); Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_STD); fprintf (Gbl.F.Out,"" ""); diff --git a/swad_action.c b/swad_action.c index 6e96ff5a..cb05d542 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1080,8 +1080,9 @@ Users: 882. ActNewAdmDeg Register an administrador in this degree 883. ActRemAdmDeg Remove an administrador of this degree - 884. ActRcvFrmEnrSevStd Receive a form with IDs of users to be registeres/removed to/from current course - 885. ActRcvFrmEnrSevTch Receive a form with IDs of users to be registeres/removed to/from current course + 884. ActRcvFrmEnrSevStd Receive a form with IDs of students to be registered/removed to/from current course + NEW. ActRcvFrmEnrSevNET Receive a form with IDs of non-editing teachers to be registered/removed to/from current course + 885. ActRcvFrmEnrSevTch Receive a form with IDs of teachers to be registered/removed to/from current course 889. ActCnfID_Oth Confirm another user's ID 890. ActCnfID_Std Confirm another user's ID @@ -2476,9 +2477,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActLogInUsrAgdLan */{1616,-1,TabUnk,ActLstTch ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowOtherAgendaAfterLogIn ,NULL}, /* ActSeeUsrAgd */{1611,-1,TabUnk,ActLstTch ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowUsrAgenda ,NULL}, - /* ActReqEnrSevStd */{1426,-1,TabUnk,ActLstStd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminStds ,NULL}, - /* ActReqEnrSevNEdTch*/{1642,-1,TabUnk,ActLstTch ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminNonEditingTchs ,NULL}, - /* ActReqEnrSevTch */{1427,-1,TabUnk,ActLstTch ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminTchs ,NULL}, + /* ActReqEnrSevStd */{1426,-1,TabUnk,ActLstStd ,0x3E0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminStds ,NULL}, + /* ActReqEnrSevNEdTch*/{1642,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminNonEditingTchs ,NULL}, + /* ActReqEnrSevTch */{1427,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReqAdminTchs ,NULL}, /* ActReqLstStdAtt */{1073,-1,TabUnk,ActSeeAtt ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_ReqListStdsAttendanceCrs ,NULL}, /* ActSeeLstMyAtt */{1473,-1,TabUnk,ActSeeAtt ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_ListMyAttendanceCrs ,NULL}, @@ -2556,8 +2557,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActNewAdmDeg */{ 586,-1,TabUnk,ActLstOth ,0x380,0x380,0x380,0x380,0x380,0x380,0x380,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_AddAdmToDeg ,NULL}, /* ActRemAdmDeg */{ 584,-1,TabUnk,ActLstOth ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_RemAdmDeg ,NULL}, - /* ActRcvFrmEnrSevStd*/{1428,-1,TabUnk,ActLstStd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReceiveFormAdminStds ,NULL}, - /* ActRcvFrmEnrSevTch*/{1429,-1,TabUnk,ActLstTch ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReceiveFormAdminTchs ,NULL}, + /* ActRcvFrmEnrSevStd*/{1428,-1,TabUnk,ActLstStd ,0x3E0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReceiveFormAdminStds ,NULL}, + /* ActRcvFrmEnrSevNET*/{1643,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReceiveFormAdminNonEditTchs,NULL}, + /* ActRcvFrmEnrSevTch*/{1429,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Enr_ReceiveFormAdminTchs ,NULL}, /* ActCnfID_Oth */{1568,-1,TabUnk,ActLstOth ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, /* ActCnfID_Std */{1569,-1,TabUnk,ActLstStd ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, @@ -4635,6 +4637,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActAccEnrNEdTch, // #1640 ActRemMe_NEdTch, // #1641 ActReqEnrSevNEdTch, // #1642 + ActRcvFrmEnrSevNET, // #1643 }; /*****************************************************************************/ @@ -5128,7 +5131,7 @@ void Act_AdjustCurrentAction (void) case Rol_STD: Gbl.Action.Act = ActReqAccEnrStd; break; - case Rol_NED_TCH: + case Rol_NET: Gbl.Action.Act = ActReqAccEnrNEdTch; break; case Rol_TCH: @@ -5195,7 +5198,7 @@ void Act_AdjustCurrentAction (void) if (Gbl.Action.Act == ActMnu) // Do the following check sometimes, for example when the user changes the current tab Gbl.CurrentCrs.Info.ShowMsgMustBeRead = Inf_GetIfIMustReadAnyCrsInfoInThisCrs (); break; - case Rol_NED_TCH: + case Rol_NET: break; case Rol_TCH: if (Gbl.Action.Act == ActReqTst || diff --git a/swad_action.h b/swad_action.h index 77fb5320..4ff56957 100644 --- a/swad_action.h +++ b/swad_action.h @@ -57,9 +57,9 @@ typedef enum typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action -#define Act_NUM_ACTIONS (1 + 9 + 43 + 17 + 47 + 32 + 24 + 115 + 72 + 416 + 160 + 172 + 42 + 14 + 97) +#define Act_NUM_ACTIONS (1 + 9 + 43 + 17 + 47 + 32 + 24 + 115 + 72 + 416 + 161 + 172 + 42 + 14 + 97) -#define Act_MAX_ACTION_COD 1642 +#define Act_MAX_ACTION_COD 1643 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 12 @@ -1098,52 +1098,53 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActRemAdmDeg (ActChgNumRowFooGrp + 120) #define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp + 121) -#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp + 122) +#define ActRcvFrmEnrSevNET (ActChgNumRowFooGrp + 122) +#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp + 123) -#define ActCnfID_Oth (ActChgNumRowFooGrp + 123) -#define ActCnfID_Std (ActChgNumRowFooGrp + 124) -#define ActCnfID_Tch (ActChgNumRowFooGrp + 125) +#define ActCnfID_Oth (ActChgNumRowFooGrp + 124) +#define ActCnfID_Std (ActChgNumRowFooGrp + 125) +#define ActCnfID_Tch (ActChgNumRowFooGrp + 126) -#define ActFrmIDsOth (ActChgNumRowFooGrp + 126) -#define ActFrmIDsStd (ActChgNumRowFooGrp + 127) -#define ActFrmIDsTch (ActChgNumRowFooGrp + 128) -#define ActRemID_Oth (ActChgNumRowFooGrp + 129) -#define ActRemID_Std (ActChgNumRowFooGrp + 130) -#define ActRemID_Tch (ActChgNumRowFooGrp + 131) -#define ActNewID_Oth (ActChgNumRowFooGrp + 132) -#define ActNewID_Std (ActChgNumRowFooGrp + 133) -#define ActNewID_Tch (ActChgNumRowFooGrp + 134) -#define ActFrmPwdOth (ActChgNumRowFooGrp + 135) -#define ActFrmPwdStd (ActChgNumRowFooGrp + 136) -#define ActFrmPwdTch (ActChgNumRowFooGrp + 137) -#define ActChgPwdOth (ActChgNumRowFooGrp + 138) -#define ActChgPwdStd (ActChgNumRowFooGrp + 139) -#define ActChgPwdTch (ActChgNumRowFooGrp + 140) -#define ActFrmMaiOth (ActChgNumRowFooGrp + 141) -#define ActFrmMaiStd (ActChgNumRowFooGrp + 142) -#define ActFrmMaiTch (ActChgNumRowFooGrp + 143) -#define ActRemMaiOth (ActChgNumRowFooGrp + 144) -#define ActRemMaiStd (ActChgNumRowFooGrp + 145) -#define ActRemMaiTch (ActChgNumRowFooGrp + 146) -#define ActNewMaiOth (ActChgNumRowFooGrp + 147) -#define ActNewMaiStd (ActChgNumRowFooGrp + 148) -#define ActNewMaiTch (ActChgNumRowFooGrp + 149) +#define ActFrmIDsOth (ActChgNumRowFooGrp + 127) +#define ActFrmIDsStd (ActChgNumRowFooGrp + 128) +#define ActFrmIDsTch (ActChgNumRowFooGrp + 129) +#define ActRemID_Oth (ActChgNumRowFooGrp + 130) +#define ActRemID_Std (ActChgNumRowFooGrp + 131) +#define ActRemID_Tch (ActChgNumRowFooGrp + 132) +#define ActNewID_Oth (ActChgNumRowFooGrp + 133) +#define ActNewID_Std (ActChgNumRowFooGrp + 134) +#define ActNewID_Tch (ActChgNumRowFooGrp + 135) +#define ActFrmPwdOth (ActChgNumRowFooGrp + 136) +#define ActFrmPwdStd (ActChgNumRowFooGrp + 137) +#define ActFrmPwdTch (ActChgNumRowFooGrp + 138) +#define ActChgPwdOth (ActChgNumRowFooGrp + 139) +#define ActChgPwdStd (ActChgNumRowFooGrp + 140) +#define ActChgPwdTch (ActChgNumRowFooGrp + 141) +#define ActFrmMaiOth (ActChgNumRowFooGrp + 142) +#define ActFrmMaiStd (ActChgNumRowFooGrp + 143) +#define ActFrmMaiTch (ActChgNumRowFooGrp + 144) +#define ActRemMaiOth (ActChgNumRowFooGrp + 145) +#define ActRemMaiStd (ActChgNumRowFooGrp + 146) +#define ActRemMaiTch (ActChgNumRowFooGrp + 147) +#define ActNewMaiOth (ActChgNumRowFooGrp + 148) +#define ActNewMaiStd (ActChgNumRowFooGrp + 149) +#define ActNewMaiTch (ActChgNumRowFooGrp + 150) -#define ActRemStdCrs (ActChgNumRowFooGrp + 150) -#define ActRemTchCrs (ActChgNumRowFooGrp + 151) -#define ActRemUsrGbl (ActChgNumRowFooGrp + 152) +#define ActRemStdCrs (ActChgNumRowFooGrp + 151) +#define ActRemTchCrs (ActChgNumRowFooGrp + 152) +#define ActRemUsrGbl (ActChgNumRowFooGrp + 153) -#define ActReqRemAllStdCrs (ActChgNumRowFooGrp + 153) -#define ActRemAllStdCrs (ActChgNumRowFooGrp + 154) +#define ActReqRemAllStdCrs (ActChgNumRowFooGrp + 154) +#define ActRemAllStdCrs (ActChgNumRowFooGrp + 155) -#define ActReqRemOldUsr (ActChgNumRowFooGrp + 155) -#define ActRemOldUsr (ActChgNumRowFooGrp + 156) +#define ActReqRemOldUsr (ActChgNumRowFooGrp + 156) +#define ActRemOldUsr (ActChgNumRowFooGrp + 157) -#define ActLstDupUsr (ActChgNumRowFooGrp + 157) -#define ActLstSimUsr (ActChgNumRowFooGrp + 158) -#define ActRemDupUsr (ActChgNumRowFooGrp + 159) +#define ActLstDupUsr (ActChgNumRowFooGrp + 158) +#define ActLstSimUsr (ActChgNumRowFooGrp + 159) +#define ActRemDupUsr (ActChgNumRowFooGrp + 160) -#define ActLstClk (ActChgNumRowFooGrp + 160) +#define ActLstClk (ActChgNumRowFooGrp + 161) /*****************************************************************************/ /******************************** Social tab *********************************/ diff --git a/swad_announcement.c b/swad_announcement.c index 39771e8f..b571e37e 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -428,12 +428,12 @@ void Ann_ShowFormAnnouncement (void) Rol_WriteSelectorRoles (1 << Rol_UNK | 1 << Rol_GST | 1 << Rol_STD | - 1 << Rol_NED_TCH | + 1 << Rol_NET | 1 << Rol_TCH, 1 << Rol_UNK | 1 << Rol_GST | 1 << Rol_STD | - 1 << Rol_NED_TCH | + 1 << Rol_NET | 1 << Rol_TCH, false,false); fprintf (Gbl.F.Out,"" diff --git a/swad_assignment.c b/swad_assignment.c index 6c02400c..15978d9f 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -589,7 +589,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) Lay_PutContextualIconToEdit (ActEdiOneAsg,Asg_PutParams); // no break case Rol_STD: - case Rol_NED_TCH: + case Rol_NET: /***** Put form to print assignment *****/ Lay_PutContextualIconToPrint (ActPrnOneAsg,Asg_PutParams); break; @@ -1717,7 +1717,7 @@ static bool Asg_CheckIfIBelongToCrsOrGrpsThisAssignment (long AsgCod) switch (Gbl.Usrs.Me.LoggedRole) { case Rol_STD: - case Rol_NED_TCH: + case Rol_NET: case Rol_TCH: // Students and teachers can do assignments depending on groups /***** Get if I can do an assignment from database *****/ diff --git a/swad_attendance.c b/swad_attendance.c index b7a8ec61..a676d136 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -168,7 +168,7 @@ void Att_SeeAttEvents (void) case Rol_STD: Att_PutFormToListMyAttendance (); break; - case Rol_NED_TCH: + case Rol_NET: case Rol_TCH: case Rol_SYS_ADM: Att_PutFormToListStdsAttendance (); @@ -1825,7 +1825,7 @@ void Att_SeeOneAttEvent (void) case Rol_STD: Att_ListAttOnlyMeAsStudent (&Att); break; - case Rol_NED_TCH: + case Rol_NET: case Rol_TCH: case Rol_SYS_ADM: /***** Show list of students *****/ diff --git a/swad_centre.c b/swad_centre.c index 74089231..f39efecb 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -620,7 +620,7 @@ static void Ctr_Configuration (bool PrintView) /***** Number of users in courses of this centre *****/ Ctr_ShowNumUsrsInCrssOfCtr (Rol_TCH); - Ctr_ShowNumUsrsInCrssOfCtr (Rol_NED_TCH); + Ctr_ShowNumUsrsInCrssOfCtr (Rol_NET); Ctr_ShowNumUsrsInCrssOfCtr (Rol_STD); Ctr_ShowNumUsrsInCrssOfCtr (Rol_UNK); } diff --git a/swad_changelog.h b/swad_changelog.h index 182f2344..ed9917d1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -233,13 +233,17 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.220.6 (2017-05-21)" +#define Log_PLATFORM_VERSION "SWAD 16.220.7 (2017-05-21)" #define CSS_FILE "swad16.209.3.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.220.7: May 21, 2017 Changes related with new role. Not finished. (219535 lines) + 1 change necessary in database: +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1643','es','N','Inscribir/eliminar varios profesores no editores'); + Version 16.220.6: May 21, 2017 Changes related with new role. Not finished. (219485 lines) 1 change necessary in database: INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1642','es','N','Administrar varios profesores no editores'); diff --git a/swad_chat.c b/swad_chat.c index 25b9c4b9..93157c88 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -166,7 +166,7 @@ void Cht_ShowListOfAvailableChatRooms (void) ThisRoomFullName,ThisRoomFullName); Cht_WriteLinkToChat2 ("GBL_STD",ThisRoomFullName); break; - case Rol_NED_TCH: + case Rol_NET: case Rol_TCH: sprintf (ThisRoomFullName,"%s (%s)", Txt_General,Txt_ROLES_PLURAL_abc[Rol_TCH][Usr_SEX_ALL]); @@ -481,7 +481,7 @@ void Cht_OpenChatWindow (void) Cht_MAX_BYTES_ROOM_FULL_NAMES); } - if (Gbl.Usrs.Me.LoggedRole == Rol_NED_TCH || + if (Gbl.Usrs.Me.LoggedRole == Rol_NET || Gbl.Usrs.Me.LoggedRole == Rol_TCH) if (strcmp (RoomCode,"GBL_TCH")) { diff --git a/swad_connected.c b/swad_connected.c index e31f2b41..0ac9b580 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -436,7 +436,7 @@ void Con_ComputeConnectedUsrsBelongingToCurrentCrs (void) Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_TCH); /***** Number of non-editing teachers *****/ - Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_NED_TCH); + Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_NET); /***** Number of students *****/ Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_STD); @@ -485,7 +485,7 @@ static void Con_ShowConnectedUsrsBelongingToLocation (void) /***** Number of teachers and students *****/ fprintf (Gbl.F.Out,"