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 23.14.1: Sep 21, 2023 Code refactoring in hierarchy.

This commit is contained in:
acanas 2023-09-21 22:06:19 +02:00
parent 979d5fa168
commit 16a35c0117
7 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_center_config.c
View File

@ -613,8 +613,7 @@ static void CtrCfg_FullName (bool PutForm)
{
extern const char *Txt_Center;
HieCfg_FullName (PutForm,Txt_Center,ActRenCtrFulCfg,
Gbl.Hierarchy.Node[HieLvl_CTR].FullName);
HieCfg_FullName (PutForm,ActRenCtrFulCfg,HieLvl_CTR,Txt_Center);
}
/*****************************************************************************/
@ -623,7 +622,7 @@ static void CtrCfg_FullName (bool PutForm)
static void CtrCfg_ShrtName (bool PutForm)
{
HieCfg_ShrtName (PutForm,ActRenCtrShoCfg,Gbl.Hierarchy.Node[HieLvl_CTR].ShrtName);
HieCfg_ShrtName (PutForm,ActRenCtrShoCfg,HieLvl_CTR);
}
/*****************************************************************************/

3
swad_changelog.h
View File

@ -632,10 +632,11 @@ TODO: Francisco Javier Fern
Me sale este error, no sé si por no recordar yo la sintaxis apropiada para mandar a varios destinatarios. ¿No era así?
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.14 (2023-09-21)"
#define Log_PLATFORM_VERSION "SWAD 23.14.1 (2023-09-21)"
#define CSS_FILE "swad22.120.4.css"
#define JS_FILE "swad22.49.js"
/*
Version 23.14.1: Sep 21, 2023 Code refactoring in hierarchy. (336898 lines)
Version 23.14: Sep 21, 2023 Code refactoring in hierarchy and cache. (336904 lines)
Version 23.13.1: Sep 20, 2023 Fixed bug in browser. Reported by Eva Martínez Ortigosa. (336953 lines)
Version 23.13: Sep 20, 2023 Code refactoring in hierarchy and cache. (336951 lines)

6
swad_course_config.c
View File

@ -273,8 +273,7 @@ static void CrsCfg_FullName (bool PutForm)
{
extern const char *Txt_Course;
HieCfg_FullName (PutForm,Txt_Course,ActRenCrsFulCfg,
Gbl.Hierarchy.Node[HieLvl_CRS].FullName);
HieCfg_FullName (PutForm,ActRenCrsFulCfg,HieLvl_CRS,Txt_Course);
}
/*****************************************************************************/
@ -283,8 +282,7 @@ static void CrsCfg_FullName (bool PutForm)
static void CrsCfg_ShrtName (bool PutForm)
{
HieCfg_ShrtName (PutForm,ActRenCrsShoCfg,
Gbl.Hierarchy.Node[HieLvl_CRS].ShrtName);
HieCfg_ShrtName (PutForm,ActRenCrsShoCfg,HieLvl_CRS);
}
/*****************************************************************************/

6
swad_degree_config.c
View File

@ -268,8 +268,7 @@ static void DegCfg_FullName (bool PutForm)
{
extern const char *Txt_Degree;
HieCfg_FullName (PutForm,Txt_Degree,ActRenDegFulCfg,
Gbl.Hierarchy.Node[HieLvl_DEG].FullName);
HieCfg_FullName (PutForm,ActRenDegFulCfg,HieLvl_DEG,Txt_Degree);
}
/*****************************************************************************/
@ -278,8 +277,7 @@ static void DegCfg_FullName (bool PutForm)
static void DegCfg_ShrtName (bool PutForm)
{
HieCfg_ShrtName (PutForm,ActRenDegShoCfg,
Gbl.Hierarchy.Node[HieLvl_DEG].ShrtName);
HieCfg_ShrtName (PutForm,ActRenDegShoCfg,HieLvl_DEG);
}
/*****************************************************************************/

17
swad_hierarchy_config.c
View File

@ -85,8 +85,8 @@ void HieCfg_Title (bool PutLink,HieLvl_Level_t Level)
/********************** Show full name in configuration **********************/
/*****************************************************************************/
void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
const char FullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1])
void HieCfg_FullName (bool PutForm,Act_Action_t NextAction,HieLvl_Level_t Level,
const char *Label)
{
/***** Full name *****/
HTM_TR_Begin (NULL);
@ -102,7 +102,8 @@ void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
{
/* Form to change full name */
Frm_BeginForm (NextAction);
HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,FullName,
HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,
Gbl.Hierarchy.Node[Level].FullName,
HTM_SUBMIT_ON_CHANGE,
"id=\"FullName\""
" class=\"INPUT_FULL_NAME INPUT_%s\""
@ -111,7 +112,7 @@ void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
Frm_EndForm ();
}
else // I can not edit full name
HTM_Txt (FullName);
HTM_Txt (Gbl.Hierarchy.Node[Level].FullName);
HTM_TD_End ();
HTM_TR_End ();
@ -121,8 +122,7 @@ void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
/********* Show institution short name in institution configuration **********/
/*****************************************************************************/
void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
const char ShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1])
void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,HieLvl_Level_t Level)
{
extern const char *Txt_Short_name;
@ -140,7 +140,8 @@ void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
{
/* Form to change short name */
Frm_BeginForm (NextAction);
HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,ShrtName,
HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,
Gbl.Hierarchy.Node[Level].ShrtName,
HTM_SUBMIT_ON_CHANGE,
"id=\"ShortName\""
" class=\"INPUT_SHORT_NAME INPUT_%s\""
@ -149,7 +150,7 @@ void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
Frm_EndForm ();
}
else // I can not edit short name
HTM_Txt (ShrtName);
HTM_Txt (Gbl.Hierarchy.Node[Level].ShrtName);
HTM_TD_End ();
HTM_TR_End ();

7
swad_hierarchy_config.h
View File

@ -34,10 +34,9 @@
/*****************************************************************************/
void HieCfg_Title (bool PutLink,HieLvl_Level_t LogoScope);
void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
const char FullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1]);
void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
const char ShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1]);
void HieCfg_FullName (bool PutForm,Act_Action_t NextAction,HieLvl_Level_t Level,
const char *Label);
void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,HieLvl_Level_t Level);
void HieCfg_WWW (bool PrintView,bool PutForm,Act_Action_t NextAction,
const char WWW[Cns_MAX_BYTES_WWW + 1]);
void HieCfg_Shortcut (bool PrintView,ParCod_Param_t ParCode,long HieCod);

8
swad_institution_config.c
View File

@ -329,7 +329,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
CtyInLst = &Gbl.Hierarchy.List[HieLvl_SYS].Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&CtyInLst->HieCod,
CtyInLst->HieCod == Gbl.Hierarchy.Node[HieLvl_CTY].HieCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",CtyInLst->FullName);
}
@ -370,8 +370,7 @@ static void InsCfg_FullName (bool PutForm)
{
extern const char *Txt_Institution;
HieCfg_FullName (PutForm,Txt_Institution,ActRenInsFulCfg,
Gbl.Hierarchy.Node[HieLvl_INS].FullName);
HieCfg_FullName (PutForm,ActRenInsFulCfg,HieLvl_INS,Txt_Institution);
}
/*****************************************************************************/
@ -380,8 +379,7 @@ static void InsCfg_FullName (bool PutForm)
static void InsCfg_ShrtName (bool PutForm)
{
HieCfg_ShrtName (PutForm,ActRenInsShoCfg,
Gbl.Hierarchy.Node[HieLvl_INS].ShrtName);
HieCfg_ShrtName (PutForm,ActRenInsShoCfg,HieLvl_INS);
}
/*****************************************************************************/