From 4feb675e27351b88d5da839f61c25f3ae2ba851d Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 10 Sep 2023 14:54:42 +0200 Subject: [PATCH] Version 22.120.14:Sep 10, 2023 Code refactoring related to hidden-visible in program resources. --- swad_changelog.h | 3 ++- swad_program_database.c | 7 ++++--- swad_program_database.h | 3 ++- swad_program_resource.c | 10 +++++----- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index f868a63e..cea6291b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.120.13 (2023-09-10)" +#define Log_PLATFORM_VERSION "SWAD 22.120.14 (2023-09-10)" #define CSS_FILE "swad22.120.4.css" #define JS_FILE "swad22.49.js" /* + Version 22.120.14:Sep 10, 2023 Code refactoring related to hidden-visible in program resources. (337590 lines) Version 22.120.13:Sep 10, 2023 Code refactoring related to hidden-visible in program items. (337587 lines) Version 22.120.12:Sep 10, 2023 Code refactoring related to hidden-visible in games. (337584 lines) Version 22.120.11:Sep 09, 2023 Code refactoring related to hidden-visible in exam sessions. (337594 lines) diff --git a/swad_program_database.c b/swad_program_database.c index 495778e3..e4a57be9 100644 --- a/swad_program_database.c +++ b/swad_program_database.c @@ -591,14 +591,15 @@ void Prg_DB_RemoveResource (const struct Prg_Item *Item) /************************ Hide/unhide an item resource ***********************/ /*****************************************************************************/ -void Prg_DB_HideOrUnhideResource (long RscCod,bool Hide) +void Prg_DB_HideOrUnhideResource (long RscCod, + HidVis_HiddenOrVisible_t HiddenOrVisible) { DB_QueryUPDATE ("can not hide/unhide item resource", "UPDATE prg_resources" " SET Hidden='%c'" " WHERE RscCod=%ld", - Hide ? 'Y' : - 'N', + HiddenOrVisible == HidVis_HIDDEN ? 'Y' : + 'N', RscCod); } diff --git a/swad_program_database.h b/swad_program_database.h index 40e0b236..547255f2 100644 --- a/swad_program_database.h +++ b/swad_program_database.h @@ -72,7 +72,8 @@ long Prg_DB_GetRscCodFromRscInd (long ItmCod,unsigned RscInd); void Prg_DB_RemoveResource (const struct Prg_Item *Item); -void Prg_DB_HideOrUnhideResource (long RscCod,bool Hide); +void Prg_DB_HideOrUnhideResource (long RscCod, + HidVis_HiddenOrVisible_t HiddenOrVisible); void Prg_DB_LockTableResources (void); void Prg_DB_UpdateRscInd (long RscCod,int RscInd); diff --git a/swad_program_resource.c b/swad_program_resource.c index 19babfdb..ffd6fabe 100644 --- a/swad_program_resource.c +++ b/swad_program_resource.c @@ -86,7 +86,7 @@ static void PrgRsc_PutFormsToRemEditOneResource (struct Prg_Item *Item, unsigned NumRsc, unsigned NumResources); static void PrgRsc_PutParRscCod (void *RscCod); -static void PrgRsc_HideOrUnhideResource (bool Hide); +static void PrgRsc_HideOrUnhideResource (HidVis_HiddenOrVisible_t HiddenOrVisible); static void PrgRsc_MoveUpDownResource (PrgRsc_MoveUpDown_t UpDown); static bool PrgRsc_ExchangeResources (const struct Prg_ResourceHierarchy *Rsc1, @@ -703,15 +703,15 @@ void PrgRsc_RemoveResource (void) void PrgRsc_HideResource (void) { - PrgRsc_HideOrUnhideResource (true); + PrgRsc_HideOrUnhideResource (HidVis_HIDDEN); } void PrgRsc_UnhideResource (void) { - PrgRsc_HideOrUnhideResource (false); + PrgRsc_HideOrUnhideResource (HidVis_VISIBLE); } -static void PrgRsc_HideOrUnhideResource (bool Hide) +static void PrgRsc_HideOrUnhideResource (HidVis_HiddenOrVisible_t HiddenOrVisible) { struct Prg_Item Item; @@ -724,7 +724,7 @@ static void PrgRsc_HideOrUnhideResource (bool Hide) Err_WrongResourceExit (); /***** Hide/unhide item resource *****/ - Prg_DB_HideOrUnhideResource (Item.Resource.Hierarchy.RscCod,Hide); + Prg_DB_HideOrUnhideResource (Item.Resource.Hierarchy.RscCod,HiddenOrVisible); /***** Show current program items, if any *****/ Prg_ShowAllItems (Prg_EDIT_RESOURCES,Item.Hierarchy.ItmCod,Item.Resource.Hierarchy.RscCod);