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 22.56: Oct 29, 2022 Code refactoring in user record.

This commit is contained in:
acanas 2022-10-29 01:01:11 +02:00
parent 870f496b24
commit 272fed1a69
7 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swad_account.c
View File

@ -1110,7 +1110,7 @@ static void Acc_RemoveUsrBriefcase (struct Usr_Data *UsrDat)
/********* Put an icon to the action used to manage user's account ***********/ /********* Put an icon to the action used to manage user's account ***********/
/*****************************************************************************/ /*****************************************************************************/
void Acc_PutIconToChangeUsrAccount (void) void Acc_PutIconToChangeUsrAccount (struct Usr_Data *UsrDat)
{ {
static const Act_Action_t NextAction[Rol_NUM_ROLES] = static const Act_Action_t NextAction[Rol_NUM_ROLES] =
{ {
@ -1127,13 +1127,13 @@ void Acc_PutIconToChangeUsrAccount (void)
}; };
/***** Link for changing the account *****/ /***** Link for changing the account *****/
if (Usr_ItsMe (Gbl.Record.UsrDat->UsrCod)) if (Usr_ItsMe (UsrDat->UsrCod))
Lay_PutContextualLinkOnlyIcon (ActFrmMyAcc,NULL, Lay_PutContextualLinkOnlyIcon (ActFrmMyAcc,NULL,
NULL,NULL, NULL,NULL,
"at.svg",Ico_BLACK); "at.svg",Ico_BLACK);
else // Not me else // Not me
if (Usr_ICanEditOtherUsr (Gbl.Record.UsrDat)) if (Usr_ICanEditOtherUsr (UsrDat))
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs],NULL, Lay_PutContextualLinkOnlyIcon (NextAction[UsrDat->Roles.InCurrentCrs],NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
"at.svg",Ico_BLACK); "at.svg",Ico_BLACK);
} }

2
swad_account.h
View File

@ -68,6 +68,6 @@ void Acc_RemoveMyAccount (void);
void Acc_CompletelyEliminateAccount (struct Usr_Data *UsrDat, void Acc_CompletelyEliminateAccount (struct Usr_Data *UsrDat,
Cns_QuietOrVerbose_t QuietOrVerbose); Cns_QuietOrVerbose_t QuietOrVerbose);
void Acc_PutIconToChangeUsrAccount (void); void Acc_PutIconToChangeUsrAccount (struct Usr_Data *UsrDat);
#endif #endif

3
swad_changelog.h
View File

@ -605,7 +605,7 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 22.55 (2022-10-28)" #define Log_PLATFORM_VERSION "SWAD 22.56 (2022-10-29)"
#define CSS_FILE "swad22.49.4.css" #define CSS_FILE "swad22.49.4.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
@ -616,6 +616,7 @@ Que al subir un fichero por defecto est
Al subir cosas para los grupos, en documentos, resltar más los grupos porque no son conscientes... Al subir cosas para los grupos, en documentos, resltar más los grupos porque no son conscientes...
Exportar listas en CSV. Exportar listas en CSV.
Version 22.56: Oct 29, 2022 Code refactoring in user record. (333696 lines)
Version 22.55: Oct 28, 2022 Code refactoring in degree types. (333694 lines) Version 22.55: Oct 28, 2022 Code refactoring in degree types. (333694 lines)
Version 22.54: Oct 28, 2022 Code refactoring and bug fixing in institutional links. (333614 lines) Version 22.54: Oct 28, 2022 Code refactoring and bug fixing in institutional links. (333614 lines)
Version 22.53: Oct 28, 2022 Code refactoring in mail domains. (333607 lines) Version 22.53: Oct 28, 2022 Code refactoring in mail domains. (333607 lines)

5
swad_global.h
View File

@ -233,11 +233,6 @@ struct Globals
char FileNamePhoto[NAME_MAX + 1]; // File name (with no path and no .jpg) of the temporary file with the selected face char FileNamePhoto[NAME_MAX + 1]; // File name (with no path and no .jpg) of the temporary file with the selected face
Enr_RegRemOneUsrAction_t RegRemAction; // Enrolment action Enr_RegRemOneUsrAction_t RegRemAction; // Enrolment action
} Usrs; } Usrs;
struct
{
struct Usr_Data *UsrDat;
Rec_SharedRecordViewType_t TypeOfView;
} Record;
struct struct
{ {
HieLvl_Level_t Current; HieLvl_Level_t Current;

10
swad_photo.c
View File

@ -169,7 +169,7 @@ bool Pho_ICanChangeOtherUsrPhoto (struct Usr_Data *UsrDat)
/********** Put a link to the action used to request user's photo ************/ /********** Put a link to the action used to request user's photo ************/
/*****************************************************************************/ /*****************************************************************************/
void Pho_PutIconToChangeUsrPhoto (void) void Pho_PutIconToChangeUsrPhoto (struct Usr_Data *UsrDat)
{ {
static const Act_Action_t NextAction[Rol_NUM_ROLES] = static const Act_Action_t NextAction[Rol_NUM_ROLES] =
{ {
@ -186,15 +186,13 @@ void Pho_PutIconToChangeUsrPhoto (void)
}; };
/***** Link for changing / uploading the photo *****/ /***** Link for changing / uploading the photo *****/
if (Usr_ItsMe (Gbl.Record.UsrDat->UsrCod)) if (Usr_ItsMe (UsrDat->UsrCod))
{
Lay_PutContextualLinkOnlyIcon (ActReqMyPho,NULL, Lay_PutContextualLinkOnlyIcon (ActReqMyPho,NULL,
NULL,NULL, NULL,NULL,
"camera.svg",Ico_BLACK); "camera.svg",Ico_BLACK);
}
else // Not me else // Not me
if (Pho_ICanChangeOtherUsrPhoto (Gbl.Record.UsrDat)) if (Pho_ICanChangeOtherUsrPhoto (UsrDat))
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs],NULL, Lay_PutContextualLinkOnlyIcon (NextAction[UsrDat->Roles.InCurrentCrs],NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
"camera.svg",Ico_BLACK); "camera.svg",Ico_BLACK);
} }

2
swad_photo.h
View File

@ -96,7 +96,7 @@ struct Pho_DegPhotos
/*****************************************************************************/ /*****************************************************************************/
bool Pho_ICanChangeOtherUsrPhoto (struct Usr_Data *UsrDat); bool Pho_ICanChangeOtherUsrPhoto (struct Usr_Data *UsrDat);
void Pho_PutIconToChangeUsrPhoto (void); void Pho_PutIconToChangeUsrPhoto (struct Usr_Data *UsrDat);
void Pho_ReqMyPhoto (void); void Pho_ReqMyPhoto (void);
void Pho_SendPhotoUsr (void); void Pho_SendPhotoUsr (void);
void Pho_RecMyPhotoDetFaces (void); void Pho_RecMyPhotoDetFaces (void);

48
swad_record.c
View File

@ -85,6 +85,16 @@ extern struct Globals Gbl;
#define Rec_MY_INS_CTR_DPT_ID "my_ins_ctr_dpt_section" #define Rec_MY_INS_CTR_DPT_ID "my_ins_ctr_dpt_section"
/*****************************************************************************/
/************************* Private global variables **************************/
/*****************************************************************************/
struct
{
struct Usr_Data *UsrDat;
Rec_SharedRecordViewType_t TypeOfView;
} Rec_Record;
/*****************************************************************************/ /*****************************************************************************/
/***************************** Private prototypes ****************************/ /***************************** Private prototypes ****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -2109,8 +2119,8 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
/***** Begin box and table *****/ /***** Begin box and table *****/
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Gbl.Record.UsrDat = UsrDat; Rec_Record.UsrDat = UsrDat;
Gbl.Record.TypeOfView = TypeOfView; Rec_Record.TypeOfView = TypeOfView;
if (TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM) if (TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM)
Box_BoxTableBegin (StrRecordWidth,NULL, Box_BoxTableBegin (StrRecordWidth,NULL,
NULL,NULL, // New user ==> don't put icons NULL,NULL, // New user ==> don't put icons
@ -2307,7 +2317,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
static void Rec_PutIconsCommands (__attribute__((unused)) void *Args) static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
{ {
bool ItsMe = Usr_ItsMe (Gbl.Record.UsrDat->UsrCod); bool ItsMe = Usr_ItsMe (Rec_Record.UsrDat->UsrCod);
bool ICanViewUsrProfile; bool ICanViewUsrProfile;
bool RecipientHasBannedMe; bool RecipientHasBannedMe;
static const Act_Action_t NextAction[Rol_NUM_ROLES] = static const Act_Action_t NextAction[Rol_NUM_ROLES] =
@ -2328,8 +2338,8 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
Act_GetBrowserTab (Gbl.Action.Act) == Act_BRW_1ST_TAB && // Only in main browser tab Act_GetBrowserTab (Gbl.Action.Act) == Act_BRW_1ST_TAB && // Only in main browser tab
Gbl.Usrs.Me.Logged) // Only if I am logged Gbl.Usrs.Me.Logged) // Only if I am logged
{ {
ICanViewUsrProfile = Pri_ShowingIsAllowed (Gbl.Record.UsrDat->BaPrfVisibility, ICanViewUsrProfile = Pri_ShowingIsAllowed (Rec_Record.UsrDat->BaPrfVisibility,
Gbl.Record.UsrDat); Rec_Record.UsrDat);
/***** Begin container *****/ /***** Begin container *****/
HTM_DIV_Begin ("class=\"FRAME_ICO\""); HTM_DIV_Begin ("class=\"FRAME_ICO\"");
@ -2346,12 +2356,12 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
"user.svg",Ico_BLACK); "user.svg",Ico_BLACK);
/***** Button to view user's record card *****/ /***** Button to view user's record card *****/
if (Usr_CheckIfICanViewRecordStd (Gbl.Record.UsrDat)) if (Usr_CheckIfICanViewRecordStd (Rec_Record.UsrDat))
/* View student's records: common record card and course record card */ /* View student's records: common record card and course record card */
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneStd,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeRecOneStd,NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
"address-card.svg",Ico_BLACK); "address-card.svg",Ico_BLACK);
else if (Usr_CheckIfICanViewRecordTch (Gbl.Record.UsrDat)) else if (Usr_CheckIfICanViewRecordTch (Rec_Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneTch,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeRecOneTch,NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
"address-card.svg",Ico_BLACK); "address-card.svg",Ico_BLACK);
@ -2361,7 +2371,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
Lay_PutContextualLinkOnlyIcon (ActSeeMyAgd,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeMyAgd,NULL,
NULL,NULL, NULL,NULL,
"calendar.svg",Ico_BLACK); "calendar.svg",Ico_BLACK);
else if (Usr_CheckIfICanViewUsrAgenda (Gbl.Record.UsrDat)) else if (Usr_CheckIfICanViewUsrAgenda (Rec_Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeUsrAgd,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeUsrAgd,NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
"calendar.svg",Ico_BLACK); "calendar.svg",Ico_BLACK);
@ -2373,16 +2383,16 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
Gbl.Usrs.Me.Role.Logged == Rol_CTR_ADM || Gbl.Usrs.Me.Role.Logged == Rol_CTR_ADM ||
Gbl.Usrs.Me.Role.Logged == Rol_INS_ADM || Gbl.Usrs.Me.Role.Logged == Rol_INS_ADM ||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs],NULL, Lay_PutContextualLinkOnlyIcon (NextAction[Rec_Record.UsrDat->Roles.InCurrentCrs],NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
"user-cog.svg",Ico_BLACK); "user-cog.svg",Ico_BLACK);
if (Gbl.Hierarchy.Level == HieLvl_CRS) // Course selected if (Gbl.Hierarchy.Level == HieLvl_CRS) // Course selected
{ {
if (Gbl.Record.UsrDat->Roles.InCurrentCrs == Rol_STD) // He/she is a student in current course if (Rec_Record.UsrDat->Roles.InCurrentCrs == Rol_STD) // He/she is a student in current course
{ {
/***** Buttons to view student's test, exam and match results *****/ /***** Buttons to view student's test, exam and match results *****/
if (Usr_CheckIfICanViewTstExaMchResult (Gbl.Record.UsrDat)) if (Usr_CheckIfICanViewTstExaMchResult (Rec_Record.UsrDat))
{ {
if (ItsMe) if (ItsMe)
{ {
@ -2417,7 +2427,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
} }
/***** Button to view student's assignments and works *****/ /***** Button to view student's assignments and works *****/
if (Usr_CheckIfICanViewAsgWrk (Gbl.Record.UsrDat)) if (Usr_CheckIfICanViewAsgWrk (Rec_Record.UsrDat))
{ {
if (ItsMe) if (ItsMe)
Lay_PutContextualLinkOnlyIcon (ActAdmAsgWrkUsr,NULL, Lay_PutContextualLinkOnlyIcon (ActAdmAsgWrkUsr,NULL,
@ -2430,7 +2440,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
} }
/***** Button to view student's attendance *****/ /***** Button to view student's attendance *****/
if (Usr_CheckIfICanViewAtt (Gbl.Record.UsrDat)) if (Usr_CheckIfICanViewAtt (Rec_Record.UsrDat))
{ {
if (ItsMe) if (ItsMe)
Lay_PutContextualLinkOnlyIcon (ActSeeLstMyAtt,NULL, Lay_PutContextualLinkOnlyIcon (ActSeeLstMyAtt,NULL,
@ -2450,7 +2460,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
/***** Button to send a message *****/ /***** Button to send a message *****/
RecipientHasBannedMe = Msg_DB_CheckIfUsrIsBanned (Gbl.Usrs.Me.UsrDat.UsrCod, // From: RecipientHasBannedMe = Msg_DB_CheckIfUsrIsBanned (Gbl.Usrs.Me.UsrDat.UsrCod, // From:
Gbl.Record.UsrDat->UsrCod); // To: Rec_Record.UsrDat->UsrCod); // To:
if (!RecipientHasBannedMe) if (!RecipientHasBannedMe)
Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL, Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL,
Rec_PutParamsMsgUsr,NULL, Rec_PutParamsMsgUsr,NULL,
@ -2460,7 +2470,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
if (!ItsMe) // Not me if (!ItsMe) // Not me
{ {
if (Fol_DB_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod, if (Fol_DB_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Record.UsrDat->UsrCod)) Rec_Record.UsrDat->UsrCod))
// I follow user // I follow user
Lay_PutContextualLinkOnlyIcon (ActUnfUsr,NULL, Lay_PutContextualLinkOnlyIcon (ActUnfUsr,NULL,
Rec_PutParamUsrCodEncrypted,NULL, Rec_PutParamUsrCodEncrypted,NULL,
@ -2472,10 +2482,10 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
} }
/***** Button to change user's photo *****/ /***** Button to change user's photo *****/
Pho_PutIconToChangeUsrPhoto (); Pho_PutIconToChangeUsrPhoto (Rec_Record.UsrDat);
/***** Button to change user's account *****/ /***** Button to change user's account *****/
Acc_PutIconToChangeUsrAccount (); Acc_PutIconToChangeUsrAccount (Rec_Record.UsrDat);
/***** End container *****/ /***** End container *****/
HTM_DIV_End (); HTM_DIV_End ();
@ -2484,7 +2494,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
void Rec_PutParamUsrCodEncrypted (__attribute__((unused)) void *Args) void Rec_PutParamUsrCodEncrypted (__attribute__((unused)) void *Args)
{ {
Usr_PutParamUsrCodEncrypted (Gbl.Record.UsrDat->EnUsrCod); Usr_PutParamUsrCodEncrypted (Rec_Record.UsrDat->EnUsrCod);
} }
static void Rec_PutParamsMyTsts (__attribute__((unused)) void *Args) static void Rec_PutParamsMyTsts (__attribute__((unused)) void *Args)
@ -2510,7 +2520,7 @@ static void Rec_PutParamsWorks (__attribute__((unused)) void *Args)
static void Rec_PutParamsStudent (__attribute__((unused)) void *Args) static void Rec_PutParamsStudent (__attribute__((unused)) void *Args)
{ {
Par_PutHiddenParamString (NULL,"UsrCodStd",Gbl.Record.UsrDat->EnUsrCod); Par_PutHiddenParamString (NULL,"UsrCodStd",Rec_Record.UsrDat->EnUsrCod);
Grp_PutParamAllGroups (); Grp_PutParamAllGroups ();
} }