From ee1a516acd699b5923a8e3e3708be637c9bcc689 Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 10 Sep 2023 14:49:01 +0200 Subject: [PATCH] Version 22.120.13:Sep 10, 2023 Code refactoring related to hidden-visible in program items. --- swad_changelog.h | 5 +++-- swad_program.c | 10 +++++----- swad_program_database.c | 9 +++++---- swad_program_database.h | 3 ++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e42adaea..f868a63e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,11 +629,12 @@ 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.12 (2023-09-10)" +#define Log_PLATFORM_VERSION "SWAD 22.120.13 (2023-09-10)" #define CSS_FILE "swad22.120.4.css" #define JS_FILE "swad22.49.js" /* - Version 22.120.12:Sep 10, 2023 Code refactoring related to hidden-visible in exam sessions. (337584 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) Version 22.120.10:Sep 09, 2023 Code refactoring related to hidden-visible in exams. (337604 lines) Version 22.120.9: Sep 09, 2023 Code refactoring related to hidden-visible in attendance. (337607 lines) diff --git a/swad_program.c b/swad_program.c index 2aa2a462..c8d2bbcf 100644 --- a/swad_program.c +++ b/swad_program.c @@ -165,7 +165,7 @@ static void Prg_GetItemDataFromRow (MYSQL_RES **mysql_res, struct Prg_Item *Item, unsigned NumRows); -static void Prg_HideOrUnhideItem (bool Hide); +static void Prg_HideOrUnhideItem (HidVis_HiddenOrVisible_t HiddenOrVisible); static void Prg_MoveUpDownItem (Prg_MoveUpDown_t UpDown); static bool Prg_ExchangeItemRanges (int NumItemTop,int NumItemBottom); @@ -1453,15 +1453,15 @@ void Prg_RemoveItem (void) void Prg_HideItem (void) { - Prg_HideOrUnhideItem (true); + Prg_HideOrUnhideItem (HidVis_HIDDEN); } void Prg_UnhideItem (void) { - Prg_HideOrUnhideItem (false); + Prg_HideOrUnhideItem (HidVis_VISIBLE); } -static void Prg_HideOrUnhideItem (bool Hide) +static void Prg_HideOrUnhideItem (HidVis_HiddenOrVisible_t HiddenOrVisible) { struct Prg_Item Item; @@ -1474,7 +1474,7 @@ static void Prg_HideOrUnhideItem (bool Hide) Err_WrongItemExit (); /***** Hide/unhide program item *****/ - Prg_DB_HideOrUnhideItem (Item.Hierarchy.ItmCod,Hide); + Prg_DB_HideOrUnhideItem (Item.Hierarchy.ItmCod,HiddenOrVisible); /***** Show program items highlighting subtree *****/ Prg_ShowAllItems (Prg_EDIT_ITEMS,Item.Hierarchy.ItmCod,-1L); diff --git a/swad_program_database.c b/swad_program_database.c index 22a32e7b..495778e3 100644 --- a/swad_program_database.c +++ b/swad_program_database.c @@ -85,18 +85,19 @@ void Prg_DB_UpdateItem (const struct Prg_Item *Item,const char *Txt) } /*****************************************************************************/ -/************************* Hide/unhide a program item *************************/ +/************************* Hide/unhide a program item ************************/ /*****************************************************************************/ -void Prg_DB_HideOrUnhideItem (long ItmCod,bool Hide) +void Prg_DB_HideOrUnhideItem (long ItmCod, + HidVis_HiddenOrVisible_t HiddenOrVisible) { DB_QueryUPDATE ("can not hide/unhide program item", "UPDATE prg_items" " SET Hidden='%c'" " WHERE ItmCod=%ld" " AND CrsCod=%ld", // Extra check - Hide ? 'Y' : - 'N', + HiddenOrVisible == HidVis_HIDDEN ? 'Y' : + 'N', ItmCod, Gbl.Hierarchy.Crs.CrsCod); } diff --git a/swad_program_database.h b/swad_program_database.h index 20185c9b..40e0b236 100644 --- a/swad_program_database.h +++ b/swad_program_database.h @@ -38,7 +38,8 @@ //--------------------------------- Items ------------------------------------- long Prg_DB_InsertItem (const struct Prg_Item *Item,const char *Txt); void Prg_DB_UpdateItem (const struct Prg_Item *Item,const char *Txt); -void Prg_DB_HideOrUnhideItem (long ItmCod,bool Hide); +void Prg_DB_HideOrUnhideItem (long ItmCod, + HidVis_HiddenOrVisible_t HiddenOrVisible); void Prg_DB_UpdateIndexRange (long Diff,long Begin,long End); void Prg_DB_LockTableItems (void); void Prg_DB_MoveDownItems (unsigned Index);