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

This commit is contained in:
acanas 2023-09-25 18:31:14 +02:00
parent 3c7f144b06
commit a165e39297
3 changed files with 39 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
css/swad23.16.1.css
View File

@ -2687,13 +2687,13 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.LST_REC_PINK {color:#246600; font-size:11pt; white-space:nowrap;} .LST_REC_PINK {color:#246600; font-size:11pt; white-space:nowrap;}
.LST_REC_DARK {color:#80c040; font-size:11pt; white-space:nowrap;} .LST_REC_DARK {color:#80c040; font-size:11pt; white-space:nowrap;}
.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} .LST_REC_HID_WHITE,
.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} .LST_REC_HID_GREY,
.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} .LST_REC_HID_PURPLE,
.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} .LST_REC_HID_BLUE,
.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} .LST_REC_HID_YELLOW,
.LST_REC_HID {color:#92b380; font-size:11pt; white-space:nowrap;} .LST_REC_HID_PINK {color:#92b380; font-size:11pt; white-space:nowrap;}
.LST_REC_HID {color:#406020; font-size:11pt; white-space:nowrap;} .LST_REC_HID_DARK {color:#406020; font-size:11pt; white-space:nowrap;}
.LST_EDIT {width:250px; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid;} .LST_EDIT {width:250px; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid;}
.LST_EDIT_ROWS {width:30px; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid;} .LST_EDIT_ROWS {width:30px; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid;}

5
swad_changelog.h
View File

@ -632,11 +632,12 @@ 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í? 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') "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/ */
#define Log_PLATFORM_VERSION "SWAD 23.16.1 (2023-09-25)" #define Log_PLATFORM_VERSION "SWAD 23.17 (2023-09-25)"
#define CSS_FILE "swad23.16.1.css" #define CSS_FILE "swad23.16.1.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
Version 23.16.1: Sep 25, 2023 Fixed CSS issue in timeline. (336778 lines) Version 23.17: Sep 22, 2023 Code refactoring in hierarchy. (336655 lines)
Version 23.16.1: Sep 25, 2023 Fixed CSS issues. (336778 lines)
Version 23.16: Sep 22, 2023 Code refactoring in hierarchy and cache. (336775 lines) Version 23.16: Sep 22, 2023 Code refactoring in hierarchy and cache. (336775 lines)
Version 23.15: Sep 22, 2023 Code refactoring in hierarchy and cache. (336896 lines) Version 23.15: Sep 22, 2023 Code refactoring in hierarchy and cache. (336896 lines)
Version 23.14.2: Sep 21, 2023 Code refactoring in cache. (336925 lines) Version 23.14.2: Sep 21, 2023 Code refactoring in cache. (336925 lines)

194
swad_hierarchy.c
View File

@ -80,10 +80,7 @@ static Hie_StatusTxt_t Hie_GetStatusTxtFromStatusBits (Hie_Status_t Status);
static Hie_Status_t Hie_GetStatusBitsFromStatusTxt (Hie_StatusTxt_t StatusTxt); static Hie_Status_t Hie_GetStatusBitsFromStatusTxt (Hie_StatusTxt_t StatusTxt);
static void Hie_WriteHeadHierarchy (void); static void Hie_WriteHeadHierarchy (void);
static void Hie_GetAndShowHierarchyWithInss (void); static void Hie_GetAndShowHierarchyWith (Hie_Level_t LevelGrandChildren);
static void Hie_GetAndShowHierarchyWithCtrs (void);
static void Hie_GetAndShowHierarchyWithDegs (void);
static void Hie_GetAndShowHierarchyWithCrss (void);
static void Hie_GetAndShowHierarchyWithUsrs (Rol_Role_t Role); static void Hie_GetAndShowHierarchyWithUsrs (Rol_Role_t Role);
static void Hie_GetAndShowHierarchyTotal (void); static void Hie_GetAndShowHierarchyTotal (void);
static void Hie_ShowHierarchyRow (const char *Text1,const char *Text2, static void Hie_ShowHierarchyRow (const char *Text1,const char *Text2,
@ -990,10 +987,10 @@ void Hie_GetAndShowHierarchyStats (void)
Hlp_ANALYTICS_Figures_hierarchy,Box_NOT_CLOSABLE,2); Hlp_ANALYTICS_Figures_hierarchy,Box_NOT_CLOSABLE,2);
Hie_WriteHeadHierarchy (); Hie_WriteHeadHierarchy ();
Hie_GetAndShowHierarchyWithInss (); Hie_GetAndShowHierarchyWith (Hie_INS);
Hie_GetAndShowHierarchyWithCtrs (); Hie_GetAndShowHierarchyWith (Hie_CTR);
Hie_GetAndShowHierarchyWithDegs (); Hie_GetAndShowHierarchyWith (Hie_DEG);
Hie_GetAndShowHierarchyWithCrss (); Hie_GetAndShowHierarchyWith (Hie_CRS);
for (Role = Rol_TCH; for (Role = Rol_TCH;
Role >= Rol_STD; Role >= Rol_STD;
Role--) Role--)
@ -1059,177 +1056,44 @@ static void Hie_WriteHeadHierarchy (void)
} }
/*****************************************************************************/ /*****************************************************************************/
/****** Get and show number of elements in hierarchy with institutions *******/ /********* Get and show number of elements in hierarchy with nodes ***********/
/*****************************************************************************/ /*****************************************************************************/
static void Hie_GetAndShowHierarchyWithInss (void) static void Hie_GetAndShowHierarchyWith (Hie_Level_t LevelGrandChildren)
{ {
extern const char *Txt_With_; extern const char *Txt_With_;
extern const char *Txt_institutions; extern const char *Txt_institutions;
int NumNodes[Hie_NUM_LEVELS] =
{
[Hie_CTY] = 1, // < 0 ==> do not show number
[Hie_INS] = -1, // < 0 ==> do not show number
[Hie_CTR] = -1, // < 0 ==> do not show number
[Hie_DEG] = -1, // < 0 ==> do not show number
[Hie_CRS] = -1, // < 0 ==> do not show number
};
/***** Get number of elements with institutions *****/
switch (Gbl.Scope.Current)
{
case Hie_SYS:
NumNodes[Hie_CTY] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTY,Hie_SYS,Hie_INS);
break;
case Hie_CTY:
case Hie_INS:
case Hie_CTR:
case Hie_DEG:
case Hie_CRS:
break;
default:
Err_WrongHierarchyLevelExit ();
break;
}
/***** Write number of elements with institutions *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_institutions,"DAT",NumNodes);
}
/*****************************************************************************/
/******** Get and show number of elements in hierarchy with centers **********/
/*****************************************************************************/
static void Hie_GetAndShowHierarchyWithCtrs (void)
{
extern const char *Txt_With_;
extern const char *Txt_centers; extern const char *Txt_centers;
int NumNodes[Hie_NUM_LEVELS] =
{
[Hie_CTY] = 1,
[Hie_INS] = 1,
[Hie_CTR] = -1, // < 0 ==> do not show number
[Hie_DEG] = -1, // < 0 ==> do not show number
[Hie_CRS] = -1, // < 0 ==> do not show number
};
/***** Get number of elements with centers *****/
switch (Gbl.Scope.Current)
{
case Hie_SYS:
NumNodes[Hie_CTY] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTY,Hie_SYS,Hie_CTR);
NumNodes[Hie_INS] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_INS,Hie_SYS,Hie_CTR);
break;
case Hie_CTY:
NumNodes[Hie_INS] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_INS,Hie_CTY,Hie_CTR);
break;
case Hie_INS:
case Hie_CTR:
case Hie_DEG:
case Hie_CRS:
break;
default:
Err_WrongHierarchyLevelExit ();
break;
}
/***** Write number of elements with centers *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_centers,"DAT",NumNodes);
}
/*****************************************************************************/
/******** Get and show number of elements in hierarchy with degrees **********/
/*****************************************************************************/
static void Hie_GetAndShowHierarchyWithDegs (void)
{
extern const char *Txt_With_;
extern const char *Txt_degrees; extern const char *Txt_degrees;
int NumNodes[Hie_NUM_LEVELS] =
{
[Hie_CTY] = 1,
[Hie_INS] = 1,
[Hie_CTR] = 1,
[Hie_DEG] = -1, // < 0 ==> do not show number
[Hie_CRS] = -1, // < 0 ==> do not show number
};
/***** Get number of elements with degrees *****/
switch (Gbl.Scope.Current)
{
case Hie_SYS:
NumNodes[Hie_CTY] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTY,Hie_SYS,Hie_DEG);
NumNodes[Hie_INS] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_INS,Hie_SYS,Hie_DEG);
NumNodes[Hie_CTR] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTR,Hie_SYS,Hie_DEG);
break;
case Hie_CTY:
NumNodes[Hie_INS] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_INS,Hie_CTY,Hie_DEG);
NumNodes[Hie_CTR] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTR,Hie_CTY,Hie_DEG);
break;
case Hie_INS:
NumNodes[Hie_CTR] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTR,Hie_INS,Hie_DEG);
break;
case Hie_CTR:
case Hie_DEG:
case Hie_CRS:
break;
default:
Err_WrongHierarchyLevelExit ();
break;
}
/***** Write number of elements with degrees *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_degrees,"DAT",NumNodes);
}
/*****************************************************************************/
/******** Get and show number of elements in hierarchy with courses **********/
/*****************************************************************************/
static void Hie_GetAndShowHierarchyWithCrss (void)
{
extern const char *Txt_With_;
extern const char *Txt_courses; extern const char *Txt_courses;
int NumNodes[Hie_NUM_LEVELS] = static const char **Txt[Hie_NUM_LEVELS] =
{ {
[Hie_CTY] = 1, [Hie_INS] = &Txt_institutions, // Number of ... with institutions
[Hie_INS] = 1, [Hie_CTR] = &Txt_centers, // Number of ... with centers
[Hie_CTR] = 1, [Hie_DEG] = &Txt_degrees, // Number of ... with degrees
[Hie_DEG] = 1, [Hie_CRS] = &Txt_courses, // Number of ... with courses
[Hie_CRS] = -1, // < 0 ==> do not show number
}; };
int NumNodes[Hie_NUM_LEVELS];
Hie_Level_t LevelChildren;
/***** Get number of elements with courses *****/ /***** Get number of elements with courses *****/
switch (Gbl.Scope.Current) for (LevelChildren = Hie_CTY;
{ LevelChildren <= Hie_CRS;
case Hie_SYS: LevelChildren++)
NumNodes[Hie_CTY] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTY,Hie_SYS,Hie_CRS); if (LevelChildren < LevelGrandChildren)
NumNodes[Hie_INS] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_INS,Hie_SYS,Hie_CRS); {
NumNodes[Hie_CTR] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTR,Hie_SYS,Hie_CRS); if (LevelChildren <= Gbl.Scope.Current)
NumNodes[Hie_DEG] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_DEG,Hie_SYS,Hie_CRS); NumNodes[LevelChildren] = 1;
break; else // Level >= Gbl.Scope.Curremt + 1
case Hie_CTY: NumNodes[LevelChildren] = (int) Hie_GetCachedNumNodesInHieLvlWith (LevelChildren, // Child
NumNodes[Hie_INS] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_INS,Hie_CTY,Hie_CRS); Gbl.Scope.Current, // Parent
NumNodes[Hie_CTR] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTR,Hie_CTY,Hie_CRS); LevelGrandChildren); // Grand child
NumNodes[Hie_DEG] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_DEG,Hie_CTY,Hie_CRS); }
break; else // Level >= LevelGrandChildren
case Hie_INS: NumNodes[LevelChildren] = -1;
NumNodes[Hie_CTR] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_CTR,Hie_INS,Hie_CRS);
NumNodes[Hie_DEG] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_DEG,Hie_INS,Hie_CRS);
break;
case Hie_CTR:
NumNodes[Hie_DEG] = (int) Hie_GetCachedNumNodesInHieLvlWith (Hie_DEG,Hie_CTR,Hie_CRS);
break;
case Hie_DEG:
case Hie_CRS:
break;
default:
Err_WrongHierarchyLevelExit ();
break;
}
/***** Write number of elements with courses *****/ /***** Write number of elements with courses *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_courses,"DAT",NumNodes); Hie_ShowHierarchyRow (Txt_With_,*Txt[LevelGrandChildren],"DAT",NumNodes);
} }
/*****************************************************************************/ /*****************************************************************************/