diff --git a/swad_ID.c b/swad_ID.c
index e4756429..569108d1 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -406,13 +406,13 @@ bool ID_ICanSeeOtherUsrIDs (const struct UsrData *UsrDat)
/***** Check if I have permission to see another user's IDs *****/
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
/* Check 1: I can see the IDs of users who do not exist in database */
if (UsrDat->UsrCod <= 0) // User does not exist (when creating a new user)
return true;
/* Check 2: I can see the IDs of confirmed students */
- if (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT && // A student
+ if (UsrDat->RoleInCurrentCrsDB == Rol_STD && // A student
UsrDat->Accepted) // who accepted registration
return true;
@@ -450,8 +450,8 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
extern const char *Txt_Confirm_ID;
/***** Start form *****/
- Act_FormStartAnchor ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActCnfID_Std :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActCnfID_Tch :
+ Act_FormStartAnchor ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActCnfID_Std :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActCnfID_Tch :
ActCnfID_Oth),
Anchor);
if (Gbl.Action.Original != ActUnk)
@@ -498,8 +498,8 @@ void ID_PutLinkToChangeUsrIDs (void)
Txt_Change_IDs,Txt_Change_IDs,
NULL);
else // Not me
- Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch :
+ Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActFrmIDsStd :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActFrmIDsTch :
ActFrmIDsOth), // Guest, visitor or admin
NULL,Usr_PutParamOtherUsrCodEncrypted,
"arroba64x64.gif",
@@ -587,8 +587,8 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActRemID_Me);
else
{
- Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemID_Std :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemID_Tch :
+ Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActRemID_Std :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActRemID_Tch :
ActRemID_Oth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
@@ -641,8 +641,8 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActNewIDMe);
else
{
- Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActNewID_Std :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActNewID_Tch :
+ Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActNewID_Std :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActNewID_Tch :
ActNewID_Oth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
diff --git a/swad_account.c b/swad_account.c
index 8d39f11e..196cd609 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -312,8 +312,8 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD
"
",
Gbl.RowEvenOdd);
UsrDat->Sex = Usr_SEX_UNKNOWN;
- Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_TEACHER);
- Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_STUDENT);
+ Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_TCH);
+ Crs_GetAndWriteCrssOfAUsr (UsrDat,Rol_STD);
fprintf (Gbl.F.Out," "
"");
}
diff --git a/swad_action.c b/swad_action.c
index 25c1c165..e6ff72a4 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -5073,7 +5073,7 @@ void Act_AdjustCurrentAction (void)
or if I'm a teacher and I haven't filled my centre or department,
the only action possible is to show a form to change my common record *****/
Rol_GetRolesInAllCrssIfNotYetGot (&Gbl.Usrs.Me.UsrDat);
- IAmATeacher = (Gbl.Usrs.Me.UsrDat.Roles & (1 << Rol_TEACHER));
+ IAmATeacher = (Gbl.Usrs.Me.UsrDat.Roles & (1 << Rol_TCH));
if (Gbl.Usrs.Me.UsrDat.InsCod < 0 ||
(IAmATeacher && (Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0 ||
Gbl.Usrs.Me.UsrDat.Tch.DptCod < 0)))
@@ -5111,7 +5111,7 @@ void Act_AdjustCurrentAction (void)
the only action possible is show a form to ask for enrolment *****/
if (!Gbl.Usrs.Me.UsrDat.Accepted && Gbl.Action.Act != ActLogOut)
{
- Gbl.Action.Act = (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT) ? ActReqAccEnrStd :
+ Gbl.Action.Act = (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STD) ? ActReqAccEnrStd :
ActReqAccEnrTch;
Tab_SetCurrentTab ();
return;
@@ -5120,7 +5120,7 @@ void Act_AdjustCurrentAction (void)
/***** Depending on the role I am logged... *****/
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_STUDENT:
+ case Rol_STD:
switch (Gbl.Action.Act)
{
case ActLogIn:
@@ -5154,7 +5154,7 @@ void Act_AdjustCurrentAction (void)
/* If I have no photo, and current action is not available for unknown users,
then update number of clicks without photo */
if (!Gbl.Usrs.Me.MyPhotoExists)
- if (!(Act_Actions[Gbl.Action.Act].PermissionCrsIfIBelong & (1 << Rol_UNKNOWN)) && // If current action is not available for unknown users...
+ if (!(Act_Actions[Gbl.Action.Act].PermissionCrsIfIBelong & (1 << Rol_UNK)) && // If current action is not available for unknown users...
Gbl.Action.Act != ActReqMyPho) // ...and current action is not ActReqMyPho...
if ((Gbl.Usrs.Me.NumAccWithoutPhoto = Pho_UpdateMyClicksWithoutPhoto ()) > Pho_MAX_CLICKS_WITHOUT_PHOTO)
{
@@ -5171,7 +5171,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_TEACHER:
+ case Rol_TCH:
if (Gbl.Action.Act == ActReqTst ||
Gbl.Action.Act == ActEdiTstQst)
/***** If current course has tests and pluggable is unknown,
diff --git a/swad_announcement.c b/swad_announcement.c
index d8357bb0..06dc970d 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -115,7 +115,7 @@ void Ann_ShowAllAnnouncements (void)
" WHERE Status=%u AND (Roles&%u)<>0 "
" ORDER BY AnnCod DESC",
(unsigned) Ann_ACTIVE_ANNOUNCEMENT,
- (unsigned) (1 << Rol_UNKNOWN));
+ (unsigned) (1 << Rol_UNK));
NumAnnouncements = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get announcements");
/***** Start frame *****/
@@ -343,8 +343,8 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
/* Users' roles who can view this announcement */
fprintf (Gbl.F.Out,"%s:",
UsersClass[Status],Txt_Users);
- for (Role = Rol_UNKNOWN, SomeRolesAreSelected = false;
- Role <= Rol_TEACHER;
+ for (Role = Rol_UNK, SomeRolesAreSelected = false;
+ Role <= Rol_TCH;
Role++)
if (Roles & (1 << Role))
{
@@ -425,14 +425,14 @@ void Ann_ShowFormAnnouncement (void)
"
",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Users);
- Rol_WriteSelectorRoles (1 << Rol_UNKNOWN |
- 1 << Rol__GUEST_ |
- 1 << Rol_STUDENT |
- 1 << Rol_TEACHER,
- 1 << Rol_UNKNOWN |
- 1 << Rol__GUEST_ |
- 1 << Rol_STUDENT |
- 1 << Rol_TEACHER,
+ Rol_WriteSelectorRoles (1 << Rol_UNK |
+ 1 << Rol_GST |
+ 1 << Rol_STD |
+ 1 << Rol_TCH,
+ 1 << Rol_UNK |
+ 1 << Rol_GST |
+ 1 << Rol_STD |
+ 1 << Rol_TCH,
false,false);
fprintf (Gbl.F.Out," "
"");
diff --git a/swad_assignment.c b/swad_assignment.c
index 898849fe..e4684d9b 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -241,7 +241,7 @@ static void Asg_PutHeadForSeeing (bool PrintView)
static bool Asg_CheckIfICanCreateAssignments (void)
{
- return (bool) (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ return (bool) (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
}
@@ -508,7 +508,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
bool ICanSendFiles = !Asg->Hidden && // It's visible (not hidden)
Asg->Open && // It's open (inside dates)
Asg->IBelongToCrsOrGrps && // I belong to course or groups
- Gbl.Usrs.Me.LoggedRole == Rol_STUDENT; // I am a student
+ Gbl.Usrs.Me.LoggedRole == Rol_STD; // I am a student
/***** Folder icon *****/
if (!PrintView && // Not print view
@@ -574,7 +574,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
/***** Put form to remove assignment *****/
Lay_PutContextualIconToRemove (ActReqRemAsg,Asg_PutParams);
@@ -588,7 +588,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
/***** Put form to edit assignment *****/
Lay_PutContextualIconToEdit (ActEdiOneAsg,Asg_PutParams);
// no break
- case Rol_STUDENT:
+ case Rol_STD:
/***** Put form to print assignment *****/
Lay_PutContextualIconToPrint (ActPrnOneAsg,Asg_PutParams);
break;
@@ -630,7 +630,7 @@ void Asg_GetListAssignments (void)
/***** Get list of assignments from database *****/
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
HiddenSubQuery[0] = '\0';
break;
@@ -1713,8 +1713,8 @@ static bool Asg_CheckIfIBelongToCrsOrGrpsThisAssignment (long AsgCod)
{
char Query[512];
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ||
- Gbl.Usrs.Me.LoggedRole == Rol_TEACHER)
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD ||
+ Gbl.Usrs.Me.LoggedRole == Rol_TCH)
{
// Students and teachers can edit assignments depending on groups
/***** Get if I can edit an assignment from database *****/
@@ -1733,7 +1733,7 @@ static bool Asg_CheckIfIBelongToCrsOrGrpsThisAssignment (long AsgCod)
return (DB_QueryCOUNT (Query,"can not check if I can do an assignment") != 0);
}
else
- return (Gbl.Usrs.Me.LoggedRole > Rol_TEACHER); // Admins can edit assignments
+ return (Gbl.Usrs.Me.LoggedRole > Rol_TCH); // Admins can edit assignments
}
/*****************************************************************************/
diff --git a/swad_attendance.c b/swad_attendance.c
index 77ef4377..262fa85d 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -163,10 +163,10 @@ void Att_SeeAttEvents (void)
if (Gbl.AttEvents.Num)
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_STUDENT:
+ case Rol_STD:
Att_PutFormToListMyAttendance ();
break;
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
Att_PutFormToListStdsAttendance ();
break;
@@ -203,7 +203,7 @@ static void Att_ShowAllAttEvents (void)
Dat_StartEndTime_t Order;
struct Pagination Pagination;
unsigned NumAttEvent;
- bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
/***** Compute variables related to pagination *****/
@@ -261,7 +261,7 @@ static void Att_ShowAllAttEvents (void)
""
"",
Txt_Event,
- Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]);
+ Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN]);
/***** Write all the attendance events *****/
for (NumAttEvent = Pagination.FirstItemVisible, Gbl.RowEvenOdd = 0;
@@ -372,7 +372,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Gbl.RowEvenOdd);
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
Att_PutFormsToRemEditOneAttEvent (Att->AttCod,Att->Hidden);
break;
@@ -597,7 +597,7 @@ static void Att_GetListAttEvents (Att_OrderTime_t Order)
/***** Get list of attendance events from database *****/
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
HiddenSubQuery[0] = '\0';
break;
@@ -1819,10 +1819,10 @@ void Att_SeeOneAttEvent (void)
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_STUDENT:
+ case Rol_STD:
Att_ListAttOnlyMeAsStudent (&Att);
break;
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
/***** Show list of students *****/
Att_ListAttStudents (&Att);
@@ -1874,7 +1874,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
"%s"
""
"",
- Txt_ROLES_SINGUL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
+ Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
Txt_Student_comment,
Txt_Teachers_comment);
@@ -1912,7 +1912,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Grp_GetParCodsSeveralGrpsToShowUsrs ();
/***** Get and order list of students in this course *****/
- Usr_GetListUsrs (Rol_STUDENT,Sco_SCOPE_CRS);
+ Usr_GetListUsrs (Rol_STD,Sco_SCOPE_CRS);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,Hlp_USERS_Attendance);
@@ -1920,7 +1920,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
/***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt);
- if (Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs)
+ if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{
/***** Get my preference about photos in users' list for current course *****/
Usr_GetMyPrefAboutListWithPhotosFromDB ();
@@ -1952,17 +1952,17 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
"%s"
""
"",
- Txt_ROLES_SINGUL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
+ Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
Txt_Student_comment,
Txt_Teachers_comment);
/* List of students */
for (NumStd = 0, Gbl.RowEvenOdd = 0;
- NumStd < Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs;
+ NumStd < Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs;
NumStd++)
{
/* Copy user's basic data from list */
- Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_STUDENT].Lst[NumStd]);
+ Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_STD].Lst[NumStd]);
/* Get list of user's IDs */
ID_GetListIDsFromUsrCod (&UsrDat);
@@ -1982,13 +1982,13 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Usr_UsrDataDestructor (&UsrDat);
}
else
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End frame *****/
Lay_EndRoundFrame ();
/***** Free memory for students list *****/
- Usr_FreeUsrsList (Rol_STUDENT);
+ Usr_FreeUsrsList (Rol_STD);
/***** Free memory for list of selected groups *****/
Grp_FreeListCodSelectedGrps ();
@@ -2036,7 +2036,7 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
UsrDat->EncryptedUsrCod);
if (Present) // This student has attended to the event?
fprintf (Gbl.F.Out," checked=\"checked\"");
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT) // A student can not change his attendance
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD) // A student can not change his attendance
fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out," />"
"");
@@ -2084,7 +2084,7 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
/***** Student's comment: write form or text */
fprintf (Gbl.F.Out,"",
Gbl.RowEvenOdd);
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT && Att->Open) // Show with form
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD && Att->Open) // Show with form
fprintf (Gbl.F.Out," "
"");
@@ -365,7 +365,7 @@ static void Dup_ListSimilarUsrs (void)
}
else // There are no users
/***** Show warning indicating no users found *****/
- Usr_ShowWarningNoUsersFound (Rol_UNKNOWN);
+ Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End frame *****/
Lay_EndRoundFrame ();
diff --git a/swad_enrolment.c b/swad_enrolment.c
index f9b307ec..126d1959 100644
--- a/swad_enrolment.c
+++ b/swad_enrolment.c
@@ -145,7 +145,7 @@ void Enr_PutButtonToEnrolStudents (void)
/***** Form to enrol several students *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected
- Gbl.Usrs.Me.LoggedRole == Rol_TEACHER) // I am logged as teacher
+ Gbl.Usrs.Me.LoggedRole == Rol_TCH) // I am logged as teacher
{
Act_FormStart (ActReqEnrSevStd);
Lay_PutConfirmButton (Txt_Register_students);
@@ -197,8 +197,8 @@ void Enr_ModifyRoleInCurrentCrs (struct UsrData *UsrDat,Rol_Role_t NewRole)
/***** Check if user's role is allowed *****/
switch (NewRole)
{
- case Rol_STUDENT:
- case Rol_TEACHER:
+ case Rol_STD:
+ case Rol_TCH:
break;
default:
Lay_ShowErrorAndExit ("Wrong role.");
@@ -235,8 +235,8 @@ void Enr_RegisterUsrInCurrentCrs (struct UsrData *UsrDat,Rol_Role_t NewRole,
/***** Check if user's role is allowed *****/
switch (NewRole)
{
- case Rol_STUDENT:
- case Rol_TEACHER:
+ case Rol_STD:
+ case Rol_TCH:
break;
default:
Lay_ShowErrorAndExit ("Wrong role.");
@@ -285,10 +285,10 @@ static void Enr_NotifyAfterEnrolment (struct UsrData *UsrDat,Rol_Role_t NewRole)
/***** Check if user's role is allowed *****/
switch (NewRole)
{
- case Rol_STUDENT:
+ case Rol_STD:
NotifyEvent = Ntf_EVENT_ENROLMENT_STUDENT;
break;
- case Rol_TEACHER:
+ case Rol_TCH:
NotifyEvent = Ntf_EVENT_ENROLMENT_TEACHER;
break;
default:
@@ -365,13 +365,13 @@ void Enr_ReqAcceptRegisterInCrs (void)
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
/***** Send button to accept register in the current course *****/
- Act_FormStart (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActAccEnrStd :
+ Act_FormStart (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActAccEnrStd :
ActAccEnrTch);
Lay_PutCreateButtonInline (Txt_Confirm_my_enrolment);
Act_FormEnd ();
/***** Send button to refuse register in the current course *****/
- Act_FormStart (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActRemMe_Std :
+ Act_FormStart (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActRemMe_Std :
ActRemMe_Tch);
Lay_PutRemoveButtonInline (Txt_Remove_me_from_this_course);
Act_FormEnd ();
@@ -380,7 +380,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
Lay_EndRoundFrame ();
/***** Mark possible notification as seen *****/
- Ntf_MarkNotifAsSeen (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? Ntf_EVENT_ENROLMENT_STUDENT :
+ Ntf_MarkNotifAsSeen (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STD ? Ntf_EVENT_ENROLMENT_STUDENT :
Ntf_EVENT_ENROLMENT_TEACHER,
-1L,Gbl.CurrentCrs.Crs.CrsCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
@@ -520,12 +520,12 @@ void Enr_UpdateInstitutionCentreDepartment (void)
void Enr_ReqAdminStds (void)
{
- Enr_ReqAdminUsrs (Rol_STUDENT);
+ Enr_ReqAdminUsrs (Rol_STD);
}
void Enr_ReqAdminTchs (void)
{
- Enr_ReqAdminUsrs (Rol_TEACHER);
+ Enr_ReqAdminUsrs (Rol_TCH);
}
static void Enr_ReqAdminUsrs (Rol_Role_t Role)
@@ -534,18 +534,18 @@ static void Enr_ReqAdminUsrs (Rol_Role_t Role)
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol__GUEST_:
- Enr_AskIfRegRemMe (Rol__GUEST_);
+ case Rol_GST:
+ Enr_AskIfRegRemMe (Rol_GST);
break;
- case Rol_STUDENT:
- Enr_AskIfRegRemMe (Rol_STUDENT);
+ case Rol_STD:
+ Enr_AskIfRegRemMe (Rol_STD);
break;
- case Rol_TEACHER:
+ case Rol_TCH:
if (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
- Role == Rol_STUDENT)
- Enr_ShowFormRegRemSeveralUsrs (Rol_STUDENT);
+ Role == Rol_STD)
+ Enr_ShowFormRegRemSeveralUsrs (Rol_STD);
else
- Enr_AskIfRegRemMe (Rol_TEACHER);
+ Enr_AskIfRegRemMe (Rol_TCH);
break;
case Rol_DEG_ADM:
case Rol_CTR_ADM:
@@ -582,7 +582,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
extern const char *Txt_Confirm;
/***** Put contextual links *****/
- if (Role == Rol_STUDENT && // Users to admin: students
+ if (Role == Rol_STD && // Users to admin: students
Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected
Gbl.CurrentCrs.Crs.NumStds) // This course has students
{
@@ -595,12 +595,12 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
}
/***** Form to send students to be enroled / removed *****/
- Act_FormStart (Role == Rol_STUDENT ? ActRcvFrmEnrSevStd :
+ Act_FormStart (Role == Rol_STD ? ActRcvFrmEnrSevStd :
ActRcvFrmEnrSevTch);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,
- Role == Rol_STUDENT ? Txt_Administer_multiple_students :
+ Role == Rol_STD ? Txt_Administer_multiple_students :
Txt_Administer_multiple_teachers,
NULL,
Hlp_USERS_Administration_administer_multiple_users);
@@ -893,7 +893,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
/***** Register user in course / Modify user's data *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
- Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER)
+ Gbl.Usrs.Me.LoggedRole >= Rol_TCH)
{
sprintf (Gbl.Alert.Txt,UsrBelongsToCrs ? (ItsMe ? Txt_Modify_me_in_the_course_X :
Txt_Modify_user_in_the_course_X) :
@@ -1002,7 +1002,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
}
/***** Report user as possible duplicate *****/
- if (!ItsMe && Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER)
+ if (!ItsMe && Gbl.Usrs.Me.LoggedRole >= Rol_TCH)
{
fprintf (Gbl.F.Out,""
""
@@ -1242,12 +1242,12 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
void Enr_ReceiveFormAdminStds (void)
{
- Enr_ReceiveFormUsrsCrs (Rol_STUDENT);
+ Enr_ReceiveFormUsrsCrs (Rol_STD);
}
void Enr_ReceiveFormAdminTchs (void)
{
- Enr_ReceiveFormUsrsCrs (Rol_TEACHER);
+ Enr_ReceiveFormUsrsCrs (Rol_TCH);
}
static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
@@ -1285,9 +1285,9 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
/***** Check the role of users to register / remove *****/
switch (Role)
{
- case Rol_STUDENT:
+ case Rol_STD:
break;
- case Rol_TEACHER:
+ case Rol_TCH:
if (Gbl.Usrs.Me.LoggedRole < Rol_DEG_ADM) // Can I register/remove teachers?
// No, I can not (TODO: teachers should be able to register/remove existing teachers)
Lay_ShowErrorAndExit ("You are not allowed to perform this action.");
@@ -1368,7 +1368,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
/***** A student can't belong to more than one group when the type of group only allows to register in one group *****/
if (WhatToDo.RegisterUsrs &&
- Role == Rol_STUDENT &&
+ Role == Rol_STD &&
LstGrps.NumGrps >= 2)
/* Check if I have selected more than one group of single enrolment */
if (!Grp_CheckIfSelectionGrpsIsValid (&LstGrps))
@@ -1395,7 +1395,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
if (WhatToDo.RemoveUsrs)
{
/***** Get list of users in current course *****/
- Usr_GetListUsrs (Rol_STUDENT,Sco_SCOPE_CRS);
+ Usr_GetListUsrs (Rol_STD,Sco_SCOPE_CRS);
if (Gbl.Usrs.LstUsrs[Role].NumUsrs)
{
@@ -1673,8 +1673,8 @@ static void Enr_RegisterUsr (struct UsrData *UsrDat,Rol_Role_t RegRemRole,
struct ListCodGrps *LstGrps,unsigned *NumUsrsRegistered)
{
/***** Check if I can register this user *****/
- if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER &&
- RegRemRole != Rol_STUDENT)
+ if (Gbl.Usrs.Me.LoggedRole == Rol_TCH &&
+ RegRemRole != Rol_STD)
Lay_ShowErrorAndExit ("A teacher only can register several users as students.");
/***** Check if the record of the user exists and get the type of user *****/
@@ -1745,7 +1745,7 @@ void Enr_AskRemAllStdsThisCrs (void)
Lay_StartRoundFrame (NULL,Txt_Remove_all_students,NULL,
Hlp_USERS_Administration_remove_all_students);
- if ((NumStds = Usr_GetNumUsrsInCrs (Rol_STUDENT,Gbl.CurrentCrs.Crs.CrsCod)))
+ if ((NumStds = Usr_GetNumUsrsInCrs (Rol_STD,Gbl.CurrentCrs.Crs.CrsCod)))
{
/***** Show question and button to remove students *****/
/* Start alert */
@@ -1765,7 +1765,7 @@ void Enr_AskRemAllStdsThisCrs (void)
}
else
/***** Show warning indicating no students found *****/
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End frame *****/
Lay_EndRoundFrame ();
@@ -1790,7 +1790,7 @@ void Enr_RemAllStdsThisCrs (void)
}
else
/***** Show warning indicating no students found *****/
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
}
}
@@ -1806,21 +1806,21 @@ unsigned Enr_RemAllStdsInCrs (struct Course *Crs)
/***** Get list of students in current course *****/
Gbl.Usrs.ClassPhoto.AllGroups = true; // Get all the students of the current course
- Usr_GetListUsrs (Rol_STUDENT,Sco_SCOPE_CRS);
- NumStdsInCrs = Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs;
+ Usr_GetListUsrs (Rol_STD,Sco_SCOPE_CRS);
+ NumStdsInCrs = Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs;
/***** Remove all the students *****/
for (NumUsr = 0;
NumUsr < NumStdsInCrs;
NumUsr++)
{
- Gbl.Usrs.Other.UsrDat.UsrCod = Gbl.Usrs.LstUsrs[Rol_STUDENT].Lst[NumUsr].UsrCod;
+ Gbl.Usrs.Other.UsrDat.UsrCod = Gbl.Usrs.LstUsrs[Rol_STD].Lst[NumUsr].UsrCod;
Enr_EffectivelyRemUsrFromCrs (&Gbl.Usrs.Other.UsrDat,Crs,
Enr_REMOVE_WORKS,Cns_QUIET);
}
/***** Free memory for students list *****/
- Usr_FreeUsrsList (Rol_STUDENT);
+ Usr_FreeUsrsList (Rol_STD);
return NumStdsInCrs;
}
@@ -1835,15 +1835,15 @@ void Enr_ReqSignUpInCrs (void)
extern const char *Txt_ROLES_SINGUL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
/***** Check if I already belong to course *****/
- if (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB >= Rol_STUDENT)
+ if (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB >= Rol_STD)
{
sprintf (Gbl.Alert.Txt,Txt_You_were_already_enroled_as_X_in_the_course_Y,
Txt_ROLES_SINGUL_abc[Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB][Gbl.Usrs.Me.UsrDat.Sex],
Gbl.CurrentCrs.Crs.FullName);
Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt);
}
- else if (Gbl.Usrs.Me.LoggedRole == Rol__GUEST_ ||
- Gbl.Usrs.Me.LoggedRole == Rol_VISITOR)
+ else if (Gbl.Usrs.Me.LoggedRole == Rol_GST ||
+ Gbl.Usrs.Me.LoggedRole == Rol_USR)
/***** Show form to modify only the user's role or the user's data *****/
Rec_ShowFormSignUpWithMySharedRecord ();
else
@@ -1866,7 +1866,7 @@ void Enr_SignUpInCrs (void)
long ReqCod = -1L;
/***** Check if I already belong to course *****/
- if (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB >= Rol_STUDENT)
+ if (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB >= Rol_STD)
{
sprintf (Gbl.Alert.Txt,Txt_You_were_already_enroled_as_X_in_the_course_Y,
Txt_ROLES_SINGUL_abc[Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB][Gbl.Usrs.Me.UsrDat.Sex],
@@ -1880,11 +1880,11 @@ void Enr_SignUpInCrs (void)
Par_GetParToUnsignedLong ("Role",
0,
Rol_NUM_ROLES - 1,
- (unsigned long) Rol_UNKNOWN);
+ (unsigned long) Rol_UNK);
/* Check if role is correct */
- if (!(RoleFromForm == Rol_STUDENT ||
- RoleFromForm == Rol_TEACHER))
+ if (!(RoleFromForm == Rol_STD ||
+ RoleFromForm == Rol_TCH))
Lay_ShowErrorAndExit ("Wrong role.");
/***** Try to get and old request of the same user in the same course from database *****/
@@ -1933,7 +1933,7 @@ void Enr_SignUpInCrs (void)
/***** Notify teachers or admins by email about the new enrolment request *****/
// If this course has teachers ==> send notification to teachers
// If this course has no teachers and I want to be a teacher ==> send notification to administrators or superusers
- if (Gbl.CurrentCrs.Crs.NumTchs || RoleFromForm == Rol_TEACHER)
+ if (Gbl.CurrentCrs.Crs.NumTchs || RoleFromForm == Rol_TCH)
Ntf_StoreNotifyEventsToAllUsrs (Ntf_EVENT_ENROLMENT_REQUEST,ReqCod);
}
}
@@ -2032,8 +2032,8 @@ void Enr_AskIfRejectSignUp (void)
else // User does not belong to this course
{
Role = Rol_GetRequestedRole (Gbl.Usrs.Other.UsrDat.UsrCod);
- if (Role == Rol_STUDENT ||
- Role == Rol_TEACHER)
+ if (Role == Rol_STD ||
+ Role == Rol_TCH)
{
/***** Show question and button to reject user's enrolment request *****/
/* Start alert */
@@ -2109,15 +2109,15 @@ void Enr_ShowEnrolmentRequests (void)
/***** Show enrolment request (default roles depend on my logged role) *****/
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
- Enr_ShowEnrolmentRequestsGivenRoles ((1 << Rol_STUDENT) |
- (1 << Rol_TEACHER));
+ case Rol_TCH:
+ Enr_ShowEnrolmentRequestsGivenRoles ((1 << Rol_STD) |
+ (1 << Rol_TCH));
break;
case Rol_DEG_ADM:
case Rol_CTR_ADM:
case Rol_INS_ADM:
case Rol_SYS_ADM:
- Enr_ShowEnrolmentRequestsGivenRoles (1 << Rol_TEACHER);
+ Enr_ShowEnrolmentRequestsGivenRoles (1 << Rol_TCH);
break;
default:
Lay_ShowErrorAndExit ("You don't have permission to list requesters.");
@@ -2216,8 +2216,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
""
"",
The_ClassForm[Gbl.Prefs.Theme],Txt_Users);
- Rol_WriteSelectorRoles (1 << Rol_STUDENT |
- 1 << Rol_TEACHER,
+ Rol_WriteSelectorRoles (1 << Rol_STD |
+ 1 << Rol_TCH,
RolesSelected,
false,true);
fprintf (Gbl.F.Out," "
@@ -2233,7 +2233,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
case Sco_SCOPE_SYS: // Show requesters for the whole platform
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
// Requests in all courses in which I am teacher
sprintf (Query,"SELECT crs_usr_requests.ReqCod,"
"crs_usr_requests.CrsCod,"
@@ -2247,7 +2247,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ((1<0"
" ORDER BY crs_usr_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
RolesSelected);
break;
case Rol_DEG_ADM:
@@ -2321,7 +2321,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
case Sco_SCOPE_CTY: // Show requesters for the current country
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
// Requests in courses of this country in which I am teacher
sprintf (Query,"SELECT crs_usr_requests.ReqCod,"
"crs_usr_requests.CrsCod,"
@@ -2340,7 +2340,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ((1<0"
" ORDER BY crs_usr_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.CurrentCty.Cty.CtyCod,
RolesSelected);
break;
@@ -2433,7 +2433,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
case Sco_SCOPE_INS: // Show requesters for the current institution
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
// Requests in courses of this institution in which I am teacher
sprintf (Query,"SELECT crs_usr_requests.ReqCod,"
"crs_usr_requests.CrsCod,"
@@ -2451,7 +2451,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ((1<0"
" ORDER BY crs_usr_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.CurrentIns.Ins.InsCod,
RolesSelected);
break;
@@ -2521,7 +2521,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
case Sco_SCOPE_CTR: // Show requesters for the current centre
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
// Requests in courses of this centre in which I am teacher
sprintf (Query,"SELECT crs_usr_requests.ReqCod,"
"crs_usr_requests.CrsCod,"
@@ -2538,7 +2538,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ((1<0"
" ORDER BY crs_usr_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.CurrentCtr.Ctr.CtrCod,
RolesSelected);
break;
@@ -2587,7 +2587,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
case Sco_SCOPE_DEG: // Show requesters for the current degree
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
// Requests in courses of this degree in which I am teacher
sprintf (Query,"SELECT crs_usr_requests.ReqCod,"
"crs_usr_requests.CrsCod,"
@@ -2603,7 +2603,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
" AND ((1<0"
" ORDER BY crs_usr_requests.RequestTime DESC",
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.CurrentDeg.Deg.DegCod,
RolesSelected);
break;
@@ -2633,7 +2633,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
case Sco_SCOPE_CRS: // Show requesters for the current course
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER: // If I am logged as teacher of this course , I can view all the requesters from this course
+ case Rol_TCH: // If I am logged as teacher of this course , I can view all the requesters from this course
case Rol_DEG_ADM: // If I am logged as admin of this degree , I can view all the requesters from this course
case Rol_CTR_ADM: // If I am logged as admin of this centre , I can view all the requesters from this course
case Rol_INS_ADM: // If I am logged as admin of this institution, I can view all the requesters from this course
@@ -2722,8 +2722,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
if (UsrExists &&
!UsrBelongsToCrs &&
- (DesiredRole == Rol_STUDENT ||
- DesiredRole == Rol_TEACHER))
+ (DesiredRole == Rol_STD ||
+ DesiredRole == Rol_TCH))
{
/***** Number *****/
fprintf (Gbl.F.Out,""
@@ -2780,7 +2780,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
/***** Button to confirm the request *****/
fprintf (Gbl.F.Out,"");
- Act_FormStart (DesiredRole == Rol_STUDENT ? ActReqMdfStd :
+ Act_FormStart (DesiredRole == Rol_STD ? ActReqMdfStd :
ActReqMdfTch);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
@@ -2908,10 +2908,10 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
{
extern const char *Txt_Administer_multiple_students;
extern const char *Txt_Administer_multiple_teachers;
- const char *TitleText = (Role == Rol_STUDENT) ? Txt_Administer_multiple_students :
+ const char *TitleText = (Role == Rol_STD) ? Txt_Administer_multiple_students :
Txt_Administer_multiple_teachers;
- Lay_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
+ Lay_PutContextualLink (Role == Rol_STD ? ActReqEnrSevStd :
ActReqEnrSevTch,
NULL,NULL,
"config64x64.gif",
@@ -2925,17 +2925,17 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
void Enr_ReqRegRemOth (void)
{
- Enr_ReqRegRemUsr (Rol__GUEST_);
+ Enr_ReqRegRemUsr (Rol_GST);
}
void Enr_ReqRegRemStd (void)
{
- Enr_ReqRegRemUsr (Rol_STUDENT);
+ Enr_ReqRegRemUsr (Rol_STD);
}
void Enr_ReqRegRemTch (void)
{
- Enr_ReqRegRemUsr (Rol_TEACHER);
+ Enr_ReqRegRemUsr (Rol_TCH);
}
static void Enr_ReqRegRemUsr (Rol_Role_t Role)
@@ -2954,12 +2954,12 @@ static bool Enr_ICanAdminOtherUsrs (void)
{
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_UNKNOWN:
- case Rol__GUEST_:
- case Rol_VISITOR:
- case Rol_STUDENT:
+ case Rol_UNK:
+ case Rol_GST:
+ case Rol_USR:
+ case Rol_STD:
return false;
- case Rol_TEACHER:
+ case Rol_TCH:
// A teacher can be logged as teacher outside of his/her courses
// TODO: Teachers/students should be teachers/students only inside their courses
return (Gbl.CurrentCrs.Crs.CrsCod > 0);
@@ -2986,8 +2986,8 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
Hlp_USERS_Administration_administer_one_user);
/***** Write form to request another user's ID *****/
- Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STUDENT ? ActReqMdfStd :
- (Role == Rol_TEACHER ? ActReqMdfTch :
+ Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STD ? ActReqMdfStd :
+ (Role == Rol_TCH ? ActReqMdfTch :
ActReqMdfOth));
/***** End frame *****/
@@ -3017,17 +3017,17 @@ static void Enr_AskIfRegRemMe (Rol_Role_t Role)
void Enr_AskIfRegRemAnotherOth (void)
{
- Enr_AskIfRegRemAnotherUsr (Rol__GUEST_);
+ Enr_AskIfRegRemAnotherUsr (Rol_GST);
}
void Enr_AskIfRegRemAnotherStd (void)
{
- Enr_AskIfRegRemAnotherUsr (Rol_STUDENT);
+ Enr_AskIfRegRemAnotherUsr (Rol_STD);
}
void Enr_AskIfRegRemAnotherTch (void)
{
- Enr_AskIfRegRemAnotherUsr (Rol_TEACHER);
+ Enr_AskIfRegRemAnotherUsr (Rol_TCH);
}
static void Enr_AskIfRegRemAnotherUsr (Rol_Role_t Role)
@@ -3321,7 +3321,7 @@ static void Enr_ReqRemOrRemUsrFromCrs (Enr_ReqDelOrDelUsr_t ReqDelOrDelUsr)
// A teacher can remove a student or himself
// An administrator can remove anyone
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
- ICanRemove = (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ? ItsMe :
+ ICanRemove = (Gbl.Usrs.Me.LoggedRole == Rol_STD ? ItsMe :
(Gbl.Usrs.Me.LoggedRole >= Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB));
if (ICanRemove)
switch (ReqDelOrDelUsr)
@@ -3613,8 +3613,8 @@ void Enr_CreateNewUsr1 (void)
}
/***** Change current action *****/
- Gbl.Action.Act = (NewRole == Rol_STUDENT) ? ActCreStd :
- ((NewRole == Rol_TEACHER) ? ActCreTch :
+ Gbl.Action.Act = (NewRole == Rol_STD) ? ActCreStd :
+ ((NewRole == Rol_TCH) ? ActCreTch :
ActCreOth);
Tab_SetCurrentTab ();
}
@@ -3678,7 +3678,7 @@ void Enr_ModifyUsr1 (void)
switch (Gbl.Usrs.RegRemAction)
{
case Enr_REGISTER_MODIFY_ONE_USR_IN_CRS:
- if (ItsMe || Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER)
+ if (ItsMe || Gbl.Usrs.Me.LoggedRole >= Rol_TCH)
{
/***** Get user's name from record form *****/
if (Usr_ICanChangeOtherUsrData (&Gbl.Usrs.Other.UsrDat))
@@ -3724,8 +3724,8 @@ void Enr_ModifyUsr1 (void)
}
/***** Change current action *****/
- Gbl.Action.Act = (NewRole == Rol_STUDENT) ? ActUpdStd :
- ((NewRole == Rol_TEACHER) ? ActUpdTch :
+ Gbl.Action.Act = (NewRole == Rol_STD) ? ActUpdStd :
+ ((NewRole == Rol_TCH) ? ActUpdTch :
ActUpdOth);
Tab_SetCurrentTab ();
}
@@ -3746,11 +3746,11 @@ void Enr_ModifyUsr1 (void)
Gbl.Alert.Type = Ale_WARNING;
break;
case Enr_REPORT_USR_AS_POSSIBLE_DUPLICATE:
- if (ItsMe || Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
+ if (ItsMe || Gbl.Usrs.Me.LoggedRole < Rol_TCH)
Gbl.Alert.Type = Ale_WARNING;
break;
case Enr_REMOVE_ONE_USR_FROM_CRS:
- if (!ItsMe && Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
+ if (!ItsMe && Gbl.Usrs.Me.LoggedRole < Rol_TCH)
Gbl.Alert.Type = Ale_WARNING;
break;
case Enr_REMOVE_ONE_DEGREE_ADMIN:
@@ -3884,7 +3884,7 @@ static void Enr_AskIfRemoveUsrFromCrs (struct UsrData *UsrDat,bool ItsMe)
Rec_ShowSharedRecordUnmodifiable (UsrDat);
/* Show form to request confirmation */
- Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemStdCrs :
+ Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActRemStdCrs :
ActRemTchCrs);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Pwd_AskForConfirmationOnDangerousAction ();
diff --git a/swad_exam.c b/swad_exam.c
index 85818a07..00ae1f02 100644
--- a/swad_exam.c
+++ b/swad_exam.c
@@ -549,7 +549,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
MYSQL_ROW row;
unsigned long NumExaAnn;
unsigned long NumExaAnns;
- bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
/***** Build subquery about status depending on my role *****/
@@ -1536,7 +1536,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
static void Exa_PutIconsExamAnnouncement (void)
{
- if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ if (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{
/***** Link to remove this exam announcement *****/
diff --git a/swad_file_browser.c b/swad_file_browser.c
index cea4cc17..c08a4903 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -1111,15 +1111,15 @@ static const Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] =
const unsigned long long Brw_MAX_QUOTA_BRIEF[Rol_NUM_ROLES] = // MaxRole is used
{
- 0, // Rol_ROLE_UNKNOWN
- 0, // Rol_ROLE_GUEST__
- 0, // Rol_ROLE_VISITOR
- 32ULL*Brw_GiB, // Rol_ROLE_STUDENT
- 64ULL*Brw_GiB, // Rol_ROLE_TEACHER
- 0, // Rol_ROLE_DEG_ADM
- 0, // Rol_ROLE_CTR_ADM
- 0, // Rol_ROLE_INS_ADM
- 0, // Rol_ROLE_SYS_ADM
+ 0, // Rol_UNK
+ 0, // Rol_GST
+ 0, // Rol_USR
+ 32ULL*Brw_GiB, // Rol_STD
+ 64ULL*Brw_GiB, // Rol_TCH
+ 0, // Rol_DEG_ADM
+ 0, // Rol_CTR_ADM
+ 0, // Rol_INS_ADM
+ 0, // Rol_SYS_ADM
};
#define Brw_MAX_FILES_BRIEF 5000
#define Brw_MAX_FOLDS_BRIEF 1000
@@ -2081,7 +2081,7 @@ void Brw_GetParAndInitFileBrowser (void)
/***** Marks *****/
case ActSeeAdmMrk: // Access to a marks zone from menu
/* Set file browser type acording to last group accessed */
- Gbl.FileBrowser.Type = (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT) ?
+ Gbl.FileBrowser.Type = (Gbl.Usrs.Me.LoggedRole == Rol_STD) ?
(Gbl.CurrentCrs.Grps.GrpCod > 0 ? Brw_SHOW_MARKS_GRP :
Brw_SHOW_MARKS_CRS) :
(Gbl.CurrentCrs.Grps.GrpCod > 0 ? Brw_ADMI_MARKS_GRP :
@@ -3096,10 +3096,10 @@ void Brw_AskEditWorksCrs (void)
Grp_GetParCodsSeveralGrpsToShowUsrs ();
/***** Get and order lists of users from this course *****/
- Usr_GetListUsrs (Rol_TEACHER,Sco_SCOPE_CRS);
- Usr_GetListUsrs (Rol_STUDENT,Sco_SCOPE_CRS);
- NumTotalUsrs = Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs +
- Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs;
+ Usr_GetListUsrs (Rol_TCH,Sco_SCOPE_CRS);
+ Usr_GetListUsrs (Rol_STD,Sco_SCOPE_CRS);
+ NumTotalUsrs = Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs +
+ Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs;
/***** Draw class photos to select users *****/
Lay_StartRoundFrame (NULL,Txt_Users,
@@ -3123,8 +3123,8 @@ void Brw_AskEditWorksCrs (void)
/* Put list of users to select some of them */
Lay_StartTableCenter (0);
- Usr_ListUsersToSelect (Rol_TEACHER);
- Usr_ListUsersToSelect (Rol_STUDENT);
+ Usr_ListUsersToSelect (Rol_TCH);
+ Usr_ListUsersToSelect (Rol_STD);
Lay_EndTable ();
/* Send button */
@@ -3135,14 +3135,14 @@ void Brw_AskEditWorksCrs (void)
}
}
else
- Usr_ShowWarningNoUsersFound (Rol_UNKNOWN);
+ Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End frame *****/
Lay_EndRoundFrame ();
/***** Free memory for users' list *****/
- Usr_FreeUsrsList (Rol_TEACHER);
- Usr_FreeUsrsList (Rol_STUDENT);
+ Usr_FreeUsrsList (Rol_TCH);
+ Usr_FreeUsrsList (Rol_STD);
/***** Free memory used by list of selected users' codes *****/
Usr_FreeListsSelectedUsrsCods ();
@@ -3402,7 +3402,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
+ Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActSeeRecOneStd :
ActSeeRecOneTch);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
@@ -3513,7 +3513,7 @@ static void Brw_ShowFileBrowser (void)
const char *Brw_TitleOfFileBrowser[Brw_NUM_TYPES_FILE_BROWSER];
const char *Brw_HelpOfFileBrowser[Brw_NUM_TYPES_FILE_BROWSER];
struct Brw_NumObjects Removed;
- bool IAmTeacherOrSysAdm = Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool IAmTeacherOrSysAdm = Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM;
/***** Set title of file browser *****/
@@ -3971,7 +3971,7 @@ static void Brw_WriteSubtitleOfFileBrowser (void)
break;
case Brw_SHOW_MARKS_CRS:
case Brw_SHOW_MARKS_GRP:
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT)
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD)
sprintf (Subtitle,"(%s)",
Txt_accessible_only_for_reading_by_you_and_the_teachers_of_the_course);
else
@@ -5305,7 +5305,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
{
/***** Put icon to download ZIP of folder *****/
fprintf (Gbl.F.Out,"
",Gbl.RowEvenOdd);
- if (Gbl.Usrs.Me.LoggedRole >= Rol_STUDENT && // Only ZIP folders if I am student, teacher...
+ if (Gbl.Usrs.Me.LoggedRole >= Rol_STD && // Only ZIP folders if I am student, teacher...
!SeeMarks && // Do not ZIP folders when seeing marks
!(SeeDocsZone && RowSetAsHidden)) // When seeing docs, if folder is not hidden (this could happen for Level == 0)
ZIP_PutButtonToDownloadZIPOfAFolder (PathInTree,FileName);
@@ -9022,7 +9022,7 @@ void Brw_ShowFileMetadata (void)
break;
case Brw_SHOW_DOCUM_CRS:
case Brw_SHOW_DOCUM_GRP:
- if (Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
+ if (Gbl.Usrs.Me.LoggedRole < Rol_TCH)
ICanView = !Brw_CheckIfFileOrFolderIsHidden (&FileMetadata);
break;
default:
@@ -9139,7 +9139,7 @@ void Brw_ShowFileMetadata (void)
}
else
/* Unknown publisher */
- fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_UNKNOWN][Usr_SEX_UNKNOWN]);
+ fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Rol_UNK][Usr_SEX_UNKNOWN]);
fprintf (Gbl.F.Out," "
" ");
@@ -9411,7 +9411,7 @@ void Brw_DownloadFile (void)
break;
case Brw_SHOW_DOCUM_CRS:
case Brw_SHOW_DOCUM_GRP:
- if (Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
+ if (Gbl.Usrs.Me.LoggedRole < Rol_TCH)
ICanView = !Brw_CheckIfFileOrFolderIsHidden (&FileMetadata);
break;
default:
@@ -10852,18 +10852,18 @@ static bool Brw_CheckIfICanEditFileOrFolder (unsigned Level)
return false;
/***** I must be student, teacher, admin or superuser to edit *****/
- if (Gbl.Usrs.Me.MaxRole < Rol_STUDENT)
+ if (Gbl.Usrs.Me.MaxRole < Rol_STD)
return false;
/***** Set depending on browser, level, logged role... *****/
switch (Gbl.FileBrowser.Type)
{
case Brw_ADMI_TEACH_CRS:
- return (Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER);
+ return (Gbl.Usrs.Me.LoggedRole >= Rol_TCH);
case Brw_ADMI_TEACH_GRP:
- if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER)
+ if (Gbl.Usrs.Me.LoggedRole == Rol_TCH)
return Grp_GetIfIBelongToGrp (Gbl.CurrentCrs.Grps.GrpCod); // A teacher can edit only if hr/she belongs to group
- return (Gbl.Usrs.Me.LoggedRole > Rol_TEACHER);
+ return (Gbl.Usrs.Me.LoggedRole > Rol_TCH);
case Brw_ADMI_SHARE_CRS:
case Brw_ADMI_SHARE_GRP:
// Check if I am the publisher of the folder
@@ -10883,9 +10883,9 @@ static bool Brw_CheckIfICanEditFileOrFolder (unsigned Level)
if (!Gbl.FileBrowser.Asg.IBelongToCrsOrGrps) // If I do not belong to course / groups of this assignment
return false; // I can not edit this assignment
- return ((Gbl.Usrs.Me.LoggedRole == Rol_STUDENT && // Students can edit
+ return ((Gbl.Usrs.Me.LoggedRole == Rol_STD && // Students can edit
Gbl.FileBrowser.Asg.Open) || // inside open assignments
- Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER); // Teachers can edit
+ Gbl.Usrs.Me.LoggedRole >= Rol_TCH); // Teachers can edit
// inside open or closed assignments
default:
return Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type];
@@ -10903,7 +10903,7 @@ static bool Brw_CheckIfICanCreateIntoFolder (unsigned Level)
return false;
/***** I must be student, teacher, admin or superuser to edit *****/
- if (Gbl.Usrs.Me.MaxRole < Rol_STUDENT)
+ if (Gbl.Usrs.Me.MaxRole < Rol_STD)
return false;
/***** If maximum level is reached, I can not create/paste *****/
@@ -10928,9 +10928,9 @@ static bool Brw_CheckIfICanCreateIntoFolder (unsigned Level)
if (!Gbl.FileBrowser.Asg.IBelongToCrsOrGrps) // If I do not belong to course / groups of this assignment
return false; // I can not create anything inside this assignment
- return ((Gbl.Usrs.Me.LoggedRole == Rol_STUDENT && // Students can create
+ return ((Gbl.Usrs.Me.LoggedRole == Rol_STD && // Students can create
Gbl.FileBrowser.Asg.Open) || // inside open assignments
- Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER); // Teachers can create
+ Gbl.Usrs.Me.LoggedRole >= Rol_TCH); // Teachers can create
// inside open or closed assignments
default:
return Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type];
@@ -10956,7 +10956,7 @@ static bool Brw_CheckIfICanModifySharedFileOrFolder (void)
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_STUDENT: // If I am a student, I can modify the file/folder if I am the publisher
+ case Rol_STD: // If I am a student, I can modify the file/folder if I am the publisher
/***** Get all the distinct publishers of files starting by Gbl.FileBrowser.Priv.FullPathInTree from database *****/
sprintf (Query,"SELECT DISTINCT(PublisherUsrCod) FROM files"
" WHERE FileBrowser=%u AND Cod=%ld"
@@ -10979,7 +10979,7 @@ static bool Brw_CheckIfICanModifySharedFileOrFolder (void)
DB_FreeMySQLResult (&mysql_res);
return (Gbl.Usrs.Me.UsrDat.UsrCod == PublisherUsrCod); // Am I the publisher of subtree?
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_DEG_ADM:
case Rol_CTR_ADM:
case Rol_INS_ADM:
@@ -11172,7 +11172,7 @@ void Brw_GetSummaryAndContentOfFile (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1],
Txt_Filename,FileMetadata.FilFolLnkName,
Txt_Folder,FileMetadata.PathInTreeUntilFilFolLnk, // TODO: Fix bug: do not write internal name (for example "comun")
Txt_Uploaded_by,FileHasPublisher ? PublisherUsrDat.FullName :
- Txt_ROLES_SINGUL_Abc[Rol_UNKNOWN][Usr_SEX_UNKNOWN]);
+ Txt_ROLES_SINGUL_Abc[Rol_UNK][Usr_SEX_UNKNOWN]);
/* Free memory used for publisher's data */
if (FileMetadata.PublisherUsrCod > 0)
diff --git a/swad_forum.c b/swad_forum.c
index 45699add..b7c1f5ca 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -1044,7 +1044,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag
ICanModerateForum = (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM);
break;
case For_FORUM_COURSE_USRS:
- ICanModerateForum = (Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER);
+ ICanModerateForum = (Gbl.Usrs.Me.LoggedRole >= Rol_TCH);
break;
default:
ICanModerateForum = false;
@@ -1828,7 +1828,7 @@ static void For_WriteLinksToGblForums (bool IsLastItemInLevel[1 + For_FORUM_MAX_
/***** Link to forum of teachers global *****/
Rol_GetRolesInAllCrssIfNotYetGot (&Gbl.Usrs.Me.UsrDat);
- if (Gbl.Usrs.Me.UsrDat.Roles >= (1 << Rol_TEACHER))
+ if (Gbl.Usrs.Me.UsrDat.Roles >= (1 << Rol_TCH))
{
Forum.Type = For_FORUM_GLOBAL_TCHS;
Forum.Location = -1L;
@@ -1852,7 +1852,7 @@ static void For_WriteLinksToPlatformForums (bool IsLastForum,
/***** Can I see teachers's forums? *****/
Rol_GetRolesInAllCrssIfNotYetGot (&Gbl.Usrs.Me.UsrDat);
ICanSeeTeacherForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Gbl.Usrs.Me.UsrDat.Roles >= (1 << Rol_TEACHER));
+ Gbl.Usrs.Me.UsrDat.Roles >= (1 << Rol_TCH));
/***** Link to forum of users about the platform *****/
Forum.Type = For_FORUM__SWAD__USRS;
@@ -1887,7 +1887,7 @@ static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,
if (InsCod > 0)
{
ICanSeeTeacherForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInIns (InsCod) >= Rol_TEACHER);
+ Rol_GetMyMaxRoleInIns (InsCod) >= Rol_TCH);
/***** Link to the forum of users from this institution *****/
Forum.Type = For_FORUM_INSTIT_USRS;
@@ -1926,7 +1926,7 @@ static long For_WriteLinksToCtrForums (long CtrCod,bool IsLastCtr,
if (CtrCod > 0)
{
ICanSeeTeacherForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInCtr (CtrCod) >= Rol_TEACHER);
+ Rol_GetMyMaxRoleInCtr (CtrCod) >= Rol_TCH);
/***** Link to the forum of users from this centre *****/
Forum.Type = For_FORUM_CENTRE_USRS;
@@ -1965,7 +1965,7 @@ static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
if (DegCod > 0)
{
ICanSeeTeacherForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInDeg (DegCod) >= Rol_TEACHER);
+ Rol_GetMyMaxRoleInDeg (DegCod) >= Rol_TCH);
/***** Link to the forum of users from this degree *****/
Forum.Type = For_FORUM_DEGREE_USRS;
@@ -2004,7 +2004,7 @@ static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
if (CrsCod > 0)
{
ICanSeeTeacherForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyRoleInCrs (CrsCod) >= Rol_TEACHER);
+ Rol_GetMyRoleInCrs (CrsCod) >= Rol_TCH);
/***** Link to the forum of users from this course *****/
Forum.Type = For_FORUM_COURSE_USRS;
@@ -3749,39 +3749,39 @@ static void For_RestrictAccess (void)
case For_FORUM_GLOBAL_TCHS:
case For_FORUM__SWAD__TCHS:
Rol_GetRolesInAllCrssIfNotYetGot (&Gbl.Usrs.Me.UsrDat);
- ICanSeeForum = (Gbl.Usrs.Me.UsrDat.Roles >= (1 << Rol_TEACHER));
+ ICanSeeForum = (Gbl.Usrs.Me.UsrDat.Roles >= (1 << Rol_TCH));
break;
case For_FORUM_INSTIT_USRS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInIns (Gbl.Forum.ForumSelected.Location) >= Rol_STUDENT);
+ Rol_GetMyMaxRoleInIns (Gbl.Forum.ForumSelected.Location) >= Rol_STD);
break;
case For_FORUM_INSTIT_TCHS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInIns (Gbl.Forum.ForumSelected.Location) >= Rol_TEACHER);
+ Rol_GetMyMaxRoleInIns (Gbl.Forum.ForumSelected.Location) >= Rol_TCH);
break;
case For_FORUM_CENTRE_USRS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInCtr (Gbl.Forum.ForumSelected.Location) >= Rol_STUDENT);
+ Rol_GetMyMaxRoleInCtr (Gbl.Forum.ForumSelected.Location) >= Rol_STD);
break;
case For_FORUM_CENTRE_TCHS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInCtr (Gbl.Forum.ForumSelected.Location) >= Rol_TEACHER);
+ Rol_GetMyMaxRoleInCtr (Gbl.Forum.ForumSelected.Location) >= Rol_TCH);
break;
case For_FORUM_DEGREE_USRS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInDeg (Gbl.Forum.ForumSelected.Location) >= Rol_STUDENT);
+ Rol_GetMyMaxRoleInDeg (Gbl.Forum.ForumSelected.Location) >= Rol_STD);
break;
case For_FORUM_DEGREE_TCHS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyMaxRoleInDeg (Gbl.Forum.ForumSelected.Location) >= Rol_TEACHER);
+ Rol_GetMyMaxRoleInDeg (Gbl.Forum.ForumSelected.Location) >= Rol_TCH);
break;
case For_FORUM_COURSE_USRS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyRoleInCrs (Gbl.Forum.ForumSelected.Location) >= Rol_STUDENT);
+ Rol_GetMyRoleInCrs (Gbl.Forum.ForumSelected.Location) >= Rol_STD);
break;
case For_FORUM_COURSE_TCHS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
- Rol_GetMyRoleInCrs (Gbl.Forum.ForumSelected.Location) >= Rol_TEACHER);
+ Rol_GetMyRoleInCrs (Gbl.Forum.ForumSelected.Location) >= Rol_TCH);
break;
default:
ICanSeeForum = false;
diff --git a/swad_global.c b/swad_global.c
index 3efc7e89..3af1502e 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -159,7 +159,7 @@ void Gbl_InitializeGlobals (void)
Gbl.Usrs.Me.RoleFromSession =
Gbl.Usrs.Me.LoggedRole =
Gbl.Usrs.Me.LoggedRoleBeforeCloseSession =
- Gbl.Usrs.Me.MaxRole = Rol_UNKNOWN;
+ Gbl.Usrs.Me.MaxRole = Rol_UNK;
Gbl.Usrs.Me.RoleHasChanged = false;
Gbl.Usrs.Me.IBelongToCurrentIns = false;
Gbl.Usrs.Me.IBelongToCurrentCtr = false;
@@ -478,9 +478,9 @@ void Gbl_Cleanup (void)
Hld_FreeListHolidays ();
Lnk_FreeListLinks ();
Plg_FreeListPlugins ();
- Usr_FreeUsrsList (Rol__GUEST_);
- Usr_FreeUsrsList (Rol_STUDENT);
- Usr_FreeUsrsList (Rol_TEACHER);
+ Usr_FreeUsrsList (Rol_GST);
+ Usr_FreeUsrsList (Rol_STD);
+ Usr_FreeUsrsList (Rol_TCH);
Usr_FreeUsrsList (Rol_DEG_ADM);
Usr_FreeListOtherRecipients ();
Usr_FreeListsSelectedUsrsCods ();
diff --git a/swad_group.c b/swad_group.c
index 751da418..3ab2f0f9 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -343,7 +343,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
if (Gbl.CurrentCrs.Grps.NumGrps)
{
ICanEdit = !Gbl.Form.Inside &&
- (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
/***** Start frame *****/
@@ -594,7 +594,7 @@ void Grp_ChangeMyGrps (void)
// ...is a radio-based form and not a checkbox-based form...
// ...this check is made only to avoid problems...
// ...if the student manipulates the form
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT &&
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD &&
LstGrpsIWant.NumGrps >= 2)
MySelectionIsValid = Grp_CheckIfSelectionGrpsIsValid (&LstGrpsIWant);
@@ -640,7 +640,7 @@ void Grp_ChangeOtherUsrGrps (void)
/***** A student can not be enroled in more than one group
if the type of group is of single enrolment *****/
- if (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT &&
+ if (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD &&
LstGrpsUsrWants.NumGrps >= 2)
SelectionIsValid = Grp_CheckIfSelectionGrpsIsValid (&LstGrpsUsrWants);
@@ -697,7 +697,7 @@ bool Grp_ChangeMyGrpsAtomically (struct ListCodGrps *LstGrpsIWant)
Grp_GetLstCodGrpsUsrBelongs (Gbl.CurrentCrs.Crs.CrsCod,-1L,
Gbl.Usrs.Me.UsrDat.UsrCod,&LstGrpsIBelong);
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT)
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD)
{
/***** Go across the list of groups which I belong to and check if I try to leave a closed group *****/
for (NumGrpIBelong = 0;
@@ -831,7 +831,7 @@ bool Grp_ChangeGrpsOtherUsrAtomically (struct ListCodGrps *LstGrpsUsrWants)
bool RegisterUsrInThisGrp;
bool ChangesMade = false;
- if (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT)
+ if (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD)
{
/***** Lock tables to make the inscription atomic *****/
DB_Query ("LOCK TABLES crs_grp_types WRITE,crs_grp WRITE,"
@@ -881,7 +881,7 @@ bool Grp_ChangeGrpsOtherUsrAtomically (struct ListCodGrps *LstGrpsUsrWants)
Grp_FreeListCodGrp (&LstGrpsUsrBelongs);
/***** Unlock tables after changes in my groups *****/
- if (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT)
+ if (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD)
{
Gbl.DB.LockedTables = false; // Set to false before the following unlock...
// ...to not retry the unlock if error in unlocking
@@ -1635,7 +1635,7 @@ void Grp_ListGrpsToEditAsgAttOrSvy (struct GroupType *GrpTyp,long Cod,Grp_AsgOrS
void Grp_ReqRegisterInGrps (void)
{
/***** Show list of groups to register/remove me *****/
- Grp_ShowLstGrpsToChgMyGrps ((Gbl.Usrs.Me.LoggedRole == Rol_STUDENT));
+ Grp_ShowLstGrpsToChgMyGrps ((Gbl.Usrs.Me.LoggedRole == Rol_STD));
}
/*****************************************************************************/
@@ -1654,7 +1654,7 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
unsigned NumGrpsIBelong = 0;
bool PutFormToChangeGrps = !Gbl.Form.Inside; // Not inside another form (record card)
bool ICanEdit = !Gbl.Form.Inside &&
- (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups
@@ -1810,7 +1810,7 @@ static unsigned Grp_ListGrpsForChange (struct GroupType *GrpTyp)
// If user is a student and the enrolment is single
// and there are more than a group, put a radio item
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT &&
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD &&
!GrpTyp->MultipleEnrolment &&
GrpTyp->NumGrps > 1)
{
@@ -1830,7 +1830,7 @@ static unsigned Grp_ListGrpsForChange (struct GroupType *GrpTyp)
if (IBelongToThisGroup)
fprintf (Gbl.F.Out," checked=\"checked\"");
- else if ((Gbl.Usrs.Me.LoggedRole == Rol_STUDENT) &&
+ else if ((Gbl.Usrs.Me.LoggedRole == Rol_STD) &&
((!Grp->Open) || (Grp->NumStudents >= Grp->MaxStudents)))
fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out," />");
@@ -2913,7 +2913,7 @@ unsigned Grp_CountNumStdsInGrp (long GrpCod)
" AND crs_grp_types.CrsCod=crs_usr.CrsCod"
" AND crs_grp_usr.UsrCod=crs_usr.UsrCod"
" AND crs_usr.Role=%u",
- GrpCod,(unsigned) Rol_STUDENT);
+ GrpCod,(unsigned) Rol_STD);
return (unsigned) DB_QueryCOUNT (Query,
"can not get number of students in a group");
}
@@ -2937,7 +2937,7 @@ static unsigned Grp_CountNumStdsInNoGrpsOfType (long GrpTypCod)
" FROM crs_grp,crs_grp_usr"
" WHERE crs_grp.GrpTypCod=%ld"
" AND crs_grp.GrpCod=crs_grp_usr.GrpCod)",
- Gbl.CurrentCrs.Crs.CrsCod,(unsigned) Rol_STUDENT,GrpTypCod);
+ Gbl.CurrentCrs.Crs.CrsCod,(unsigned) Rol_STD,GrpTypCod);
DB_QuerySELECT (Query,&mysql_res,"can not get the number of students not belonging to groups of a type");
/***** Get the number of students (row[0]) *****/
@@ -3042,7 +3042,7 @@ unsigned Grp_NumGrpTypesMandatIDontBelong (void)
" AND crs_grp.GrpCod=crs_grp_usr.GrpCod"
" AND crs_grp_usr.UsrCod=%ld)",
Gbl.CurrentCrs.Crs.CrsCod,
- (unsigned) Rol_STUDENT,
+ (unsigned) Rol_STD,
Gbl.CurrentCrs.Crs.CrsCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
NumGrpTypes = DB_QueryCOUNT (Query,"can not get the number of types of group of mandatory registration to which you don't belong to");
@@ -3075,7 +3075,7 @@ static bool Grp_GetIfGrpIsAvailable (long GrpTypCod)
" AND crs_usr.Role=%u"
" GROUP BY crs_grp.GrpCod"
" HAVING NumStudents 0 && // Course selected
!Gbl.CurrentCrs.Crs.NumStds && // Current course has no students
- Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER) // I am a teacher in current course
+ Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_TCH) // I am a teacher in current course
{
/* Request students enrolment */
sprintf (Gbl.Title,Txt_Register_students_in_the_course_X,
diff --git a/swad_indicator.c b/swad_indicator.c
index 7808bb5c..7410ba5a 100644
--- a/swad_indicator.c
+++ b/swad_indicator.c
@@ -333,7 +333,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" AND usr_data.DptCod=%ld"
" ORDER BY degrees.FullName,courses.FullName",
Gbl.Stat.DegTypCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
else
sprintf (Query,"SELECT DISTINCTROW degrees.FullName,courses.FullName,courses.CrsCod,courses.InsCrsCod"
@@ -344,7 +344,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" AND crs_usr.UsrCod=usr_data.UsrCod"
" AND usr_data.DptCod=%ld"
" ORDER BY degrees.FullName,courses.FullName",
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
}
else
@@ -377,7 +377,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" AND usr_data.DptCod=%ld"
" ORDER BY degrees.FullName,courses.FullName",
Gbl.CurrentCty.Cty.CtyCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
else
sprintf (Query,"SELECT degrees.FullName,courses.FullName,courses.CrsCod,courses.InsCrsCod"
@@ -402,7 +402,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" AND usr_data.DptCod=%ld"
" ORDER BY degrees.FullName,courses.FullName",
Gbl.CurrentIns.Ins.InsCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
else
sprintf (Query,"SELECT degrees.FullName,courses.FullName,courses.CrsCod,courses.InsCrsCod"
@@ -425,7 +425,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" AND usr_data.DptCod=%ld"
" ORDER BY degrees.FullName,courses.FullName",
Gbl.CurrentCtr.Ctr.CtrCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
else
sprintf (Query,"SELECT degrees.FullName,courses.FullName,courses.CrsCod,courses.InsCrsCod"
@@ -447,7 +447,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" AND usr_data.DptCod=%ld"
" ORDER BY degrees.FullName,courses.FullName",
Gbl.CurrentDeg.Deg.DegCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
else
sprintf (Query,"SELECT degrees.FullName,courses.FullName,courses.CrsCod,courses.InsCrsCod"
@@ -471,7 +471,7 @@ static unsigned Ind_GetTableOfCourses (MYSQL_RES **mysql_res)
" ORDER BY degrees.FullName,courses.FullName",
Gbl.CurrentCrs.Crs.CrsCod,
Gbl.CurrentCrs.Crs.CrsCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Stat.DptCod);
else
sprintf (Query,"SELECT degrees.FullName,courses.FullName,courses.CrsCod,courses.InsCrsCod"
@@ -1116,8 +1116,8 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
break;
case Ind_INDICATORS_FULL:
/* Get number of users */
- NumStds = Usr_GetNumUsrsInCrs (Rol_STUDENT,CrsCod);
- NumTchs = Usr_GetNumUsrsInCrs (Rol_TEACHER,CrsCod);
+ NumStds = Usr_GetNumUsrsInCrs (Rol_STD,CrsCod);
+ NumTchs = Usr_GetNumUsrsInCrs (Rol_TCH,CrsCod);
fprintf (Gbl.F.Out,""
""
diff --git a/swad_info.c b/swad_info.c
index 398f7888..2f9b587e 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -340,7 +340,7 @@ void Inf_ShowInfo (void)
extern const char *Txt_No_information;
Inf_InfoSrc_t InfoSrc;
bool MustBeRead;
- bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
bool ShowWarningNoInfo = false;
const char *Help[Inf_NUM_INFO_TYPES] =
@@ -375,7 +375,7 @@ void Inf_ShowInfo (void)
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_STUDENT:
+ case Rol_STD:
/* Put checkbox to force students to read this couse info */
if (MustBeRead)
{
@@ -384,7 +384,7 @@ void Inf_ShowInfo (void)
fprintf (Gbl.F.Out,"");
}
break;
- case Rol_TEACHER:
+ case Rol_TCH:
case Rol_SYS_ADM:
/* Put checkbox to force students to read this couse info */
if (InfoSrc != Inf_INFO_SRC_NONE)
@@ -1008,7 +1008,7 @@ static void Inf_ShowPage (const char *URL)
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_View_in_a_new_window;
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
- bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
const char *Help[Inf_NUM_INFO_TYPES] =
{
@@ -1757,7 +1757,7 @@ static bool Inf_CheckAndShowPlainTxt (void)
{
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1];
- bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
const char *Help[Inf_NUM_INFO_TYPES] =
{
@@ -1841,7 +1841,7 @@ static bool Inf_CheckAndShowRichTxt (void)
char MathJaxURL[PATH_MAX];
char Command[512 + PATH_MAX * 3]; // Command to call the program of preprocessing of photos
int ReturnCode;
- bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ bool ICanEdit = (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
const char *Help[Inf_NUM_INFO_TYPES] =
{
diff --git a/swad_institution.c b/swad_institution.c
index b3ada627..0abaf9c8 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -583,8 +583,8 @@ static void Ins_Configuration (bool PrintView)
" "
" ",
The_ClassForm[Gbl.Prefs.Theme],
- Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
- Usr_GetNumUsrsInCrssOfIns (Rol_TEACHER,Gbl.CurrentIns.Ins.InsCod));
+ Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],
+ Usr_GetNumUsrsInCrssOfIns (Rol_TCH,Gbl.CurrentIns.Ins.InsCod));
/***** Number of students in courses of this institution *****/
fprintf (Gbl.F.Out,""
@@ -596,8 +596,8 @@ static void Ins_Configuration (bool PrintView)
""
" ",
The_ClassForm[Gbl.Prefs.Theme],
- Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
- Usr_GetNumUsrsInCrssOfIns (Rol_STUDENT,Gbl.CurrentIns.Ins.InsCod));
+ Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
+ Usr_GetNumUsrsInCrssOfIns (Rol_STD,Gbl.CurrentIns.Ins.InsCod));
/***** Number of users in courses of this institution *****/
fprintf (Gbl.F.Out,""
@@ -609,9 +609,9 @@ static void Ins_Configuration (bool PrintView)
""
" ",
The_ClassForm[Gbl.Prefs.Theme],
- Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
- Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
- Usr_GetNumUsrsInCrssOfIns (Rol_UNKNOWN,Gbl.CurrentIns.Ins.InsCod));
+ Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],
+ Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
+ Usr_GetNumUsrsInCrssOfIns (Rol_UNK,Gbl.CurrentIns.Ins.InsCod));
}
/***** End table *****/
@@ -715,7 +715,7 @@ static void Ins_ListInstitutions (void)
static bool Ins_CheckIfICanCreateInstitutions (void)
{
- return (bool) (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
+ return (bool) (Gbl.Usrs.Me.LoggedRole >= Rol_GST);
}
/*****************************************************************************/
@@ -1079,7 +1079,7 @@ void Ins_GetListInstitutions (long CtyCod,Ins_GetExtraData_t GetExtraData)
Ins->NumDpts = Dpt_GetNumberOfDepartmentsInInstitution (Ins->InsCod);
/* Get number of users in courses */
- Ins->NumUsrs = Usr_GetNumUsrsInCrssOfIns (Rol_UNKNOWN,Ins->InsCod); // Here Rol_UNKNOWN means "all users"
+ Ins->NumUsrs = Usr_GetNumUsrsInCrssOfIns (Rol_UNK,Ins->InsCod); // Here Rol_UNK means "all users"
break;
}
}
@@ -1181,7 +1181,7 @@ bool Ins_GetDataOfInstitutionByCod (struct Instit *Ins,
Ins->NumDegs = Deg_GetNumDegsInIns (Ins->InsCod);
/* Get number of users in courses of this institution */
- Ins->NumUsrs = Usr_GetNumUsrsInCrssOfIns (Rol_UNKNOWN,Ins->InsCod); // Here Rol_UNKNOWN means "all users"
+ Ins->NumUsrs = Usr_GetNumUsrsInCrssOfIns (Rol_UNK,Ins->InsCod); // Here Rol_UNK means "all users"
}
/* Set return value */
@@ -2156,7 +2156,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Start form *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Act_FormStart (ActNewIns);
- else if (Gbl.Usrs.Me.MaxRole >= Rol__GUEST_)
+ else if (Gbl.Usrs.Me.MaxRole >= Rol_GST)
Act_FormStart (ActReqIns);
else
Lay_ShowErrorAndExit ("You can not edit institutions.");
diff --git a/swad_mail.c b/swad_mail.c
index bdd109b9..76300716 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -879,7 +879,7 @@ void Mai_ListEmails (void)
Grp_GetParCodsSeveralGrpsToShowUsrs ();
/***** Get and order list of students in this course *****/
- Usr_GetListUsrs (Rol_STUDENT,Sco_SCOPE_CRS);
+ Usr_GetListUsrs (Rol_STD,Sco_SCOPE_CRS);
/***** Start of the frame used to list the emails *****/
Lay_StartRoundFrame (NULL,
@@ -889,9 +889,9 @@ void Mai_ListEmails (void)
/***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActMaiStd);
- if (Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs)
+ if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs)
{
- if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs,NULL))
+ if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs,NULL))
{
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
@@ -900,11 +900,11 @@ void Mai_ListEmails (void)
fprintf (Gbl.F.Out,"");
for (NumUsr = 0, NumStdsWithEmail = 0, NumAcceptedStdsWithEmail = 0,
StrAddresses[0] = '\0';
- NumUsr < Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs;
+ NumUsr < Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs;
NumUsr++)
{
/* Copy user's basic data from list */
- Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_STUDENT].Lst[NumUsr]);
+ Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_STD].Lst[NumUsr]);
/* Get user's email */
Mai_GetEmailFromUsrCod (&UsrDat);
@@ -945,8 +945,8 @@ void Mai_ListEmails (void)
fprintf (Gbl.F.Out,Txt_X_students_who_have_email,
NumStdsWithEmail,
((float) NumStdsWithEmail /
- (float) Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs) * 100.0,
- Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs);
+ (float) Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) * 100.0,
+ Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs);
fprintf (Gbl.F.Out,"
");
/***** Show a message with the number of students who have accepted and have email ****/
@@ -954,8 +954,8 @@ void Mai_ListEmails (void)
fprintf (Gbl.F.Out,Txt_X_students_who_have_accepted_and_who_have_email,
NumAcceptedStdsWithEmail,
((float) NumAcceptedStdsWithEmail /
- (float) Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs) * 100.0,
- Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs);
+ (float) Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) * 100.0,
+ Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs);
fprintf (Gbl.F.Out,"");
/***** Icon to open the client email program *****/
@@ -976,13 +976,13 @@ void Mai_ListEmails (void)
}
}
else
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End of the frame used to list the emails *****/
Lay_EndRoundFrame ();
/***** Free memory for students list *****/
- Usr_FreeUsrsList (Rol_STUDENT);
+ Usr_FreeUsrsList (Rol_STD);
/***** Free memory for list of selected groups *****/
Grp_FreeListCodSelectedGrps ();
@@ -1135,8 +1135,8 @@ void Mai_PutLinkToChangeOtherUsrEmails (void)
Txt_Change_email,Txt_Change_email,
NULL);
else // Not me
- Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmMaiStd :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmMaiTch :
+ Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActFrmMaiStd :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActFrmMaiTch :
ActFrmMaiOth),
NULL,Usr_PutParamOtherUsrCodEncrypted,
"msg64x64.gif",
@@ -1248,8 +1248,8 @@ void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActRemMaiMe);
else
{
- Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemMaiStd :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemMaiTch :
+ Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActRemMaiStd :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActRemMaiTch :
ActRemMaiOth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
@@ -1284,8 +1284,8 @@ void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActNewMaiMe);
else
{
- Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActNewMaiStd :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActNewMaiTch :
+ Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActNewMaiStd :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActNewMaiTch :
ActNewMaiOth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
@@ -1314,8 +1314,8 @@ void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActNewMaiMe);
else
{
- Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActNewMaiStd :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActNewMaiTch :
+ Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActNewMaiStd :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActNewMaiTch :
ActNewMaiOth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
@@ -1835,16 +1835,16 @@ bool Mai_ICanSeeOtherUsrEmail (const struct UsrData *UsrDat)
/* Check if I have permission to see another user's email */
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_STUDENT:
+ case Rol_STD:
/* If I am a student in the current course,
I can see the email of confirmed teachers */
- return (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER && // A teacher
+ return (UsrDat->RoleInCurrentCrsDB == Rol_TCH && // A teacher
UsrDat->Accepted); // who accepted registration
- case Rol_TEACHER:
+ case Rol_TCH:
/* If I am a teacher in the current course,
I can see the email of confirmed students and teachers */
- return (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT || // A student
- UsrDat->RoleInCurrentCrsDB == Rol_TEACHER) && // or a teacher
+ return (UsrDat->RoleInCurrentCrsDB == Rol_STD || // A student
+ UsrDat->RoleInCurrentCrsDB == Rol_TCH) && // or a teacher
UsrDat->Accepted; // who accepted registration
case Rol_DEG_ADM:
/* If I am an administrator of current degree,
diff --git a/swad_mark.c b/swad_mark.c
index 7607b45c..6da1db62 100644
--- a/swad_mark.c
+++ b/swad_mark.c
@@ -622,7 +622,7 @@ void Mrk_ShowMyMarks (void)
Mrk_GetNumRowsHeaderAndFooter (&Marks);
/***** Set the student whose marks will be shown *****/
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT) // If I am logged as student...
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD) // If I am logged as student...
UsrDat = &Gbl.Usrs.Me.UsrDat; // ...use my list of IDs
else // If I am logged as teacher, administrator, superuser...
{
@@ -637,7 +637,7 @@ void Mrk_ShowMyMarks (void)
else
{
UsrIsOK = false;
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
}
}
else // Course zone
@@ -650,7 +650,7 @@ void Mrk_ShowMyMarks (void)
else
{
UsrIsOK = false;
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
}
}
}
diff --git a/swad_message.c b/swad_message.c
index 1004f0b9..c49d4fdf 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -181,8 +181,8 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
bool ShowUsrsInCrs = false;
bool GetUsrsInCrs;
- Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs =
- Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs = 0;
+ Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs =
+ Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs = 0;
/***** Get parameter that indicates if the message is a reply to another message *****/
if ((Gbl.Msg.Reply.IsReply = Par_GetParToBool ("IsReply")))
@@ -213,10 +213,10 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
Grp_GetParCodsSeveralGrpsToShowUsrs ();
/***** Get and order lists of users from this course *****/
- Usr_GetListUsrs (Rol_TEACHER,Sco_SCOPE_CRS);
- Usr_GetListUsrs (Rol_STUDENT,Sco_SCOPE_CRS);
- NumUsrsInCrs = Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs +
- Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs;
+ Usr_GetListUsrs (Rol_TCH,Sco_SCOPE_CRS);
+ Usr_GetListUsrs (Rol_STD,Sco_SCOPE_CRS);
+ NumUsrsInCrs = Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs +
+ Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs;
}
/***** Start frame *****/
@@ -287,8 +287,8 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
Lay_StartTableWide (0);
if (ShowUsrsInCrs)
{
- Usr_ListUsersToSelect (Rol_TEACHER); // All teachers in course
- Usr_ListUsersToSelect (Rol_STUDENT); // All students in selected groups
+ Usr_ListUsersToSelect (Rol_TCH); // All teachers in course
+ Usr_ListUsersToSelect (Rol_STD); // All students in selected groups
}
Msg_WriteFormUsrsIDsOrNicksOtherRecipients (); // Other users (nicknames)
Lay_EndTable ();
@@ -324,8 +324,8 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
/***** Free memory used for by the lists of users *****/
if (GetUsrsInCrs)
{
- Usr_FreeUsrsList (Rol_TEACHER);
- Usr_FreeUsrsList (Rol_STUDENT);
+ Usr_FreeUsrsList (Rol_TCH);
+ Usr_FreeUsrsList (Rol_STD);
}
/***** Free memory used by list of selected users' codes *****/
@@ -678,7 +678,7 @@ void Msg_RecMsgFromUsr (void)
/***** Check number of recipients *****/
if ((NumRecipients = Usr_CountNumUsrsInListOfSelectedUsrs ()))
{
- if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT &&
+ if (Gbl.Usrs.Me.LoggedRole == Rol_STD &&
NumRecipients > Cfg_MAX_RECIPIENTS)
{
/* Write warning message */
@@ -2028,7 +2028,7 @@ unsigned Msg_GetNumMsgsSentByTchsCrs (long CrsCod)
sprintf (Query,"SELECT COUNT(*) FROM msg_snt,crs_usr"
" WHERE msg_snt.CrsCod=%ld AND crs_usr.CrsCod=%ld AND crs_usr.Role=%u"
" AND msg_snt.UsrCod=crs_usr.UsrCod",
- CrsCod,CrsCod,(unsigned) Rol_TEACHER);
+ CrsCod,CrsCod,(unsigned) Rol_TCH);
return (unsigned) DB_QueryCOUNT (Query,"can not get the number of messages sent by teachers");
}
@@ -2932,7 +2932,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
fprintf (Gbl.F.Out,""
"");
if (Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED &&
- Gbl.Usrs.Me.LoggedRole >= Rol_VISITOR)
+ Gbl.Usrs.Me.LoggedRole >= Rol_USR)
// Guests (users without courses) can read messages but not reply them
Msg_WriteFormToReply (MsgCod,CrsCod,FromThisCrs,Replied,&UsrDat);
fprintf (Gbl.F.Out," "
@@ -3316,7 +3316,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
}
else
fprintf (Gbl.F.Out,"[%s]",
- Txt_ROLES_SINGUL_abc[Rol_UNKNOWN][Usr_SEX_UNKNOWN]); // User not found, likely an old user who has been removed
+ Txt_ROLES_SINGUL_abc[Rol_UNK][Usr_SEX_UNKNOWN]); // User not found, likely an old user who has been removed
fprintf (Gbl.F.Out,""
" "
"");
diff --git a/swad_network.c b/swad_network.c
index ed8bf46d..0422f69a 100644
--- a/swad_network.c
+++ b/swad_network.c
@@ -450,7 +450,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
unsigned NumUsrs;
/***** Get total number of users in platform *****/
- NumUsrsTotalInPlatform = Sta_GetTotalNumberOfUsersInCourses (Gbl.Scope.Current,Rol_UNKNOWN);
+ NumUsrsTotalInPlatform = Sta_GetTotalNumberOfUsersInCourses (Gbl.Scope.Current,Rol_UNK);
/***** Get number of users with a web / social network *****/
switch (Gbl.Scope.Current)
diff --git a/swad_notice.c b/swad_notice.c
index 6598a8b7..c37a2e94 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -481,7 +481,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
static bool Not_CheckIfICanEditNotices (void)
{
- return (bool) (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
+ return (bool) (Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM);
}
diff --git a/swad_notification.c b/swad_notification.c
index b527c5ac..0d4fe5ca 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -1209,7 +1209,7 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
" AND Role=%u", // Notify teachers only
Gbl.CurrentCrs.Crs.CrsCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER);
+ (unsigned) Rol_TCH);
break;
case Brw_ADMI_DOCUM_GRP:
case Brw_ADMI_SHARE_GRP:
@@ -1230,7 +1230,7 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
" AND crs_usr.Role=%u", // Notify teachers only
Gbl.CurrentCrs.Grps.GrpCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER);
+ (unsigned) Rol_TCH);
break;
default: // This function should not be called in other cases
return 0;
@@ -1275,7 +1275,7 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
" AND Role=%u", // Notify teachers only
Gbl.CurrentCrs.Crs.CrsCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
- (unsigned) Rol_TEACHER);
+ (unsigned) Rol_TCH);
else // Course without teachers
// If this course has no teachers
// and I want to be a teacher (checked before calling this function
@@ -1322,7 +1322,7 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
sprintf (Query,"SELECT UsrCod FROM crs_usr"
" WHERE CrsCod=%ld AND Role=%u AND UsrCod<>%ld",
Gbl.CurrentCrs.Crs.CrsCod,
- (unsigned) Rol_TEACHER,
+ (unsigned) Rol_TCH,
Gbl.Usrs.Me.UsrDat.UsrCod);
break;
default:
diff --git a/swad_password.c b/swad_password.c
index 015b8325..bc866415 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -828,8 +828,8 @@ void Pwd_ShowFormOthPwd (void)
/***** Form to change password *****/
/* Start form */
- Act_FormStart ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActChgPwdStd :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActChgPwdTch :
+ Act_FormStart ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActChgPwdStd :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActChgPwdTch :
ActChgPwdOth));
Usr_PutParamOtherUsrCodEncrypted ();
@@ -879,8 +879,8 @@ void Pwd_PutLinkToChangeOtherUsrPassword (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
Pwd_PutLinkToChangeMyPassword ();
else // Not me
- Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmPwdStd :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch :
+ Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActFrmPwdStd :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActFrmPwdTch :
ActFrmPwdOth),
NULL,Usr_PutParamOtherUsrCodEncrypted,
"key64x64.gif",
diff --git a/swad_photo.c b/swad_photo.c
index d2393370..1019277b 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -139,9 +139,9 @@ bool Pho_ICanChangeOtherUsrPhoto (const struct UsrData *UsrDat)
/* Check if I have permission to change user's photo */
switch (Gbl.Usrs.Me.LoggedRole)
{
- case Rol_TEACHER:
+ case Rol_TCH:
/* Check 1: I can change the photo of confirmed students */
- if (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT && // A student
+ if (UsrDat->RoleInCurrentCrsDB == Rol_STD && // A student
UsrDat->Accepted) // who accepted registration
return true;
@@ -195,8 +195,8 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
PhotoExists = Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL);
TitleText = PhotoExists ? Txt_Change_photo :
Txt_Upload_photo;
- Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActReqStdPho :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActReqTchPho :
+ Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActReqStdPho :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActReqTchPho :
ActReqOthPho), // Guest, visitor or admin
NULL,Usr_PutParamOtherUsrCodEncrypted,
"photo64x64.gif",
@@ -234,8 +234,8 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void)
/***** Link to request the removal of another user's photo *****/
PhotoExists = Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL);
if (PhotoExists)
- Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActReqRemStdPho :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActReqRemTchPho :
+ Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActReqRemStdPho :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActReqRemTchPho :
ActReqRemOthPho), // Guest, visitor or admin
NULL,Usr_PutParamOtherUsrCodEncrypted,
"remove-on64x64.png",
@@ -307,8 +307,8 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
Act_FormStart (ActDetMyPho);
else
{
- Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActDetStdPho :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActDetTchPho :
+ Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActDetStdPho :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActDetTchPho :
ActDetOthPho)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
@@ -482,8 +482,8 @@ void Pho_ReqRemoveUsrPhoto (void)
"PHOTO186x248",Pho_NO_ZOOM,false);
/* End alert */
- Ale_ShowAlertAndButton2 ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActRemStdPho :
- (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActRemTchPho :
+ Ale_ShowAlertAndButton2 ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STD ? ActRemStdPho :
+ (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TCH ? ActRemTchPho :
ActRemOthPho), // Guest, visitor or admin
NULL,Usr_PutParamOtherUsrCodEncrypted,
Lay_REMOVE_BUTTON,Txt_Remove_photo);
@@ -649,8 +649,8 @@ static bool Pho_ReceivePhotoAndDetectFaces (bool ItsMe,const struct UsrData *Usr
{
NumFacesGreen++;
Act_FormStart (ItsMe ? ActUpdMyPho :
- (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActUpdStdPho :
- (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActUpdTchPho :
+ (UsrDat->RoleInCurrentCrsDB == Rol_STD ? ActUpdStdPho :
+ (UsrDat->RoleInCurrentCrsDB == Rol_TCH ? ActUpdTchPho :
ActUpdOthPho))); // Guest, visitor or admin
if (!ItsMe)
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
@@ -1286,7 +1286,7 @@ void Pho_CalcPhotoDegree (void)
TypeOfAverage++)
{
/***** Compute average photos of students belonging this degree *****/
- Pho_ComputeAveragePhoto (DegCod,Sex,Rol_STUDENT,
+ Pho_ComputeAveragePhoto (DegCod,Sex,Rol_STD,
TypeOfAverage,DirAvgPhotosRelPath[TypeOfAverage],
&NumStds,&NumStdsWithPhoto,&PartialTimeToComputeAvgPhotoInMicroseconds);
TotalTimeToComputeAvgPhotoInMicroseconds += PartialTimeToComputeAvgPhotoInMicroseconds;
@@ -1297,7 +1297,7 @@ void Pho_CalcPhotoDegree (void)
}
/***** Free memory for students list *****/
- Usr_FreeUsrsList (Rol_STUDENT);
+ Usr_FreeUsrsList (Rol_STD);
/***** Show photos *****/
Pho_ShowOrPrintPhotoDegree (Pho_DEGREES_SEE);
@@ -1330,7 +1330,7 @@ static long Pho_GetDegWithAvgPhotoLeastRecentlyUpdated (void)
" AND degrees.DegCod NOT IN"
" (SELECT DISTINCT DegCod FROM sta_degrees)"
" LIMIT 1",
- (unsigned) Rol_STUDENT);
+ (unsigned) Rol_STD);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get degrees");
/* If number of rows is 1, then get the degree code */
@@ -1359,7 +1359,7 @@ static long Pho_GetDegWithAvgPhotoLeastRecentlyUpdated (void)
" AND crs_usr.Role=%u"
" ORDER BY sta_degrees.TimeAvgPhoto LIMIT 1",
Cfg_MIN_TIME_TO_RECOMPUTE_AVG_PHOTO,
- (unsigned) Rol_STUDENT);
+ (unsigned) Rol_STD);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get degrees");
/* If number of rows is 1, then get the degree code */
@@ -2067,7 +2067,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin
}
else // No degrees with students found
/***** Show warning indicating no students found *****/
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
@@ -2181,7 +2181,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
}
else // No degrees with students found!
/***** Show warning indicating no students found *****/
- Usr_ShowWarningNoUsersFound (Rol_STUDENT);
+ Usr_ShowWarningNoUsersFound (Rol_STD);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
diff --git a/swad_profile.c b/swad_profile.c
index dc5b8047..ce0a4045 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -386,36 +386,36 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
"");
/***** Number of courses in which the user is teacher *****/
- NumCrssUsrIsTeacher = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_TEACHER);
+ NumCrssUsrIsTeacher = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_TCH);
fprintf (Gbl.F.Out,""
"%u %s",
- Txt_ROLES_SINGUL_Abc[Rol_TEACHER][UsrDat->Sex],
+ Txt_ROLES_SINGUL_Abc[Rol_TCH][UsrDat->Sex],
Gbl.Prefs.IconsURL,
NumCrssUsrIsTeacher,
Txt_courses_ABBREVIATION);
if (NumCrssUsrIsTeacher)
fprintf (Gbl.F.Out," (%u %s/%u %s)",
- Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TEACHER,Rol_TEACHER),
+ Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TCH,Rol_TCH),
Txt_teachers_ABBREVIATION,
- Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TEACHER,Rol_STUDENT),
+ Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_TCH,Rol_STD),
Txt_students_ABBREVIATION);
fprintf (Gbl.F.Out," ");
/***** Number of courses in which the user is student *****/
- NumCrssUsrIsStudent = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_STUDENT);
+ NumCrssUsrIsStudent = Usr_GetNumCrssOfUsrWithARole (UsrDat->UsrCod,Rol_STD);
fprintf (Gbl.F.Out,""
"%u %s",
- Txt_ROLES_SINGUL_Abc[Rol_STUDENT][UsrDat->Sex],
+ Txt_ROLES_SINGUL_Abc[Rol_STD][UsrDat->Sex],
Gbl.Prefs.IconsURL,
NumCrssUsrIsStudent,
Txt_courses_ABBREVIATION);
if (NumCrssUsrIsStudent)
fprintf (Gbl.F.Out," (%u %s/%u %s)",
- Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STUDENT,Rol_TEACHER),
+ Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STD,Rol_TCH),
Txt_teachers_ABBREVIATION,
- Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STUDENT,Rol_STUDENT),
+ Usr_GetNumUsrsInCrssOfAUsr (UsrDat->UsrCod,Rol_STD,Rol_STD),
Txt_students_ABBREVIATION);
fprintf (Gbl.F.Out," ");
diff --git a/swad_record.c b/swad_record.c
index c55477c6..513be5fc 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1110,7 +1110,7 @@ static void Rec_ShowRecordOneStdCrs (void)
fprintf (Gbl.F.Out,"