From 0e4aa26683593407b0b61667429cf210dcbca4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 17 Sep 2015 16:54:02 +0200 Subject: [PATCH] Version 14.133 --- swad_ID.c | 18 ++-- swad_action.c | 215 +++++++++++++++++++++++----------------------- swad_action.h | 192 ++++++++++++++++++++--------------------- swad_changelog.h | 8 +- swad_enrollment.c | 19 +--- swad_enrollment.h | 6 +- swad_photo.c | 8 +- swad_record.c | 34 ++++---- swad_record.h | 6 +- swad_text.c | 92 +++++--------------- swad_user.c | 63 ++++++++++---- 11 files changed, 320 insertions(+), 341 deletions(-) diff --git a/swad_ID.c b/swad_ID.c index ab7ca3d79..c59fd94ab 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -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,"", @@ -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,"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); diff --git a/swad_record.c b/swad_record.c index 5fbdce1d5..942dfe44b 100644 --- a/swad_record.c +++ b/swad_record.c @@ -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,"
"); /* 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,"
"); @@ -916,7 +916,7 @@ void Rec_ListRecordsInvs (void) { fprintf (Gbl.F.Out,"
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: diff --git a/swad_record.h b/swad_record.h index e7a0caeaf..41fb7f3d0 100644 --- a/swad_record.h +++ b/swad_record.h @@ -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); diff --git a/swad_text.c b/swad_text.c index 5c0ced91c..30f5c957b 100644 --- a/swad_text.c +++ b/swad_text.c @@ -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é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é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õ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õ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żytkowników" #elif L==8 - "Lista administradores" + "Lista e cartões de outros usuá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änger"; #elif L==2 diff --git a/swad_user.c b/swad_user.c index b5c396a73..e15b8b525 100644 --- a/swad_user.c +++ b/swad_user.c @@ -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,"
"); + /* 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,"
"); } @@ -5899,7 +5907,7 @@ void Usr_ListDataAdms (void) fprintf (Gbl.F.Out,"
" "%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,"
"); - 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,"
"); + + /* 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,"
"); - - /* Put link to go to admin one user */ - Enr_PutLinkToAdminOneUsr (ActReqMdfOneGst); - /* Put link to remove old users */ Enr_PutLinkToRemOldUsrs (); - fprintf (Gbl.F.Out,"
"); - } + fprintf (Gbl.F.Out,"
"); /***** 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,"
", 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 */