diff --git a/swad_action.c b/swad_action.c index 69049325b..1821c6917 100644 --- a/swad_action.c +++ b/swad_action.c @@ -3092,7 +3092,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" }, /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Agd_ShowMyAgenda ,"calendar64x64.png" }, /* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" }, - /* ActReqEdiRecSha */{ 285, 6,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMyInsCtrDpt,"card64x64.gif" }, + /* ActReqEdiRecSha */{ 285, 6,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndOtherData,"card64x64.gif" }, /* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pre_EditPrefs ,"heart64x64.gif" }, // Actions not in menu: @@ -3149,7 +3149,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgPriPho */{ 774,-1,TabUnk,ActEdiPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ChangePhotoVisibility ,NULL}, /* ActChgPriPrf */{1404,-1,TabUnk,ActEdiPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_ChangeProfileVisibility ,NULL}, - /* ActReqEdiMyIns */{1165,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMyInsCtrDpt,NULL}, + /* ActReqEdiMyIns */{1165,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndOtherData,NULL}, /* ActChgCtyMyIns */{1166,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ChgCountryOfMyInstitution ,NULL}, /* ActChgMyIns */{1167,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyInstitution ,NULL}, /* ActChgMyCtr */{1168,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyCentre ,NULL}, @@ -3157,7 +3157,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgMyOff */{1170,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyOffice ,NULL}, /* ActChgMyOffPho */{1171,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_UpdateMyOfficePhone ,NULL}, - /* ActReqEdiMyNet */{1172,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMyInsCtrDpt,NULL}, + /* ActReqEdiMyNet */{1172,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndOtherData,NULL}, /* ActChgMyNet */{1173,-1,TabUnk,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Net_UpdateMyWebsAndSocialNets ,NULL}, /* ActChgThe */{ 841,-1,TabUnk,ActEdiPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,The_ChangeTheme ,Pre_EditPrefs ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index b18e3920e..c69e99324 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -355,10 +355,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.2.4 (2018-10-08)" +#define Log_PLATFORM_VERSION "SWAD 18.2.5 (2018-10-08)" #define CSS_FILE "swad18.2.2.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.2.5: Oct 08, 2018 Changes in edition of user's shared record card. (234943 lines) Version 18.2.4: Oct 08, 2018 Changes in edition of user's photo. (234953 lines) Version 18.2.3: Oct 08, 2018 Changes in edition of webs/social networks. (234952 lines) Version 18.2.2: Oct 08, 2018 Changes in edition of user's institution, centre, department... (234968 lines) diff --git a/swad_network.c b/swad_network.c index e659d3f68..751426377 100644 --- a/swad_network.c +++ b/swad_network.c @@ -379,7 +379,7 @@ void Net_UpdateMyWebsAndSocialNets (void) Net_GetMyWebsAndSocialNetsFromForm (); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ diff --git a/swad_photo.c b/swad_photo.c index dd5381694..c3904d97f 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -288,8 +288,8 @@ void Pho_ReqMyPhoto (void) /***** Show the form for sending the photo *****/ Pho_ReqPhoto (&Gbl.Usrs.Me.UsrDat); - /***** Show form to edit my shared record *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + /***** Show my record and other data *****/ + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -406,8 +406,8 @@ void Pho_RecMyPhotoDetFaces (void) if (!Pho_ReceivePhotoAndDetectFaces (true,&Gbl.Usrs.Me.UsrDat)) Pho_ReqPhoto (&Gbl.Usrs.Me.UsrDat); // Request my photograph again - /***** Show form to edit my shared record *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + /***** Show my record and other data *****/ + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -844,8 +844,8 @@ void Pho_UpdateMyPhoto2 (void) { Pho_UpdatePhoto2 (); - /***** Show form to edit my shared record *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + /***** Show my record and other data *****/ + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ diff --git a/swad_record.c b/swad_record.c index dfe96c89f..5795624a6 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2151,8 +2151,8 @@ void Rec_ShowMySharedRecordUpd (void) /***** Write alert *****/ Ale_ShowAlert (Ale_SUCCESS,Txt_Your_personal_data_have_been_updated); - /***** Show my record for checking *****/ - Rec_ShowSharedUsrRecord (Rec_SHA_MY_RECORD_CHECK,&Gbl.Usrs.Me.UsrDat,NULL); + /***** Show my record and other data *****/ + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -2195,7 +2195,6 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, Hlp_USERS_SignUp, // Rec_SHA_SIGN_UP_IN_CRS_FORM Hlp_PROFILE_Record, // Rec_SHA_MY_RECORD_FORM - Hlp_PROFILE_Record, // Rec_SHA_MY_RECORD_CHECK NULL, // Rec_SHA_OTHER_EXISTING_USR_FORM NULL, // Rec_SHA_OTHER_NEW_USR_FORM @@ -2230,7 +2229,6 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, bool ShowAddressRows; bool StudentInCurrentCrs; bool TeacherInCurrentCrs; - bool TeacherInAnyCrs; bool ShowTeacherRows; struct Instit Ins; Act_Action_t NextAction; @@ -2249,21 +2247,16 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, StudentInCurrentCrs = UsrDat->Roles.InCurrentCrs.Role == Rol_STD; TeacherInCurrentCrs = UsrDat->Roles.InCurrentCrs.Role == Rol_NET || UsrDat->Roles.InCurrentCrs.Role == Rol_TCH; - TeacherInAnyCrs = UsrDat->Roles.InCrss & ((1 << Rol_NET) | - (1 << Rol_TCH)); ShowAddressRows = (TypeOfView == Rec_SHA_MY_RECORD_FORM || - TypeOfView == Rec_SHA_MY_RECORD_CHECK || ((TypeOfView == Rec_SHA_RECORD_LIST || TypeOfView == Rec_SHA_RECORD_PRINT) && IAmLoggedAsTeacherOrSysAdm && StudentInCurrentCrs)); // He/she is a student in the current course Rol_GetRolesInAllCrssIfNotYetGot (UsrDat); // Get user's roles if not got - ShowTeacherRows = (((TypeOfView == Rec_SHA_MY_RECORD_CHECK) && - TeacherInAnyCrs) || // He/she (me, really) is a teacher in any course - ((TypeOfView == Rec_SHA_RECORD_LIST || - TypeOfView == Rec_SHA_RECORD_PRINT) && - TeacherInCurrentCrs)); // He/she is a teacher in the current course + ShowTeacherRows = (TypeOfView == Rec_SHA_RECORD_LIST || + TypeOfView == Rec_SHA_RECORD_PRINT) && + TeacherInCurrentCrs; // He/she is a teacher in the current course /* Data form = I can edit fields like surnames and name */ switch (TypeOfView) @@ -2289,7 +2282,6 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, case Rec_SHA_OTHER_EXISTING_USR_FORM: ClassForm = The_ClassForm[Gbl.Prefs.Theme]; break; - case Rec_SHA_MY_RECORD_CHECK: case Rec_SHA_OTHER_USR_CHECK: case Rec_SHA_RECORD_LIST: case Rec_SHA_RECORD_PUBLIC: @@ -3195,10 +3187,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, "" "", ClassForm, - TypeOfView == Rec_SHA_MY_RECORD_CHECK ? Txt_Sex : - Txt_Role, - TypeOfView == Rec_SHA_MY_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] : - Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]); + Txt_Role, + Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]); } /*****************************************************************************/ @@ -3944,7 +3934,7 @@ static void Rec_GetUsrCommentsFromForm (struct UsrData *UsrDat) /**** Show my shared record and a form to edit my institution, centre... *****/ /*****************************************************************************/ -void Rec_ShowMySharedRecordAndMyInsCtrDpt (void) +void Rec_ShowMySharedRecordAndOtherData (void) { /***** Start container for this user *****/ fprintf (Gbl.F.Out,"
"); @@ -4263,7 +4253,7 @@ void Rec_ChgCountryOfMyInstitution (void) Enr_UpdateInstitutionCentreDepartment (); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -4301,7 +4291,7 @@ void Rec_UpdateMyInstitution (void) Enr_UpdateInstitutionCentreDepartment (); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -4334,7 +4324,7 @@ void Rec_UpdateMyCentre (void) Enr_UpdateInstitutionCentreDepartment (); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -4365,7 +4355,7 @@ void Rec_UpdateMyDepartment (void) Enr_UpdateInstitutionCentreDepartment (); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -4386,7 +4376,7 @@ void Rec_UpdateMyOffice (void) DB_QueryUPDATE (Query,"can not update office"); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } /*****************************************************************************/ @@ -4407,5 +4397,5 @@ void Rec_UpdateMyOfficePhone (void) DB_QueryUPDATE (Query,"can not update office phone"); /***** Show form again *****/ - Rec_ShowMySharedRecordAndMyInsCtrDpt (); + Rec_ShowMySharedRecordAndOtherData (); } diff --git a/swad_record.h b/swad_record.h index de9b9e96e..cc6d3513e 100644 --- a/swad_record.h +++ b/swad_record.h @@ -52,13 +52,12 @@ /******************************* Public types ********************************/ /*****************************************************************************/ -#define Rec_SHARED_NUM_VIEW_TYPES 9 +#define Rec_SHARED_NUM_VIEW_TYPES 8 typedef enum { Rec_SHA_SIGN_UP_IN_CRS_FORM, Rec_SHA_MY_RECORD_FORM, - Rec_SHA_MY_RECORD_CHECK, Rec_SHA_OTHER_EXISTING_USR_FORM, Rec_SHA_OTHER_NEW_USR_FORM, @@ -172,7 +171,7 @@ void Rec_UpdateMyRecord (void); Rol_Role_t Rec_GetRoleFromRecordForm (void); void Rec_GetUsrNameFromRecordForm (struct UsrData *UsrDat); -void Rec_ShowMySharedRecordAndMyInsCtrDpt (void); +void Rec_ShowMySharedRecordAndOtherData (void); void Rec_ChgCountryOfMyInstitution (void); void Rec_UpdateMyInstitution (void); void Rec_UpdateMyCentre (void);