From 050d6c8234311082a21108ec64be1b09d23c4f47 Mon Sep 17 00:00:00 2001 From: acanas Date: Tue, 19 Sep 2023 19:13:29 +0200 Subject: [PATCH] Version 23.9.5: Sep 19, 2023 Code refactoring in hierarchy. --- swad_center_config.c | 18 +----------------- swad_changelog.h | 3 ++- swad_course_config.c | 18 +----------------- swad_degree_config.c | 18 +----------------- swad_hierarchy_config.c | 23 +++++++++++------------ swad_hierarchy_config.h | 8 +------- swad_institution_config.c | 18 +----------------- 7 files changed, 18 insertions(+), 88 deletions(-) diff --git a/swad_center_config.c b/swad_center_config.c index 7fed00af..d5a73d24 100644 --- a/swad_center_config.c +++ b/swad_center_config.c @@ -78,7 +78,6 @@ extern struct Globals Gbl; static void CtrCfg_Configuration (bool PrintView); static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args); static void CtrCfg_PutIconToChangePhoto (void); -static void CtrCfg_Title (bool PutLink); static void CtrCfg_Map (const struct Map_Coordinates *Coord); static void CtrCfg_Latitude (double Latitude); static void CtrCfg_Longitude (double Longitude); @@ -165,7 +164,7 @@ static void CtrCfg_Configuration (bool PrintView) Hlp_CENTER_Information,Box_NOT_CLOSABLE); /***** Title *****/ - CtrCfg_Title (PutLink); + HieCfg_Title (PutLink,HieLvl_CTR); /**************************** Left part ***********************************/ HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); @@ -289,21 +288,6 @@ static void CtrCfg_PutIconToChangePhoto (void) "camera.svg",Ico_BLACK); } -/*****************************************************************************/ -/******************** Show title in center configuration *********************/ -/*****************************************************************************/ - -static void CtrCfg_Title (bool PutLink) - { - HieCfg_Title (PutLink, - HieLvl_CTR, // Logo scope - Gbl.Hierarchy.Node[HieLvl_CTR].Cod, // Logo code - Gbl.Hierarchy.Node[HieLvl_CTR].ShrtName, // Logo short name - Gbl.Hierarchy.Node[HieLvl_CTR].FullName, // Logo full name - Gbl.Hierarchy.Node[HieLvl_CTR].WWW, // Logo www - Gbl.Hierarchy.Node[HieLvl_CTR].FullName); // Text full name - } - /*****************************************************************************/ /****************************** Draw center map ******************************/ /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 9c122de7..89b7c17f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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.9.4 (2023-09-19)" +#define Log_PLATFORM_VERSION "SWAD 23.9.5 (2023-09-19)" #define CSS_FILE "swad22.120.4.css" #define JS_FILE "swad22.49.js" /* + Version 23.9.5: Sep 19, 2023 Code refactoring in hierarchy. (337441 lines) Version 23.9.4: Sep 19, 2023 Code refactoring in calls for exams. (337504 lines) Version 23.9.3: Sep 19, 2023 Changes and code refactoring related to class photo. (337507 lines) Version 23.9.2: Sep 19, 2023 Code refactoring in hierarchy. (337600 lines) diff --git a/swad_course_config.c b/swad_course_config.c index f69552a9..32a2c6ed 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -60,7 +60,6 @@ extern struct Globals Gbl; /*****************************************************************************/ static void CrsCfg_PutIconToPrint (__attribute__((unused)) void *Args); -static void CrsCfg_Title (bool PutLink); static void CrsCfg_Degree (bool PrintView,bool PutForm); static void CrsCfg_FullName (bool PutForm); static void CrsCfg_ShrtName (bool PutForm); @@ -116,7 +115,7 @@ void CrsCfg_Configuration (bool PrintView) Hlp_COURSE_Information,Box_NOT_CLOSABLE); /***** Title *****/ - CrsCfg_Title (PutLink); + HieCfg_Title (PutLink,HieLvl_CRS); /**************************** Left part ***********************************/ HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); @@ -190,21 +189,6 @@ void CrsCfg_PrintConfiguration (void) CrsCfg_Configuration (true); } -/*****************************************************************************/ -/******************** Show title in course configuration *********************/ -/*****************************************************************************/ - -static void CrsCfg_Title (bool PutLink) - { - HieCfg_Title (PutLink, - HieLvl_DEG, // Logo scope - Gbl.Hierarchy.Node[HieLvl_DEG].Cod, // Logo code - Gbl.Hierarchy.Node[HieLvl_DEG].ShrtName, // Logo short name - Gbl.Hierarchy.Node[HieLvl_DEG].FullName, // Logo full name - Gbl.Hierarchy.Node[HieLvl_DEG].WWW, // Logo www - Gbl.Hierarchy.Node[HieLvl_CRS].FullName); // Text full name - } - /*****************************************************************************/ /******************** Show degree in course configuration ********************/ /*****************************************************************************/ diff --git a/swad_degree_config.c b/swad_degree_config.c index 12055ea3..16fd1cd7 100644 --- a/swad_degree_config.c +++ b/swad_degree_config.c @@ -59,7 +59,6 @@ extern struct Globals Gbl; static void DegCfg_Configuration (bool PrintView); static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args); -static void DegCfg_Title (bool PutLink); static void DegCfg_Center (bool PrintView,bool PutForm); static void DegCfg_FullName (bool PutForm); static void DegCfg_ShrtName (bool PutForm); @@ -122,7 +121,7 @@ static void DegCfg_Configuration (bool PrintView) Hlp_DEGREE_Information,Box_NOT_CLOSABLE); /***** Title *****/ - DegCfg_Title (PutLink); + HieCfg_Title (PutLink,HieLvl_DEG); /**************************** Left part ***********************************/ HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); @@ -185,21 +184,6 @@ static void DegCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args) Lgo_PutIconToChangeLogo (HieLvl_DEG); } -/*****************************************************************************/ -/******************** Show title in degree configuration *********************/ -/*****************************************************************************/ - -static void DegCfg_Title (bool PutLink) - { - HieCfg_Title (PutLink, - HieLvl_DEG, // Logo scope - Gbl.Hierarchy.Node[HieLvl_DEG].Cod, // Logo code - Gbl.Hierarchy.Node[HieLvl_DEG].ShrtName, // Logo short name - Gbl.Hierarchy.Node[HieLvl_DEG].FullName, // Logo full name - Gbl.Hierarchy.Node[HieLvl_DEG].WWW, // Logo www - Gbl.Hierarchy.Node[HieLvl_DEG].FullName); // Text full name - } - /*****************************************************************************/ /******************** Show center in degree configuration ********************/ /*****************************************************************************/ diff --git a/swad_hierarchy_config.c b/swad_hierarchy_config.c index 11961342..6f5f75e5 100644 --- a/swad_hierarchy_config.c +++ b/swad_hierarchy_config.c @@ -48,14 +48,11 @@ extern struct Globals Gbl; /************************ Show title in configuration ************************/ /*****************************************************************************/ -void HieCfg_Title (bool PutLink, - HieLvl_Level_t LogoScope, - long LogoCod, - char LogoShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1], - char LogoFullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1], - char LogoWWW[Cns_MAX_BYTES_WWW + 1], - char TextFullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1]) +void HieCfg_Title (bool PutLink,HieLvl_Level_t Level) { + HieLvl_Level_t LevelLogo = (Level == HieLvl_CRS) ? HieLvl_DEG : + Level; + /***** Begin container *****/ HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG FRAME_TITLE_%s\"", The_GetSuffix ()); @@ -64,15 +61,17 @@ void HieCfg_Title (bool PutLink, if (PutLink) HTM_A_Begin ("href=\"%s\" target=\"_blank\" title=\"%s\"" " class=\"FRAME_TITLE_BIG FRAME_TITLE_%s\"", - LogoWWW,LogoFullName,The_GetSuffix ()); + Gbl.Hierarchy.Node[LevelLogo].WWW, + Gbl.Hierarchy.Node[LevelLogo].FullName, + The_GetSuffix ()); /* Logo and name */ - Lgo_DrawLogo (LogoScope, - LogoCod, - LogoShrtName, + Lgo_DrawLogo (LevelLogo, + Gbl.Hierarchy.Node[LevelLogo].Cod, + Gbl.Hierarchy.Node[LevelLogo].ShrtName, 64,NULL); HTM_BR (); - HTM_Txt (TextFullName); + HTM_Txt (Gbl.Hierarchy.Node[Level].FullName); /* End link */ if (PutLink) diff --git a/swad_hierarchy_config.h b/swad_hierarchy_config.h index 94202d77..4b9da935 100644 --- a/swad_hierarchy_config.h +++ b/swad_hierarchy_config.h @@ -33,13 +33,7 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void HieCfg_Title (bool PutLink, - HieLvl_Level_t LogoScope, - long LogoCod, - char LogoShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1], - char LogoFullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1], - char LogoWWW[Cns_MAX_BYTES_WWW + 1], - char TextFullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1]); +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, diff --git a/swad_institution_config.c b/swad_institution_config.c index 4f2d1e3c..806ed60e 100644 --- a/swad_institution_config.c +++ b/swad_institution_config.c @@ -64,7 +64,6 @@ extern struct Globals Gbl; static void InsCfg_Configuration (bool PrintView); static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args); -static void InsCfg_Title (bool PutLink); static void InsCfg_Map (void); static void InsCfg_Country (bool PrintView,bool PutForm); static void InsCfg_FullName (bool PutForm); @@ -134,7 +133,7 @@ static void InsCfg_Configuration (bool PrintView) /***** Title *****/ - InsCfg_Title (PutLink); + HieCfg_Title (PutLink,HieLvl_INS); /**************************** Left part ***********************************/ HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); @@ -222,21 +221,6 @@ static void InsCfg_PutIconsToPrintAndUpload (__attribute__((unused)) void *Args) Plc_PutIconToViewPlaces (); } -/*****************************************************************************/ -/***************** Show title in institution configuration *******************/ -/*****************************************************************************/ - -static void InsCfg_Title (bool PutLink) - { - HieCfg_Title (PutLink, - HieLvl_INS, // Logo scope - Gbl.Hierarchy.Node[HieLvl_INS].Cod, // Logo code - Gbl.Hierarchy.Node[HieLvl_INS].ShrtName, // Logo short name - Gbl.Hierarchy.Node[HieLvl_INS].FullName, // Logo full name - Gbl.Hierarchy.Node[HieLvl_INS].WWW, // Logo www - Gbl.Hierarchy.Node[HieLvl_INS].FullName); // Text full name - } - /*****************************************************************************/ /*************************** Draw institution map ****************************/ /*****************************************************************************/