From 5765a5b7d3d6267f32676394e30e3ae8050991b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 18 Nov 2016 01:07:00 +0100 Subject: [PATCH] Version 16.64.2 --- swad_account.c | 4 ++-- swad_action.c | 4 ++-- swad_changelog.h | 3 ++- swad_enrollment.c | 24 ++++++++++++------------ swad_record.c | 32 ++++++++++++++++---------------- swad_record.h | 10 +++++----- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/swad_account.c b/swad_account.c index bd8ed6aa6..10222d48b 100644 --- a/swad_account.c +++ b/swad_account.c @@ -890,7 +890,7 @@ void Acc_AskIfRemoveMyAccount (void) Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_completely_eliminate_your_user_account); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Me.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Me.UsrDat); Act_FormStart (ActRemMyAcc); @@ -912,7 +912,7 @@ static void Acc_AskIfRemoveOtherUsrAccount (void) { Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_completely_eliminate_the_following_user); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); Act_FormStart (ActRemUsrGbl); Usr_PutParamOtherUsrCodEncrypted (); diff --git a/swad_action.c b/swad_action.c index 5fd612612..0cf306a9d 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2767,7 +2767,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" }, /* ActSeeMyAgd */{1581, 4,TabPrf,ActSeeMyAgd ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" }, /* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" }, - /* ActReqEdiRecCom */{ 285, 6,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMyCommRecord ,"card64x64.gif" }, + /* ActReqEdiRecCom */{ 285, 6,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" }, /* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" }, /* ActAdmBrf */{ 23, 8,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"pendrive64x64.gif" }, @@ -2801,7 +2801,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActReqRemMyAcc */{1430,-1,TabUnk,ActFrmMyAcc ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_AskIfRemoveMyAccount ,NULL}, /* ActRemMyAcc */{1431,-1,TabUnk,ActFrmMyAcc ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_RemoveMyAccount ,NULL}, - /* ActChgMyData */{ 298,-1,TabUnk,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Rec_UpdateMyRecord ,Rec_ShowMyCommonRecordUpd ,NULL}, + /* ActChgMyData */{ 298,-1,TabUnk,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Rec_UpdateMyRecord ,Rec_ShowMySharedRecordUpd ,NULL}, /* ActReqMyPho */{ 30,-1,TabUnk,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ReqMyPhotoWithContextLinks ,NULL}, /* ActDetMyPho */{ 693,-1,TabUnk,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_DATA,Act_THIS_WINDOW,NULL ,Pho_RecMyPhotoDetFaces ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 60cdaf77f..22627e2b5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -166,13 +166,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.64.1 (2016-11-17)" +#define Log_PLATFORM_VERSION "SWAD 16.64.2 (2016-11-17)" #define CSS_FILE "swad16.60.1.css" #define JS_FILE "swad16.46.1.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.64.2: Nov 17, 2016 Code refactoring in record cards. (207253 lines) Version 16.64.1: Nov 17, 2016 Changes in texts related to recor cards. (207252 lines) Version 16.64: Nov 17, 2016 Contextual help on students. Code refactoring in record cards. (207231 lines) diff --git a/swad_enrollment.c b/swad_enrollment.c index d139f6c0a..5312fe577 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -1781,7 +1781,7 @@ void Enr_ReqSignUpInCrs (void) else if (Gbl.Usrs.Me.LoggedRole == Rol__GUEST_ || Gbl.Usrs.Me.LoggedRole == Rol_VISITOR) /***** Show form to modify only the user's role or the user's data *****/ - Rec_ShowFormSignUpWithMyCommonRecord (); + Rec_ShowFormSignUpWithMySharedRecord (); else Lay_ShowErrorAndExit ("You must be logged to sign up in a course."); // This never should happen } @@ -1960,7 +1960,7 @@ void Enr_AskIfRejectSignUp (void) sprintf (Gbl.Message,Txt_THE_USER_X_is_already_enrolled_in_the_course_Y, Gbl.Usrs.Other.UsrDat.FullName,Gbl.CurrentCrs.Crs.FullName); Lay_ShowAlert (Lay_WARNING,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); /* Remove inscription request because it has not sense */ Enr_RemoveEnrollmentRequest (Gbl.CurrentCrs.Crs.CrsCod,Gbl.Usrs.Other.UsrDat.UsrCod); @@ -1977,7 +1977,7 @@ void Enr_AskIfRejectSignUp (void) Txt_ROLES_SINGUL_abc[Role][Gbl.Usrs.Other.UsrDat.Sex], Gbl.CurrentCrs.Crs.FullName); Lay_ShowAlert (Lay_INFO,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); /* Button to confirm rejection */ Act_FormStart (ActRejSignUp); @@ -2017,7 +2017,7 @@ void Enr_RejectSignUp (void) sprintf (Gbl.Message,Txt_THE_USER_X_is_already_enrolled_in_the_course_Y, Gbl.Usrs.Other.UsrDat.FullName,Gbl.CurrentCrs.Crs.FullName); Lay_ShowAlert (Lay_WARNING,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); } /* Remove inscription request */ @@ -3080,7 +3080,7 @@ static void Enr_AskIfRegRemUsr (struct ListUsrCods *ListUsrCods,Rol_Role_t Role) sprintf (Gbl.Message,Txt_The_user_is_new_does_not_exists_yet_in_X, Cfg_PLATFORM_SHORT_NAME); Lay_ShowAlert (Lay_INFO,Gbl.Message); - Rec_ShowFormOtherNewCommonRecord (&Gbl.Usrs.Other.UsrDat); + Rec_ShowFormOtherNewSharedRecord (&Gbl.Usrs.Other.UsrDat); } else // User's ID is not valid { @@ -3167,7 +3167,7 @@ static void Enr_AddAdm (Sco_Scope_t Scope,long Cod,const char *InsCtrDegName) Cod,InsCtrDegName); /***** Show user's record *****/ - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); } else Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); @@ -3423,14 +3423,14 @@ static void Enr_ReqAddAdm (Sco_Scope_t Scope,long Cod,const char *InsCtrDegName) sprintf (Gbl.Message,Txt_THE_USER_X_is_already_an_administrator_of_Y, Gbl.Usrs.Other.UsrDat.FullName,InsCtrDegName); Lay_ShowAlert (Lay_INFO,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); } else { sprintf (Gbl.Message,Txt_Do_you_really_want_to_register_the_following_user_as_an_administrator_of_X, InsCtrDegName); Lay_ShowAlert (Lay_INFO,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); Act_FormStart (Enr_ActNewAdm[Scope]); Usr_PutParamOtherUsrCodEncrypted (); @@ -3517,7 +3517,7 @@ void Enr_CreateNewUsr (void) } /***** Show user's record *****/ - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); } else // User's ID not valid { @@ -3588,7 +3588,7 @@ void Enr_ModifyUsr (void) } /***** Show user's record *****/ - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); } else Error = true; @@ -3700,7 +3700,7 @@ static void Enr_AskIfRemoveUsrFromCrs (struct UsrData *UsrDat,bool ItsMe) Gbl.CurrentCrs.Crs.FullName); Lay_ShowAlert (Lay_WARNING,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (UsrDat); + Rec_ShowSharedRecordUnmodifiable (UsrDat); fprintf (Gbl.F.Out,"
"); Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemStdCrs : @@ -3804,7 +3804,7 @@ static void Enr_AskIfRemAdm (bool ItsMe,Sco_Scope_t Scope,const char *InsCtrDegN InsCtrDegName); Lay_ShowAlert (Lay_INFO,Gbl.Message); - Rec_ShowCommonRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); Act_FormStart (Enr_ActRemAdm[Scope]); Usr_PutParamOtherUsrCodEncrypted (); diff --git a/swad_record.c b/swad_record.c index 6c05f92c9..1df20d1d4 100644 --- a/swad_record.c +++ b/swad_record.c @@ -996,7 +996,7 @@ void Rec_ListRecordsGsts (void) fprintf (Gbl.F.Out,"page-break-before:always;"); fprintf (Gbl.F.Out,"\">"); - /* Common record */ + /* Shared record */ Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat); fprintf (Gbl.F.Out,"
"); @@ -1059,7 +1059,7 @@ static void Rec_ShowRecordOneStdCrs (void) fprintf (Gbl.F.Out,""); - /***** Common record *****/ + /***** Shared record *****/ Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /***** Record of the student in the course *****/ @@ -1174,7 +1174,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView, fprintf (Gbl.F.Out,"page-break-before:always;"); fprintf (Gbl.F.Out,"\">"); - /* Common record */ + /* Shared record */ Rec_ShowSharedUsrRecord (ShaTypeOfView,&UsrDat); /* Record of the student in the course */ @@ -1257,7 +1257,7 @@ static void Rec_ShowRecordOneTchCrs (void) fprintf (Gbl.F.Out,"
"); - /* Common record */ + /* Shared record */ Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /* Office hours */ @@ -1357,7 +1357,7 @@ void Rec_ListRecordsTchs (void) fprintf (Gbl.F.Out,"page-break-before:always;"); fprintf (Gbl.F.Out,"\">"); - /* Common record */ + /* Shared record */ Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat); /* Office hours */ @@ -1539,7 +1539,7 @@ void Rec_UpdateAndShowOtherCrsRecord (void) } /*****************************************************************************/ -/**************************** Show record common *****************************/ +/************************* Show shared record card ***************************/ /*****************************************************************************/ // Show form or only data depending on TypeOfView @@ -1873,7 +1873,7 @@ static void Rec_ShowMyCrsRecordUpdated (void) /***** Write mensaje of success *****/ Lay_ShowAlert (Lay_SUCCESS,Txt_Your_record_card_in_this_course_has_been_updated); - /***** Common record *****/ + /***** Shared record *****/ Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Me.UsrDat); /***** Show updated user's record *****/ @@ -1920,10 +1920,10 @@ void Rec_FreeMemFieldsRecordsCrs (void) } /*****************************************************************************/ -/************ Show form to sign up and edit my common record *****************/ +/*********** Show form to sign up and edit my shared record card *************/ /*****************************************************************************/ -void Rec_ShowFormSignUpWithMyCommonRecord (void) +void Rec_ShowFormSignUpWithMySharedRecord (void) { extern const char *Txt_Sign_up; @@ -1935,10 +1935,10 @@ void Rec_ShowFormSignUpWithMyCommonRecord (void) } /*****************************************************************************/ -/******************* Show form to edit my common record **********************/ +/***************** Show form to edit my shared record card *******************/ /*****************************************************************************/ -void Rec_ShowFormMyCommRecord (void) +void Rec_ShowFormMySharedRecord (void) { extern const char *Txt_Please_fill_in_your_record_card_including_your_country_nationality; extern const char *Txt_Please_fill_in_your_record_card_including_your_sex; @@ -1970,7 +1970,7 @@ void Rec_ShowFormMyCommRecord (void) /*************** Show form to edit the record of a new user ******************/ /*****************************************************************************/ -void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat) +void Rec_ShowFormOtherNewSharedRecord (struct UsrData *UsrDat) { /***** Show the form *****/ Rec_ShowSharedUsrRecord (Rec_SHA_OTHER_NEW_USR_FORM,UsrDat); @@ -1980,7 +1980,7 @@ void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat) /*********************** Show my record after update *************************/ /*****************************************************************************/ -void Rec_ShowMyCommonRecordUpd (void) +void Rec_ShowMySharedRecordUpd (void) { extern const char *Txt_Your_personal_data_have_been_updated; @@ -1995,7 +1995,7 @@ void Rec_ShowMyCommonRecordUpd (void) /********************** Show user's record for check *************************/ /*****************************************************************************/ -void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat) +void Rec_ShowSharedRecordUnmodifiable (struct UsrData *UsrDat) { /***** Get password, user type and user's data from database *****/ Usr_GetAllUsrDataFromUsrCod (UsrDat); @@ -2010,7 +2010,7 @@ void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat) } /*****************************************************************************/ -/**************************** Show record common *****************************/ +/************************** Show shared record card **************************/ /*****************************************************************************/ // Show form or only data depending on TypeOfView @@ -3447,7 +3447,7 @@ Rol_Role_t Rec_GetRoleFromRecordForm (void) } /*****************************************************************************/ -/*************** Get data fields of common record from form ******************/ +/*************** Get data fields of shared record from form ******************/ /*****************************************************************************/ void Rec_GetUsrNameFromRecordForm (struct UsrData *UsrDat) diff --git a/swad_record.h b/swad_record.h index 1735ed96f..65fdc321c 100644 --- a/swad_record.h +++ b/swad_record.h @@ -142,11 +142,11 @@ void Rec_RemoveFieldsCrsRecordAll (long UsrCod,Cns_QuietOrVerbose_t QuietOrVerbo void Rec_AllocMemFieldsRecordsCrs (void); void Rec_FreeMemFieldsRecordsCrs (void); -void Rec_ShowFormSignUpWithMyCommonRecord (void); -void Rec_ShowFormMyCommRecord (void); -void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat); -void Rec_ShowMyCommonRecordUpd (void); -void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat); +void Rec_ShowFormSignUpWithMySharedRecord (void); +void Rec_ShowFormMySharedRecord (void); +void Rec_ShowFormOtherNewSharedRecord (struct UsrData *UsrDat); +void Rec_ShowMySharedRecordUpd (void); +void Rec_ShowSharedRecordUnmodifiable (struct UsrData *UsrDat); void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, struct UsrData *UsrDat);