Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.133

This commit is contained in:
Antonio Cañas Vargas 2015-09-17 16:54:02 +02:00
parent d87e4a0615
commit 0e4aa26683
11 changed files with 320 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swad_ID.c
View File

@ -367,9 +367,9 @@ void ID_PutLinkToChangeUsrIDs (void)
Act_PutContextualLink (ActFrmUsrAcc,NULL,
"arroba",Txt_Change_IDs);
else // Not me
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsOthStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsOthTch :
ActFrmIDsOthGst), // Guest, visitor or admin
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch :
ActFrmIDsOth), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"arroba",Txt_Change_IDs);
}
@ -455,9 +455,9 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActRemIDMe);
else
{
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemIDOthStd :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemIDOthTch :
ActRemIDOthGst)); // Guest, visitor or admin
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemID_Std :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemID_Tch :
ActRemID_Oth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"UsrID\" value=\"%s\" />",
@ -502,9 +502,9 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActNewIDMe);
else
{
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActNewIDOthStd :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActNewIDOthTch :
ActNewIDOthGst)); // Guest, visitor or admin
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActNewID_Std :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActNewID_Tch :
ActNewID_Oth)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewID\""

215
swad_action.c
View File

@ -841,11 +841,10 @@ Assessment:
690. ActChgNumRowFooGrp Change the number of rows of pie of a file of marks in group
Users:
691. ActReqSelGrp Request the selection of groups of students
692. ActLstGst Show class photo or list of guests
693. ActLstStd Show class photo or list of students
694. ActSeeAtt Show attendance events
695. ActLstTch Show class photo or list of teachers
696. ActLstAdm List main data of degree administrators
692. ActLstUsr Show class photo or list of guests
697. ActReqSignUp Apply for my enrollment
698. ActSeeSignUpReq Show pending requests for inscription in the current course
700. ActLstCon List connected users
@ -872,18 +871,22 @@ Users:
720. ActChgMaxStdGrp Request change in the number máximo of students of a group
721. ActGetExtLstStd Get external lists of students
722. ActPrnInvPho Show the class photo of guests ready to be printed
696. ActLstGst List main data of administrators
722. ActPrnGstPho Show the class photo of guests ready to be printed
723. ActPrnStdPho Show the class photo of students ready to be printed
724. ActPrnTchPho Show the class photo of teachers ready to be printed
725. ActLstGstAll List in another window the full data of guests
726. ActLstStdAll List in another window the full data of students
727. ActLstTchAll List in another window the full data of teachers
728. ActSeeRecOneStd Show record of one selected student
729. ActSeeRecOneTch Show record of one selected teacher
730. ActSeeRecSevInv Show records of several selected guests
730. ActSeeRecSevGst Show records of several selected guests
731. ActSeeRecSevStd Show records of several selected students
732. ActSeeRecSevTch Show records of several selected teachers
733. ActPrnRecSevInv Show records of several selected guests ready to be printed
733. ActPrnRecSevGst Show records of several selected guests ready to be printed
734. ActPrnRecSevStd Show records of several selected students ready to be printed
735. ActPrnRecSevTch Show records of several selected teachers ready to be printed
736. ActRcvRecOthUsr Update record fields of a student in this course
@ -918,33 +921,30 @@ Users:
760. ActReqRejSignUp Ask if reject the enrollment of a user in a course
761. ActRejSignUp Reject the enrollment of a user in a course
762b. ActReqMdfOneGst Request a user's ID for enrollment/removing
762b. ActReqMdfOneOth Request a user's ID for enrollment/removing
762c. ActReqMdfOneStd Request a user's ID for enrollment/removing
762d. ActReqMdfOneTch Request a user's ID for enrollment/removing
762e. ActReqMdfOneAdm Request a user's ID for enrollment/removing
763b. ActReqMdfGst Request enrollment/removing of a user
763b. ActReqMdfOth Request enrollment/removing of a user
763c. ActReqMdfStd Request enrollment/removing of a user
763d. ActReqMdfTch Request enrollment/removing of a user
763e. ActReqMdfAdm Request enrollment/removing of a user
764b. ActReqGstPho Show form to send the photo of another user
764b. ActReqOthPho Show form to send the photo of another user
764c. ActReqStdPho Show form to send the photo of another user
764d. ActReqTchPho Show form to send the photo of another user
765b. ActDetGstPho Receive other user's photo and detect faces on it
765b. ActDetOthPho Receive other user's photo and detect faces on it
765c. ActDetStdPho Receive other user's photo and detect faces on it
765d. ActDetTchPho Receive other user's photo and detect faces on it
766b. ActUpdGstPho Update other user's photo
766b. ActUpdOthPho Update other user's photo
766c. ActUpdStdPho Update other user's photo
766d. ActUpdTchPho Update other user's photo
767b. ActRemGstPho Remove other user's photo
767b. ActRemOthPho Remove other user's photo
767c. ActRemStdPho Remove other user's photo
767d. ActRemTchPho Remove other user's photo
768b. ActCreGst Create a new user
768b. ActCreOth Create a new user
768c. ActCreStd Create a new user
768d. ActCreTch Create a new user
769b. ActUpdOthGst Update another user's data and groups
769c. ActUpdOthStd Update another user's data and groups
769d. ActUpdOthTch Update another user's data and groups
769e. ActUpdOthAdm Update another user's data and groups
769b. ActUpdOth Update another user's data and groups
769c. ActUpdStd Update another user's data and groups
769d. ActUpdTch Update another user's data and groups
770. ActReqAccEnrCrs Confirm acceptation / refusion of enrollment in current course
771. ActAccEnrCrs Accept enrollment in current course
772. ActRemMeCrs Refuse enrollment in current course
@ -958,15 +958,15 @@ Users:
779b. ActRcvFrmEnrSevStd Receive a form with IDs of users to be registeres/removed to/from current course
779c. ActRcvFrmEnrSevTch Receive a form with IDs of users to be registeres/removed to/from current course
780b. ActFrmIDsOthGst Show form to the change of the IDs of another user
780c. ActFrmIDsOthStd Show form to the change of the IDs of another user
780d. ActFrmIDsOthTch Show form to the change of the IDs of another user
781b. ActRemIDOthGst Remove one of the IDs of another user
781c. ActRemIDOthStd Remove one of the IDs of another user
781d. ActRemIDOthTch Remove one of the IDs of another user
782b. ActNewIDOthGst Create a new user's ID for another user
782c. ActNewIDOthStd Create a new user's ID for another user
782d. ActNewIDOthTch Create a new user's ID for another user
780b. ActFrmIDsOth Show form to the change of the IDs of another user
780c. ActFrmIDsStd Show form to the change of the IDs of another user
780d. ActFrmIDsTch Show form to the change of the IDs of another user
781b. ActRemID_Oth Remove one of the IDs of another user
781c. ActRemID_Std Remove one of the IDs of another user
781d. ActRemID_Tch Remove one of the IDs of another user
782b. ActNewID_Oth Create a new user's ID for another user
782c. ActNewID_Std Create a new user's ID for another user
782d. ActNewID_Tch Create a new user's ID for another user
783. ActFrmPwdOthUsr Show form to the change of the password of another user
784. ActChgPwdOthUsr Change the password of another user
@ -1377,15 +1377,14 @@ const struct Act_Menu Act_Menu[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
{
{ActReqSelGrp ,true },
{ActLstGst ,false},
{ActLstStd ,false},
{ActSeeAtt ,false},
{ActLstTch ,false},
{ActLstAdm ,true },
{ActLstUsr ,true },
{ActReqSignUp ,true },
{ActReqSignUp ,false},
{ActSeeSignUpReq ,true },
// {ActReqMdfSevUsr ,true },
{ActLstCon ,false},
{ActReqPubPrf ,true },
@ -2247,15 +2246,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabUsr ******************************************************************
// Actions in menu:
/* ActReqSelGrp */{ 116, 0,TabUsr,ActReqSelGrp ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Grp_ReqRegisterInGrps ,"mygroups" },
/* ActLstGst */{1186, 1,TabUsr,ActLstGst ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeGuests ,"usrs" },
/* ActLstStd */{ 678, 2,TabUsr,ActLstStd ,0x1F8,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeStudents ,"usrs" },
/* ActSeeAtt */{ 861, 3,TabUsr,ActSeeAtt ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Att_SeeAttEvents ,"rollcall" },
/* ActLstTch */{ 679, 4,TabUsr,ActLstTch ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeTeachers ,"tch" },
/* ActLstAdm */{ 587, 5,TabUsr,ActLstAdm ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ListDataAdms ,"adm" },
/* ActReqSignUp */{1054, 6,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqSignUpInCrs ,"enrollmentrequest" },
/* ActSeeSignUpReq */{1057, 7,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ShowEnrollmentRequests ,"enrollmentrequest" },
/* ActLstCon */{ 995, 8,TabUsr,ActLstCon ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Con_ShowConnectedUsrs ,"userplugged" },
/* ActReqPubPrf */{1401, 9,TabUsr,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,"prf" },
/* ActLstStd */{ 678, 1,TabUsr,ActLstStd ,0x1F8,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeStudents ,"usrs" },
/* ActSeeAtt */{ 861, 2,TabUsr,ActSeeAtt ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Att_SeeAttEvents ,"rollcall" },
/* ActLstTch */{ 679, 3,TabUsr,ActLstTch ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeTeachers ,"tch" },
/* ActLstUsr */{1186, 4,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_ListDataAdms ,"adm" },
/* ActReqSignUp */{1054, 5,TabUsr,ActReqSignUp ,0x000,0x006,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqSignUpInCrs ,"enrollmentrequest" },
/* ActSeeSignUpReq */{1057, 6,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ShowEnrollmentRequests ,"enrollmentrequest" },
/* ActLstCon */{ 995, 7,TabUsr,ActLstCon ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Con_ShowConnectedUsrs ,"userplugged" },
/* ActReqPubPrf */{1401, 8,TabUsr,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,"prf" },
// Actions not in menu:
/* ActChgGrp */{ 118,-1,TabUsr,ActReqSelGrp ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Grp_ChangeMyGrpsAndShowChanges ,NULL},
@ -2282,21 +2280,25 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActChgMaxStdGrp */{ 106,-1,TabUsr,ActReqSelGrp ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Grp_ChangeMaxStdsGrp ,NULL},
/* ActGetExtLstStd */{ 796,-1,TabUsr,ActLstStd ,0x110,0x110,0x110,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Imp_ListMyImpGrpsAndStdsNoForm ,NULL},
/* ActPrnInvPho */{1190,-1,TabUsr,ActLstStd ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_SeeGstClassPhotoPrn ,NULL},
/* ActLstGst */{ 587,-1,TabUsr,ActLstUsr ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Usr_SeeGuests ,NULL},
/* ActPrnGstPho */{1190,-1,TabUsr,ActLstStd ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_SeeGstClassPhotoPrn ,NULL},
/* ActPrnStdPho */{ 120,-1,TabUsr,ActLstStd ,0x1F8,0x1E0,0x1E0,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_SeeStdClassPhotoPrn ,NULL},
/* ActPrnTchPho */{ 443,-1,TabUsr,ActLstTch ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_SeeTchClassPhotoPrn ,NULL},
/* ActLstGstAll */{1189,-1,TabUsr,ActLstGst ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_ListAllDataGsts ,NULL},
/* ActLstGstAll */{1189,-1,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_ListAllDataGsts ,NULL},
/* ActLstStdAll */{ 42,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_ListAllDataStds ,NULL},
/* ActLstTchAll */{ 578,-1,TabUsr,ActLstTch ,0x1F0,0x1F0,0x1E0,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Usr_ListAllDataTchs ,NULL},
/* ActSeeRecOneStd */{1174,-1,TabUsr,ActLstStd ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_GetUsrAndShowRecordOneStdCrs,NULL},
/* ActSeeRecOneTch */{1175,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_GetUsrAndShowRecordOneTchCrs,NULL},
/* ActSeeRecSevInv */{1187,-1,TabUsr,ActLstGst ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ListRecordsInvs ,NULL},
/* ActSeeRecSevStd */{ 89,-1,TabUsr,ActLstStd ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ListRecordsStdsCrs ,NULL},
/* ActSeeRecSevTch */{ 22,-1,TabUsr,ActLstTch ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ListRecordsTchsCrs ,NULL},
/* ActPrnRecSevInv */{1188,-1,TabUsr,ActLstGst ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Rec_ListRecordsInvs ,NULL},
/* ActPrnRecSevStd */{ 111,-1,TabUsr,ActLstStd ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Rec_ListRecordsStdsCrs ,NULL},
/* ActPrnRecSevTch */{ 127,-1,TabUsr,ActLstTch ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Rec_ListRecordsTchsCrs ,NULL},
/* ActSeeRecSevGst */{1187,-1,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ListRecordsGsts ,NULL},
/* ActSeeRecSevStd */{ 89,-1,TabUsr,ActLstStd ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ListRecordsStds ,NULL},
/* ActSeeRecSevTch */{ 22,-1,TabUsr,ActLstTch ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ListRecordsTchs ,NULL},
/* ActPrnRecSevGst */{1188,-1,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Rec_ListRecordsGsts ,NULL},
/* ActPrnRecSevStd */{ 111,-1,TabUsr,ActLstStd ,0x118,0x100,0x000,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Rec_ListRecordsStds ,NULL},
/* ActPrnRecSevTch */{ 127,-1,TabUsr,ActLstTch ,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Rec_ListRecordsTchs ,NULL},
/* ActRcvRecOthUsr */{ 300,-1,TabUsr,ActLstStd ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_UpdateAndShowOtherCrsRecord,NULL},
/* ActEdiRecFie */{ 292, 3,TabUsr,ActLstStd ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ReqEditRecordFields ,NULL},
@ -2330,66 +2332,65 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqRejSignUp */{1058,-1,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRejectSignUp ,NULL},
/* ActRejSignUp */{1059,-1,TabUsr,ActSeeSignUpReq ,0x1F0,0x1F0,0x1F0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RejectSignUp ,NULL},
/* ActReqMdfOneGst */{1414,-1,TabUsr,ActLstGst ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRegRemGst ,NULL},
/* ActReqMdfOneOth */{1414,-1,TabUsr,ActLstUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRegRemOth ,NULL},
/* ActReqMdfOneStd */{1415,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRegRemStd ,NULL},
/* ActReqMdfOneTch */{1416,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRegRemTch ,NULL},
/* ActReqMdfOneAdm */{1417,-1,TabUsr,ActLstAdm ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRegRemAdm ,NULL},
/* ActReqMdfGst */{1418,-1,TabUsr,ActLstGst ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRegRemAnotherGst ,NULL},
/* ActReqMdfOth */{1418,-1,TabUsr,ActLstUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRegRemAnotherOth ,NULL},
/* ActReqMdfStd */{1419,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRegRemAnotherStd ,NULL},
/* ActReqMdfTch */{1420,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRegRemAnotherTch ,NULL},
/* ActReqMdfAdm */{1421,-1,TabUsr,ActLstAdm ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskIfRegRemAnotherAdm ,NULL},
/* ActReqGstPho */{1432,-1,TabUsr,ActLstGst ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_SendPhotoUsr ,NULL},
/* ActReqOthPho */{1432,-1,TabUsr,ActLstUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_SendPhotoUsr ,NULL},
/* ActReqStdPho */{1433,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_SendPhotoUsr ,NULL},
/* ActReqTchPho */{1434,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_SendPhotoUsr ,NULL},
/* ActDetUsrPho */{1435,-1,TabUsr,ActLstGst ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
/* ActDetUsrPho */{1436,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
/* ActDetUsrPho */{1437,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
/* ActDetOthPho */{1435,-1,TabUsr,ActLstUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
/* ActDetStdPho */{1436,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
/* ActDetTchPho */{1437,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_DATA,Act_MAIN_WINDOW,NULL ,Pho_RecUsrPhotoDetFaces ,NULL},
/* ActUpdGstPho */{1438,-1,TabUsr,ActLstGst ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL},
/* ActUpdOthPho */{1438,-1,TabUsr,ActLstUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL},
/* ActUpdStdPho */{1439,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL},
/* ActUpdTchPho */{1440,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateUsrPhoto1 ,Pho_UpdateUsrPhoto2 ,NULL},
/* ActRemGstPho */{1441,-1,TabUsr,ActLstGst ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_RemoveUsrPhoto ,NULL},
/* ActRemOthPho */{1441,-1,TabUsr,ActLstUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_RemoveUsrPhoto ,NULL},
/* ActRemStdPho */{1442,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_RemoveUsrPhoto ,NULL},
/* ActRemTchPho */{1443,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_RemoveUsrPhoto ,NULL},
/* ActCreGst */{1444,-1,TabUsr,ActLstGst ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_CreateNewUsr ,NULL},
/* ActCreOth */{1444,-1,TabUsr,ActLstUsr ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_CreateNewUsr ,NULL},
/* ActCreStd */{1445,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_CreateNewUsr ,NULL},
/* ActCreTch */{1446,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_CreateNewUsr ,NULL},
/* ActUpdOthGst */{1422,-1,TabUsr,ActLstGst ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActUpdOthStd */{1423,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActUpdOthTch */{1424,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActUpdOthAdm */{1425,-1,TabUsr,ActLstAdm ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActUpdOth */{1422,-1,TabUsr,ActLstUsr ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActUpdStd */{1423,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActUpdTch */{1424,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ModifyUsr ,NULL},
/* ActReqAccEnrCrs */{ 592,-1,TabUsr,ActLstStd ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqAcceptRegisterInCrs ,NULL},
/* ActAccEnrCrs */{ 558,-1,TabUsr,ActLstStd ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AcceptRegisterMeInCrs ,NULL},
/* ActRemMeCrs */{ 559,-1,TabUsr,ActLstStd ,0x1F8,0x000,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReqRemMeFromCrs ,NULL},
/* ActNewAdmIns */{1337,-1,TabUsr,ActLstAdm ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToIns ,NULL},
/* ActRemAdmIns */{1338,-1,TabUsr,ActLstAdm ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdmIns ,NULL},
/* ActNewAdmIns */{1337,-1,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToIns ,NULL},
/* ActRemAdmIns */{1338,-1,TabUsr,ActLstUsr ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdmIns ,NULL},
/* ActNewAdmCtr */{1339,-1,TabUsr,ActLstAdm ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToCtr ,NULL},
/* ActRemAdmCtr */{1340,-1,TabUsr,ActLstAdm ,0x1C0,0x1C0,0x1C0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdmCtr ,NULL},
/* ActNewAdmCtr */{1339,-1,TabUsr,ActLstUsr ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToCtr ,NULL},
/* ActRemAdmCtr */{1340,-1,TabUsr,ActLstUsr ,0x1C0,0x1C0,0x1C0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdmCtr ,NULL},
/* ActNewAdmDeg */{ 586,-1,TabUsr,ActLstAdm ,0x1C0,0x1C0,0x1C0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToDeg ,NULL},
/* ActRemAdmDeg */{ 584,-1,TabUsr,ActLstAdm ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdmDeg ,NULL},
/* ActNewAdmDeg */{ 586,-1,TabUsr,ActLstUsr ,0x1C0,0x1C0,0x1C0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AddAdmToDeg ,NULL},
/* ActRemAdmDeg */{ 584,-1,TabUsr,ActLstUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAdmDeg ,NULL},
/* ActRcvFrmEnrSevStd*/{1427,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminStds ,NULL},
/* ActRcvFrmEnrSevTch*/{1428,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminTchs ,NULL},
/* ActFrmIDsOthGst */{1447,-1,TabUsr,ActLstGst ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
/* ActFrmIDsOthStd */{1448,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
/* ActFrmIDsOthTch */{1449,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
/* ActRemIDOthGst */{1450,-1,TabUsr,ActLstGst ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
/* ActRemIDOthStd */{1451,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
/* ActRemIDOthTch */{1452,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
/* ActNewIDOthGst */{1453,-1,TabUsr,ActLstGst ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActNewIDOthStd */{1454,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActNewIDOthTch */{1455,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActFrmIDsOth */{1447,-1,TabUsr,ActLstUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
/* ActFrmIDsStd */{1448,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
/* ActFrmIDsTch */{1449,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL},
/* ActRemID_Oth */{1450,-1,TabUsr,ActLstUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
/* ActRemID_Std */{1451,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
/* ActRemID_Tch */{1452,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RemoveOtherUsrID ,NULL},
/* ActNewID_Oth */{1453,-1,TabUsr,ActLstUsr ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActNewID_Std */{1454,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActNewID_Tch */{1455,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_NewOtherUsrID ,NULL},
/* ActFrmPwdOthUsr */{ 598,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pwd_ShowFormOthPwd ,NULL},
/* ActChgPwdOthUsr */{ 82,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pwd_UpdateOtherPwd1 ,Pwd_UpdateOtherPwd2 ,NULL},
@ -2400,8 +2401,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqRemAllStdCrs*/{ 88,-1,TabUsr,ActLstStd ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskRemAllStdsThisCrs ,NULL},
/* ActRemAllStdCrs */{ 87,-1,TabUsr,ActLstStd ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemAllStdsThisCrs ,NULL},
/* ActReqRemOldUsr */{ 590,-1,TabUsr,ActLstGst ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskRemoveOldUsrs ,NULL},
/* ActRemOldUsr */{ 773,-1,TabUsr,ActLstGst ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemoveOldUsrs ,NULL},
/* ActReqRemOldUsr */{ 590,-1,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_AskRemoveOldUsrs ,NULL},
/* ActRemOldUsr */{ 773,-1,TabUsr,ActLstUsr ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_RemoveOldUsrs ,NULL},
/* ActSeePubPrf */{1402,-1,TabUsr,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_GetUsrCodAndShowUserProfile,NULL},
/* ActCal1stClkTim */{1405,-1,TabUsr,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateFirstClickTime ,NULL},
@ -3330,7 +3331,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActRemAdmDeg, // #584
-1, // #585 (obsolete action)
ActNewAdmDeg, // #586
ActLstAdm, // #587
ActLstGst, // #587
-1, // #588 (obsolete action)
ActChgMyRol, // #589
ActReqRemOldUsr, // #590
@ -3929,11 +3930,11 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActCtrSch, // #1183
ActDegSch, // #1184
ActCrsSch, // #1185
ActLstGst, // #1186
ActSeeRecSevInv, // #1187
ActPrnRecSevInv, // #1188
ActLstUsr, // #1186
ActSeeRecSevGst, // #1187
ActPrnRecSevGst, // #1188
ActLstGstAll, // #1189
ActPrnInvPho, // #1190
ActPrnGstPho, // #1190
ActShoMrkCrs, // #1191
ActHidMrkCrs, // #1192
ActShoMrkGrp, // #1193
@ -4160,48 +4161,48 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActUnfUsr, // #1411
ActSeeFlg, // #1412
ActSeeFlr, // #1413
ActReqMdfOneGst, // #1414
ActReqMdfOneOth, // #1414
ActReqMdfOneStd, // #1415
ActReqMdfOneTch, // #1416
ActReqMdfOneAdm, // #1417
ActReqMdfGst, // #1418
-1, // #1417 (obsolete action)
ActReqMdfOth, // #1418
ActReqMdfStd, // #1419
ActReqMdfTch, // #1420
ActReqMdfAdm, // #1421
ActUpdOthGst, // #1422
ActUpdOthStd, // #1423
ActUpdOthTch, // #1424
ActUpdOthAdm, // #1425
-1, // #1421 (obsolete action)
ActUpdOth, // #1422
ActUpdStd, // #1423
ActUpdTch, // #1424
-1, // #1425 (obsolete action)
ActReqEnrSevStd, // #1426
ActReqEnrSevTch, // #1427
ActRcvFrmEnrSevStd, // #1428
ActRcvFrmEnrSevTch, // #1429
ActReqRemMyAcc, // #1430
ActRemMyAcc, // #1431
ActReqGstPho, // #1432
ActReqOthPho, // #1432
ActReqStdPho, // #1433
ActReqTchPho, // #1434
ActDetGstPho, // #1435
ActDetOthPho, // #1435
ActDetStdPho, // #1436
ActDetTchPho, // #1437
ActUpdGstPho, // #1438
ActUpdOthPho, // #1438
ActUpdStdPho, // #1439
ActUpdTchPho, // #1440
ActRemGstPho, // #1441
ActRemOthPho, // #1441
ActRemStdPho, // #1442
ActRemTchPho, // #1443
ActCreGst, // #1444
ActCreOth, // #1444
ActCreStd, // #1445
ActCreTch, // #1446
ActFrmIDsOthGst, // #1447
ActFrmIDsOthStd, // #1448
ActFrmIDsOthTch, // #1449
ActRemIDOthGst, // #1450
ActRemIDOthStd, // #1451
ActRemIDOthTch, // #1452
ActNewIDOthGst, // #1453
ActNewIDOthStd, // #1454
ActNewIDOthTch, // #1455
ActFrmIDsOth, // #1447
ActFrmIDsStd, // #1448
ActFrmIDsTch, // #1449
ActRemID_Oth, // #1450
ActRemID_Std, // #1451
ActRemID_Tch, // #1452
ActNewID_Oth, // #1453
ActNewID_Std, // #1454
ActNewID_Tch, // #1455
};
/*****************************************************************************/

192
swad_action.h
View File

@ -69,7 +69,7 @@ typedef enum
typedef int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
#define Act_NUM_ACTIONS (7+52+15+90+73+68+204+182+137+168+28+79)
#define Act_NUM_ACTIONS (7+52+15+90+73+68+204+182+134+168+28+79)
#define Act_MAX_ACTION_COD 1455
@ -866,50 +866,53 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica
/*****************************************************************************/
// Actions in menu
#define ActReqSelGrp (ActChgNumRowFooGrp+ 1)
#define ActLstGst (ActChgNumRowFooGrp+ 2)
#define ActLstStd (ActChgNumRowFooGrp+ 3)
#define ActSeeAtt (ActChgNumRowFooGrp+ 4)
#define ActLstTch (ActChgNumRowFooGrp+ 5)
#define ActLstAdm (ActChgNumRowFooGrp+ 6)
#define ActReqSignUp (ActChgNumRowFooGrp+ 7)
#define ActSeeSignUpReq (ActChgNumRowFooGrp+ 8)
#define ActLstCon (ActChgNumRowFooGrp+ 9)
#define ActReqPubPrf (ActChgNumRowFooGrp+ 10)
#define ActLstStd (ActChgNumRowFooGrp+ 2)
#define ActSeeAtt (ActChgNumRowFooGrp+ 3)
#define ActLstTch (ActChgNumRowFooGrp+ 4)
#define ActLstUsr (ActChgNumRowFooGrp+ 5)
#define ActReqSignUp (ActChgNumRowFooGrp+ 6)
#define ActSeeSignUpReq (ActChgNumRowFooGrp+ 7)
#define ActLstCon (ActChgNumRowFooGrp+ 8)
#define ActReqPubPrf (ActChgNumRowFooGrp+ 9)
// Secondary actions
#define ActChgGrp (ActChgNumRowFooGrp+ 11)
#define ActReqEdiGrp (ActChgNumRowFooGrp+ 12)
#define ActNewGrpTyp (ActChgNumRowFooGrp+ 13)
#define ActReqRemGrpTyp (ActChgNumRowFooGrp+ 14)
#define ActRemGrpTyp (ActChgNumRowFooGrp+ 15)
#define ActRenGrpTyp (ActChgNumRowFooGrp+ 16)
#define ActChgMdtGrpTyp (ActChgNumRowFooGrp+ 17)
#define ActChgMulGrpTyp (ActChgNumRowFooGrp+ 18)
#define ActChgTimGrpTyp (ActChgNumRowFooGrp+ 19)
#define ActNewGrp (ActChgNumRowFooGrp+ 20)
#define ActReqRemGrp (ActChgNumRowFooGrp+ 21)
#define ActRemGrp (ActChgNumRowFooGrp+ 22)
#define ActOpeGrp (ActChgNumRowFooGrp+ 23)
#define ActCloGrp (ActChgNumRowFooGrp+ 24)
#define ActEnaFilZonGrp (ActChgNumRowFooGrp+ 25)
#define ActDisFilZonGrp (ActChgNumRowFooGrp+ 26)
#define ActChgGrpTyp (ActChgNumRowFooGrp+ 27)
#define ActRenGrp (ActChgNumRowFooGrp+ 28)
#define ActChgMaxStdGrp (ActChgNumRowFooGrp+ 29)
#define ActChgGrp (ActChgNumRowFooGrp+ 10)
#define ActReqEdiGrp (ActChgNumRowFooGrp+ 11)
#define ActNewGrpTyp (ActChgNumRowFooGrp+ 12)
#define ActReqRemGrpTyp (ActChgNumRowFooGrp+ 13)
#define ActRemGrpTyp (ActChgNumRowFooGrp+ 14)
#define ActRenGrpTyp (ActChgNumRowFooGrp+ 15)
#define ActChgMdtGrpTyp (ActChgNumRowFooGrp+ 16)
#define ActChgMulGrpTyp (ActChgNumRowFooGrp+ 17)
#define ActChgTimGrpTyp (ActChgNumRowFooGrp+ 18)
#define ActNewGrp (ActChgNumRowFooGrp+ 19)
#define ActReqRemGrp (ActChgNumRowFooGrp+ 20)
#define ActRemGrp (ActChgNumRowFooGrp+ 21)
#define ActOpeGrp (ActChgNumRowFooGrp+ 22)
#define ActCloGrp (ActChgNumRowFooGrp+ 23)
#define ActEnaFilZonGrp (ActChgNumRowFooGrp+ 24)
#define ActDisFilZonGrp (ActChgNumRowFooGrp+ 25)
#define ActChgGrpTyp (ActChgNumRowFooGrp+ 26)
#define ActRenGrp (ActChgNumRowFooGrp+ 27)
#define ActChgMaxStdGrp (ActChgNumRowFooGrp+ 28)
#define ActGetExtLstStd (ActChgNumRowFooGrp+ 30)
#define ActPrnInvPho (ActChgNumRowFooGrp+ 31)
#define ActGetExtLstStd (ActChgNumRowFooGrp+ 29)
#define ActLstGst (ActChgNumRowFooGrp+ 30)
#define ActPrnGstPho (ActChgNumRowFooGrp+ 31)
#define ActPrnStdPho (ActChgNumRowFooGrp+ 32)
#define ActPrnTchPho (ActChgNumRowFooGrp+ 33)
#define ActLstGstAll (ActChgNumRowFooGrp+ 34)
#define ActLstStdAll (ActChgNumRowFooGrp+ 35)
#define ActLstTchAll (ActChgNumRowFooGrp+ 36)
#define ActSeeRecOneStd (ActChgNumRowFooGrp+ 37)
#define ActSeeRecOneTch (ActChgNumRowFooGrp+ 38)
#define ActSeeRecSevInv (ActChgNumRowFooGrp+ 39)
#define ActSeeRecSevGst (ActChgNumRowFooGrp+ 39)
#define ActSeeRecSevStd (ActChgNumRowFooGrp+ 40)
#define ActSeeRecSevTch (ActChgNumRowFooGrp+ 41)
#define ActPrnRecSevInv (ActChgNumRowFooGrp+ 42)
#define ActPrnRecSevGst (ActChgNumRowFooGrp+ 42)
#define ActPrnRecSevStd (ActChgNumRowFooGrp+ 43)
#define ActPrnRecSevTch (ActChgNumRowFooGrp+ 44)
#define ActRcvRecOthUsr (ActChgNumRowFooGrp+ 45)
@ -944,81 +947,78 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica
#define ActReqRejSignUp (ActChgNumRowFooGrp+ 71)
#define ActRejSignUp (ActChgNumRowFooGrp+ 72)
#define ActReqMdfOneGst (ActChgNumRowFooGrp+ 73)
#define ActReqMdfOneOth (ActChgNumRowFooGrp+ 73)
#define ActReqMdfOneStd (ActChgNumRowFooGrp+ 74)
#define ActReqMdfOneTch (ActChgNumRowFooGrp+ 75)
#define ActReqMdfOneAdm (ActChgNumRowFooGrp+ 76)
#define ActReqMdfGst (ActChgNumRowFooGrp+ 77)
#define ActReqMdfStd (ActChgNumRowFooGrp+ 78)
#define ActReqMdfTch (ActChgNumRowFooGrp+ 79)
#define ActReqMdfAdm (ActChgNumRowFooGrp+ 80)
#define ActReqMdfOth (ActChgNumRowFooGrp+ 76)
#define ActReqMdfStd (ActChgNumRowFooGrp+ 77)
#define ActReqMdfTch (ActChgNumRowFooGrp+ 78)
#define ActReqGstPho (ActChgNumRowFooGrp+ 81)
#define ActReqStdPho (ActChgNumRowFooGrp+ 82)
#define ActReqTchPho (ActChgNumRowFooGrp+ 83)
#define ActDetGstPho (ActChgNumRowFooGrp+ 84)
#define ActDetStdPho (ActChgNumRowFooGrp+ 85)
#define ActDetTchPho (ActChgNumRowFooGrp+ 86)
#define ActUpdGstPho (ActChgNumRowFooGrp+ 87)
#define ActUpdStdPho (ActChgNumRowFooGrp+ 88)
#define ActUpdTchPho (ActChgNumRowFooGrp+ 89)
#define ActRemGstPho (ActChgNumRowFooGrp+ 90)
#define ActRemStdPho (ActChgNumRowFooGrp+ 91)
#define ActRemTchPho (ActChgNumRowFooGrp+ 92)
#define ActCreGst (ActChgNumRowFooGrp+ 93)
#define ActCreStd (ActChgNumRowFooGrp+ 94)
#define ActCreTch (ActChgNumRowFooGrp+ 95)
#define ActUpdOthGst (ActChgNumRowFooGrp+ 96)
#define ActUpdOthStd (ActChgNumRowFooGrp+ 97)
#define ActUpdOthTch (ActChgNumRowFooGrp+ 98)
#define ActUpdOthAdm (ActChgNumRowFooGrp+ 99)
#define ActReqOthPho (ActChgNumRowFooGrp+ 79)
#define ActReqStdPho (ActChgNumRowFooGrp+ 80)
#define ActReqTchPho (ActChgNumRowFooGrp+ 81)
#define ActDetOthPho (ActChgNumRowFooGrp+ 82)
#define ActDetStdPho (ActChgNumRowFooGrp+ 83)
#define ActDetTchPho (ActChgNumRowFooGrp+ 84)
#define ActUpdOthPho (ActChgNumRowFooGrp+ 85)
#define ActUpdStdPho (ActChgNumRowFooGrp+ 86)
#define ActUpdTchPho (ActChgNumRowFooGrp+ 87)
#define ActRemOthPho (ActChgNumRowFooGrp+ 88)
#define ActRemStdPho (ActChgNumRowFooGrp+ 89)
#define ActRemTchPho (ActChgNumRowFooGrp+ 90)
#define ActCreOth (ActChgNumRowFooGrp+ 91)
#define ActCreStd (ActChgNumRowFooGrp+ 92)
#define ActCreTch (ActChgNumRowFooGrp+ 93)
#define ActUpdOth (ActChgNumRowFooGrp+ 94)
#define ActUpdStd (ActChgNumRowFooGrp+ 95)
#define ActUpdTch (ActChgNumRowFooGrp+ 96)
#define ActReqAccEnrCrs (ActChgNumRowFooGrp+100)
#define ActAccEnrCrs (ActChgNumRowFooGrp+101)
#define ActRemMeCrs (ActChgNumRowFooGrp+102)
#define ActReqAccEnrCrs (ActChgNumRowFooGrp+ 97)
#define ActAccEnrCrs (ActChgNumRowFooGrp+ 98)
#define ActRemMeCrs (ActChgNumRowFooGrp+ 99)
#define ActNewAdmIns (ActChgNumRowFooGrp+103)
#define ActRemAdmIns (ActChgNumRowFooGrp+104)
#define ActNewAdmCtr (ActChgNumRowFooGrp+105)
#define ActRemAdmCtr (ActChgNumRowFooGrp+106)
#define ActNewAdmDeg (ActChgNumRowFooGrp+107)
#define ActRemAdmDeg (ActChgNumRowFooGrp+108)
#define ActNewAdmIns (ActChgNumRowFooGrp+100)
#define ActRemAdmIns (ActChgNumRowFooGrp+101)
#define ActNewAdmCtr (ActChgNumRowFooGrp+102)
#define ActRemAdmCtr (ActChgNumRowFooGrp+103)
#define ActNewAdmDeg (ActChgNumRowFooGrp+104)
#define ActRemAdmDeg (ActChgNumRowFooGrp+105)
#define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp+109)
#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp+110)
#define ActRcvFrmEnrSevStd (ActChgNumRowFooGrp+106)
#define ActRcvFrmEnrSevTch (ActChgNumRowFooGrp+107)
#define ActFrmIDsOthGst (ActChgNumRowFooGrp+111)
#define ActFrmIDsOthStd (ActChgNumRowFooGrp+112)
#define ActFrmIDsOthTch (ActChgNumRowFooGrp+113)
#define ActRemIDOthGst (ActChgNumRowFooGrp+114)
#define ActRemIDOthStd (ActChgNumRowFooGrp+115)
#define ActRemIDOthTch (ActChgNumRowFooGrp+116)
#define ActNewIDOthGst (ActChgNumRowFooGrp+117)
#define ActNewIDOthStd (ActChgNumRowFooGrp+118)
#define ActNewIDOthTch (ActChgNumRowFooGrp+119)
#define ActFrmPwdOthUsr (ActChgNumRowFooGrp+120)
#define ActChgPwdOthUsr (ActChgNumRowFooGrp+121)
#define ActRemUsrCrs (ActChgNumRowFooGrp+122)
#define ActRemUsrGbl (ActChgNumRowFooGrp+123)
#define ActFrmIDsOth (ActChgNumRowFooGrp+108)
#define ActFrmIDsStd (ActChgNumRowFooGrp+109)
#define ActFrmIDsTch (ActChgNumRowFooGrp+110)
#define ActRemID_Oth (ActChgNumRowFooGrp+111)
#define ActRemID_Std (ActChgNumRowFooGrp+112)
#define ActRemID_Tch (ActChgNumRowFooGrp+113)
#define ActNewID_Oth (ActChgNumRowFooGrp+114)
#define ActNewID_Std (ActChgNumRowFooGrp+115)
#define ActNewID_Tch (ActChgNumRowFooGrp+116)
#define ActFrmPwdOthUsr (ActChgNumRowFooGrp+117)
#define ActChgPwdOthUsr (ActChgNumRowFooGrp+118)
#define ActRemUsrCrs (ActChgNumRowFooGrp+119)
#define ActRemUsrGbl (ActChgNumRowFooGrp+120)
#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+124)
#define ActRemAllStdCrs (ActChgNumRowFooGrp+125)
#define ActReqRemAllStdCrs (ActChgNumRowFooGrp+121)
#define ActRemAllStdCrs (ActChgNumRowFooGrp+122)
#define ActReqRemOldUsr (ActChgNumRowFooGrp+126)
#define ActRemOldUsr (ActChgNumRowFooGrp+127)
#define ActReqRemOldUsr (ActChgNumRowFooGrp+123)
#define ActRemOldUsr (ActChgNumRowFooGrp+124)
#define ActSeePubPrf (ActChgNumRowFooGrp+128)
#define ActCal1stClkTim (ActChgNumRowFooGrp+129)
#define ActCalNumClk (ActChgNumRowFooGrp+130)
#define ActCalNumFilVie (ActChgNumRowFooGrp+131)
#define ActCalNumForPst (ActChgNumRowFooGrp+132)
#define ActCalNumMsgSnt (ActChgNumRowFooGrp+133)
#define ActSeePubPrf (ActChgNumRowFooGrp+125)
#define ActCal1stClkTim (ActChgNumRowFooGrp+126)
#define ActCalNumClk (ActChgNumRowFooGrp+127)
#define ActCalNumFilVie (ActChgNumRowFooGrp+128)
#define ActCalNumForPst (ActChgNumRowFooGrp+129)
#define ActCalNumMsgSnt (ActChgNumRowFooGrp+130)
#define ActFolUsr (ActChgNumRowFooGrp+134)
#define ActUnfUsr (ActChgNumRowFooGrp+135)
#define ActSeeFlg (ActChgNumRowFooGrp+136)
#define ActSeeFlr (ActChgNumRowFooGrp+137)
#define ActFolUsr (ActChgNumRowFooGrp+131)
#define ActUnfUsr (ActChgNumRowFooGrp+132)
#define ActSeeFlg (ActChgNumRowFooGrp+133)
#define ActSeeFlr (ActChgNumRowFooGrp+134)
/*****************************************************************************/
/******************************* Messages tab ********************************/

8
swad_changelog.h
View File

@ -98,12 +98,16 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.132.7 (2015/09/17)"
#define Log_PLATFORM_VERSION "SWAD 14.133 (2015/09/17)"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 14.132.7: Sep 17, 2015 Changes in users' IDs. (184706 lines)
Version 14.133: Sep 17, 2015 Changes in user enrollment. (184665 lines)
1 change necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod IN ('1417','1421','1425');
Version 14.132.7: Sep 17, 2015 Changes in user enrollment. (184706 lines)
Version 14.132.6: Sep 17, 2015 Changes in users' IDs. (184640 lines)
12 changes necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod='1239';

19
swad_enrollment.c
View File

@ -2584,7 +2584,7 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
/************** Form to request the user's ID of another user ****************/
/*****************************************************************************/
void Enr_ReqRegRemGst (void)
void Enr_ReqRegRemOth (void)
{
Enr_ReqRegRemUsr (Rol__GUEST_);
}
@ -2599,11 +2599,6 @@ void Enr_ReqRegRemTch (void)
Enr_ReqRegRemUsr (Rol_TEACHER);
}
void Enr_ReqRegRemAdm (void)
{
Enr_ReqRegRemUsr (Rol_DEG_ADM);
}
static void Enr_ReqRegRemUsr (Rol_Role_t Role)
{
if (Enr_CheckIfICanAdminOtherUsrs ())
@ -2651,10 +2646,9 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
Lay_StartRoundFrame (NULL,Txt_Admin_one_user);
/***** Write form to request another user's ID *****/
Enr_WriteFormToReqAnotherUsrID ( Role == Rol__GUEST_ ? ActReqMdfGst :
(Role == Rol_STUDENT ? ActReqMdfStd :
Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STUDENT ? ActReqMdfStd :
(Role == Rol_TEACHER ? ActReqMdfTch :
ActReqMdfAdm)));
ActReqMdfOth));
/***** End frame *****/
Lay_EndRoundFrame ();
@ -2681,7 +2675,7 @@ static void Enr_AskIfRegRemMe (Rol_Role_t Role)
/****************** Ask me for register/remove another user ******************/
/*****************************************************************************/
void Enr_AskIfRegRemAnotherGst (void)
void Enr_AskIfRegRemAnotherOth (void)
{
Enr_AskIfRegRemAnotherUsr (Rol__GUEST_);
}
@ -2696,11 +2690,6 @@ void Enr_AskIfRegRemAnotherTch (void)
Enr_AskIfRegRemAnotherUsr (Rol_TEACHER);
}
void Enr_AskIfRegRemAnotherAdm (void)
{
Enr_AskIfRegRemAnotherUsr (Rol_DEG_ADM);
}
static void Enr_AskIfRegRemAnotherUsr (Rol_Role_t Role)
{
struct ListUsrCods ListUsrCods;

6
swad_enrollment.h
View File

@ -113,14 +113,12 @@ void Enr_ShowEnrollmentRequests (void);
void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction);
void Enr_ReqRegRemGst (void);
void Enr_ReqRegRemOth (void);
void Enr_ReqRegRemStd (void);
void Enr_ReqRegRemTch (void);
void Enr_ReqRegRemAdm (void);
void Enr_AskIfRegRemAnotherGst (void);
void Enr_AskIfRegRemAnotherOth (void);
void Enr_AskIfRegRemAnotherStd (void);
void Enr_AskIfRegRemAnotherTch (void);
void Enr_AskIfRegRemAnotherAdm (void);
void Enr_AddAdmToIns (void);
void Enr_AddAdmToCtr (void);
void Enr_AddAdmToDeg (void);

8
swad_photo.c
View File

@ -198,7 +198,7 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
PhotoExists = Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true);
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActReqStdPho :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActReqTchPho :
ActReqGstPho), // Guest, visitor or admin
ActReqOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"photo",PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
@ -228,7 +228,7 @@ static void Pho_PutLinkToRemoveOtherUsrPhoto (const struct UsrData *UsrDat)
/***** Link for removing the photo *****/
Act_PutContextualLink ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemStdPho :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemTchPho :
ActRemGstPho), // Guest, visitor or admin
ActRemOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"delon",Txt_Remove_photo);
}
@ -294,7 +294,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
{
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActDetStdPho :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActDetTchPho :
ActDetGstPho)); // Guest, visitor or admin
ActDetOthPho)); // Guest, visitor or admin
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
@ -555,7 +555,7 @@ void Pho_ReceivePhotoAndDetectFaces (bool ItsMe,const struct UsrData *UsrDat)
Act_FormStart (ItsMe ? ActUpdMyPho :
(UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActUpdStdPho :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActUpdTchPho :
ActUpdGstPho))); // Guest, visitor or admin
ActUpdOthPho))); // Guest, visitor or admin
if (!ItsMe)
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Par_PutHiddenParamString ("FileName",StrFileName);

34
swad_record.c
View File

@ -861,12 +861,12 @@ void Rec_PutLinkToEditRecordFields (void)
/*********************** Draw records of several guests **********************/
/*****************************************************************************/
void Rec_ListRecordsInvs (void)
void Rec_ListRecordsGsts (void)
{
extern const char *Txt_You_must_select_one_ore_more_users;
unsigned NumUsrs = 0;
const char *Ptr;
Rec_RecordViewType_t TypeOfView = (Gbl.CurrentAct == ActSeeRecSevInv) ? Rec_RECORD_LIST :
Rec_RecordViewType_t TypeOfView = (Gbl.CurrentAct == ActSeeRecSevGst) ? Rec_RECORD_LIST :
Rec_RECORD_PRINT;
struct UsrData UsrDat;
@ -874,7 +874,7 @@ void Rec_ListRecordsInvs (void)
Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_GUESTS;
/***** Get parameter with number of user records per page (only for printing) *****/
if (Gbl.CurrentAct == ActPrnRecSevInv)
if (Gbl.CurrentAct == ActPrnRecSevGst)
Rec_GetParamRecordsPerPage ();
/***** Get list of selected users *****/
@ -888,13 +888,13 @@ void Rec_ListRecordsInvs (void)
return;
}
if (Gbl.CurrentAct == ActSeeRecSevInv)
if (Gbl.CurrentAct == ActSeeRecSevGst)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Act_FormStart (ActPrnRecSevInv);
Usr_PutHiddenParUsrCodAll (ActPrnRecSevInv,Gbl.Usrs.Select.All);
Act_FormStart (ActPrnRecSevGst);
Usr_PutHiddenParUsrCodAll (ActPrnRecSevGst,Gbl.Usrs.Select.All);
Rec_ShowLinkToPrintPreviewOfRecords ();
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -916,7 +916,7 @@ void Rec_ListRecordsInvs (void)
{
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"margin-bottom:10px;");
if (Gbl.CurrentAct == ActPrnRecSevInv &&
if (Gbl.CurrentAct == ActPrnRecSevGst &&
NumUsrs != 0 &&
(NumUsrs % Gbl.Usrs.Listing.RecsPerPag) == 0)
fprintf (Gbl.F.Out,"page-break-before:always;");
@ -1016,7 +1016,7 @@ static void Rec_ShowRecordOneStdCrs (void)
/******************** Draw records of several students ***********************/
/*****************************************************************************/
void Rec_ListRecordsStdsCrs (void)
void Rec_ListRecordsStds (void)
{
extern const char *Txt_You_must_select_one_ore_more_students;
unsigned NumUsrs = 0;
@ -1186,7 +1186,7 @@ static void Rec_ShowRecordOneTchCrs (void)
/******************** Draw records of several teachers ***********************/
/*****************************************************************************/
void Rec_ListRecordsTchsCrs (void)
void Rec_ListRecordsTchs (void)
{
extern const char *Txt_You_must_select_one_ore_more_teachers;
extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES];
@ -2006,9 +2006,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
UsrDat->RoleInCurrentCrsDB == Rol_TEACHER);
bool CountryForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR);
bool RoleForm = (TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR);
bool RoleForm = (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
(TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR));
bool SexForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD);
bool DataForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
@ -2463,14 +2464,13 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
Act_FormStart ( Gbl.CurrentAct == ActReqMdfStd ? ActCreStd :
(Gbl.CurrentAct == ActReqMdfTch ? ActCreTch :
ActCreGst));
ActCreOth));
ID_PutParamOtherUsrIDPlain (); // New user
break;
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
Act_FormStart ( UsrDat->RoleInCurrentCrsDB < Rol_STUDENT ? ActUpdOthGst :
(UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActUpdOthStd :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActUpdOthTch :
ActUpdOthAdm)));
Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActUpdStd :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActUpdTch :
ActUpdOth));
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); // Existing user
break;
default:

6
swad_record.h
View File

@ -130,11 +130,11 @@ void Rec_ChangeVisibilityField (void);
void Rec_FreeListFields (void);
void Rec_PutLinkToEditRecordFields (void);
void Rec_ListRecordsInvs (void);
void Rec_ListRecordsGsts (void);
void Rec_GetUsrAndShowRecordOneStdCrs (void);
void Rec_ListRecordsStdsCrs (void);
void Rec_ListRecordsStds (void);
void Rec_GetUsrAndShowRecordOneTchCrs (void);
void Rec_ListRecordsTchsCrs (void);
void Rec_ListRecordsTchs (void);
void Rec_ShowLinkToPrintPreviewOfRecords (void);
void Rec_UpdateAndShowMyCrsRecord (void);
void Rec_UpdateAndShowOtherCrsRecord (void);

92
swad_text.c
View File

@ -17571,27 +17571,6 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Grupy"
#elif L==8
"Grupos"
#endif
,
// ActLstGst
#if L==0
"Convidats"
#elif L==1
"Eingeladen"
#elif L==2
"Guests"
#elif L==3
"Invitados"
#elif L==4
"Invit&eacute;s"
#elif L==5
"Invitados" // Okoteve traducción
#elif L==6
"Ospiti"
#elif L==7
"Zaproszenie"
#elif L==8
"Convidados"
#endif
,
// ActLstStd
@ -17657,25 +17636,25 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Professores"
#endif
,
// ActLstAdm
// ActLstUsr
#if L==0
"Administradors"
"Altres"
#elif L==1
"Verwalter"
"Andere"
#elif L==2
"Administrators"
"Other"
#elif L==3
"Administradores"
"Otros"
#elif L==4
"Administrateurs"
"Autres"
#elif L==5
"Administradores" // Okoteve traducción
"Otros" // Okoteve traducción
#elif L==6
"Amministratori"
"Altri"
#elif L==7
"Administratorzy"
"Inne"
#elif L==8
"Administradores"
"Outros"
#endif
,
// ActReqSignUp
@ -17772,6 +17751,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
NULL,
NULL,
NULL,
NULL,
},
{
// TabMsg *****************************************************
@ -19520,27 +19500,6 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Grupy"
#elif L==8
"Grupos"
#endif
,
// ActLstGst
#if L==0
"Llistat i fitxes dels convidats"
#elif L==1
"Eingeladenverzeichnis und profile"
#elif L==2
"Guests' list and records"
#elif L==3
"Listado y fichas de los invitados"
#elif L==4
"Liste et cartes d'invit&eacute;s"
#elif L==5
"Listado y fichas de los invitados"// Okoteve traducción
#elif L==6
"Elenco e schede ospiti"
#elif L==7
"Listy i rekordy zaproszenie"
#elif L==8
"Lista e cart&otilde;es convidados"
#endif
,
// ActLstStd
@ -19610,31 +19569,25 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Lista e cart&otilde;es professores"
#endif
,
// ActLstAdm
// ActLstUsr
#if L==0
"Llista d'administradors de titulacions"
" a les quals podeu consultar"
" per crear assignatures o altres gestions"
"Llistat i fitxes d'altres usuaris"
#elif L==1
"Liste der Administratoren"
"Eingeladenverzeichnis und profile von anderen Benutzer"
#elif L==2
"Administrators"
"Other users' list and records"
#elif L==3
"Lista de administradores de titulaciones"
" a los que puede consultar"
" para crear asignaturas u otras gestiones"
"Listado y fichas de otros usuarios"
#elif L==4
"Liste administrateurs"
"Liste et cartes d'autres utilisateurs"
#elif L==5
"Lista de administradores de titulaciones"
" a los que puede consultar"
" para crear asignaturas u otras gestiones"// Okoteve traducción
"Listado y fichas de otros usuarios" // Okoteve traducción
#elif L==6
"Lista degli amministratori"
"Elenco e schede da altri utenti"
#elif L==7
"Administratorzy"
"Listy i rekordy innych u&zdot;ytkownik&oacute;w"
#elif L==8
"Lista administradores"
"Lista e cart&otilde;es de outros usu&aacute;rios"
#endif
,
// ActReqSignUp
@ -19731,6 +19684,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
NULL,
NULL,
NULL,
NULL,
},
{
// TabMsg *****************************************************
@ -26165,7 +26119,7 @@ const char *Txt_Other_places =
const char *Txt_Other_recipients =
#if L==0
"Otros destinatarios"; // Necessita traduccio
"Altres destinataris";
#elif L==1
"Andere Empf&auml;nger";
#elif L==2

63
swad_user.c
View File

@ -162,6 +162,8 @@ static void Usr_GetAndUpdatePrefAboutListWithPhotos (void);
static bool Usr_GetParamListWithPhotosFromForm (void);
static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void);
static void Usr_PutLinkToSeeAdmins (void);
static void Usr_PutLinkToSeeGuests (void);
static void Usr_PutLinkToShowGuestsAllDataParams (void);
static void Usr_PutLinkToShowStdsAllDataParams (void);
static void Usr_PutLinkToShowTchsAllDataParams (void);
@ -4824,7 +4826,7 @@ void Usr_PutExtraParamsUsrList (Act_Action_t NextAction)
{
switch (Gbl.CurrentAct)
{
case ActLstGst:
case ActLstUsr:
case ActLstStd:
case ActLstTch:
Sco_PutParamScope (Gbl.Scope.Current);
@ -5865,8 +5867,14 @@ void Usr_ListDataAdms (void)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put link to remove old users */
Usr_PutLinkToSeeGuests ();
/* Put link to go to admin one user */
Enr_PutLinkToAdminOneUsr (ActReqMdfOneAdm);
Enr_PutLinkToAdminOneUsr (ActReqMdfOneOth);
/* Put link to remove old users */
Enr_PutLinkToRemOldUsrs ();
fprintf (Gbl.F.Out,"</div>");
}
@ -5899,7 +5907,7 @@ void Usr_ListDataAdms (void)
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"%s: ",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
Act_FormStart (ActLstAdm);
Act_FormStart (ActLstUsr);
Sco_PutSelectorScope (true);
Usr_PutParamListWithPhotos ();
Act_FormEnd ();
@ -5912,7 +5920,7 @@ void Usr_ListDataAdms (void)
{
/****** See the photos? *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (ActLstAdm);
Act_FormStart (ActLstUsr);
Sco_PutParamScope (Gbl.Scope.Current);
Usr_PutCheckboxListWithPhotos ();
Act_FormEnd ();
@ -6297,6 +6305,30 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void)
}
}
/*****************************************************************************/
/********** Put a link (form) to show list or class photo of guests **********/
/*****************************************************************************/
static void Usr_PutLinkToSeeAdmins (void)
{
// extern const char *Txt_Remove_old_users;
/***** Put form to list admins *****/
Act_PutContextualLink (ActLstUsr,NULL,"adm","Ver administradores"); // TODO: Need translation!!!
}
/*****************************************************************************/
/********** Put a link (form) to show list or class photo of guests **********/
/*****************************************************************************/
static void Usr_PutLinkToSeeGuests (void)
{
// extern const char *Txt_Remove_old_users;
/***** Put form to list guests *****/
Act_PutContextualLink (ActLstGst,NULL,"usrs","Ver invitados"); // TODO: Need translation!!!
}
/*****************************************************************************/
/********************* Show list or class photo of guests ********************/
/*****************************************************************************/
@ -6311,18 +6343,19 @@ void Usr_SeeGuests (void)
extern const char *Txt_Show_records;
/***** Put contextual links *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put link to remove old users */
Usr_PutLinkToSeeAdmins ();
/* Put link to go to admin one user */
Enr_PutLinkToAdminOneUsr (ActReqMdfOneOth);
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put link to go to admin one user */
Enr_PutLinkToAdminOneUsr (ActReqMdfOneGst);
/* Put link to remove old users */
Enr_PutLinkToRemOldUsrs ();
fprintf (Gbl.F.Out,"</div>");
}
fprintf (Gbl.F.Out,"</div>");
/***** Get and update type of list,
number of columns in class photo
@ -6341,7 +6374,7 @@ void Usr_SeeGuests (void)
/***** Form to select range of guests *****/
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
Act_FormStart (ActLstGst);
Act_FormStart (ActLstUsr);
Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
Usr_PutParamColsClassPhoto ();
Usr_PutParamListWithPhotos ();
@ -6372,7 +6405,7 @@ void Usr_SeeGuests (void)
{
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
Act_PutContextualLink (ActPrnInvPho,Usr_PutLinkToShowGuestsAllDataParams,
Act_PutContextualLink (ActPrnGstPho,Usr_PutLinkToShowGuestsAllDataParams,
"print",Txt_Print);
break;
case Usr_LIST:
@ -6385,7 +6418,7 @@ void Usr_SeeGuests (void)
/***** Draw a class photo with students of the course *****/
/* Start form */
Act_FormStart (ActSeeRecSevInv);
Act_FormStart (ActSeeRecSevGst);
Grp_PutParamsCodGrps ();
/* Header */