diff --git a/swad_agenda.c b/swad_agenda.c index 1120e110..7e1b6efb 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -119,6 +119,8 @@ static void Agd_GetventDataByCod (struct Agd_Event *AgdEvent); static void Agd_FreeListEvents (struct Agd_Agenda *Agenda); +static void Agd_HideUnhideEvent (HidVis_HiddenOrVisible_t HiddenOrVisible); + /*****************************************************************************/ /*************************** Reset agenda context ****************************/ /*****************************************************************************/ @@ -1196,39 +1198,20 @@ void Agd_RemoveEvent (void) } /*****************************************************************************/ -/********************************* Hide event ********************************/ +/**************************** Hide/unhide event ******************************/ /*****************************************************************************/ void Agd_HideEvent (void) { - struct Agd_Agenda Agenda; - struct Agd_Event AgdEvent; - - /***** Reset agenda context *****/ - Agd_ResetAgenda (&Agenda); - - /***** Get parameters *****/ - Agd_GetPars (&Agenda,Agd_MY_AGENDA); - - /***** Get event code *****/ - AgdEvent.AgdCod = ParCod_GetAndCheckPar (ParCod_Agd); - - /***** Get data of the event from database *****/ - AgdEvent.UsrCod = Gbl.Usrs.Me.UsrDat.UsrCod; - Agd_GetventDataByCod (&AgdEvent); - - /***** Hide event *****/ - Agd_DB_HideOrUnhideEvent (AgdEvent.AgdCod,AgdEvent.UsrCod,true); - - /***** Show events again *****/ - Agd_ShowMyAgenda (&Agenda); + Agd_HideUnhideEvent (HidVis_HIDDEN); } -/*****************************************************************************/ -/****************************** Unhide event *********************************/ -/*****************************************************************************/ - void Agd_UnhideEvent (void) + { + Agd_HideUnhideEvent (HidVis_VISIBLE); + } + +static void Agd_HideUnhideEvent (HidVis_HiddenOrVisible_t HiddenOrVisible) { struct Agd_Agenda Agenda; struct Agd_Event AgdEvent; @@ -1247,7 +1230,7 @@ void Agd_UnhideEvent (void) Agd_GetventDataByCod (&AgdEvent); /***** Unhide event *****/ - Agd_DB_HideOrUnhideEvent (AgdEvent.AgdCod,AgdEvent.UsrCod,false); + Agd_DB_HideOrUnhideEvent (AgdEvent.AgdCod,AgdEvent.UsrCod,HiddenOrVisible); /***** Show events again *****/ Agd_ShowMyAgenda (&Agenda); diff --git a/swad_agenda_database.c b/swad_agenda_database.c index b5f68879..58f2e1c6 100644 --- a/swad_agenda_database.c +++ b/swad_agenda_database.c @@ -275,15 +275,16 @@ void Agd_DB_UpdateEvent (const struct Agd_Event *AgdEvent,const char *Txt) /*************************** Hide/unhide an event ****************************/ /*****************************************************************************/ -void Agd_DB_HideOrUnhideEvent (long AgdCod,long UsrCod,bool Hide) +void Agd_DB_HideOrUnhideEvent (long AgdCod,long UsrCod, + HidVis_HiddenOrVisible_t HiddenOrVisible) { DB_QueryUPDATE ("can not hide/unhide event", "UPDATE agd_agendas" " SET Hidden='%c'" " WHERE AgdCod=%ld" " AND UsrCod=%ld", - Hide ? 'Y' : - 'N', + HiddenOrVisible == HidVis_HIDDEN ? 'Y' : + 'N', AgdCod, UsrCod); } diff --git a/swad_agenda_database.h b/swad_agenda_database.h index 0c8878bd..a753f137 100644 --- a/swad_agenda_database.h +++ b/swad_agenda_database.h @@ -48,7 +48,8 @@ void Agd_DB_RemoveEvent (const struct Agd_Event *AgdEvent); long Agd_DB_CreateEvent (const struct Agd_Event *AgdEvent,const char *Txt); void Agd_DB_UpdateEvent (const struct Agd_Event *AgdEvent,const char *Txt); -void Agd_DB_HideOrUnhideEvent (long AgdCod,long UsrCod,bool Hide); +void Agd_DB_HideOrUnhideEvent (long AgdCod,long UsrCod, + HidVis_HiddenOrVisible_t HiddenOrVisible); void Agd_DB_MakeEventPublic (const struct Agd_Event *AgdEvent); void Agd_DB_MakeEventPrivate (const struct Agd_Event *AgdEvent); diff --git a/swad_changelog.h b/swad_changelog.h index 891182b2..2491fec9 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.6 (2023-09-09)" +#define Log_PLATFORM_VERSION "SWAD 22.120.7 (2023-09-09)" #define CSS_FILE "swad22.120.4.css" #define JS_FILE "swad22.49.js" /* + Version 22.120.7: Sep 09, 2023 Code refactoring related to hidden-visible in agendas. (337619 lines) Version 22.120.6: Sep 09, 2023 Fixed bug hiding documents. Reported by Francisco José Pelayo Valle. (337628 lines) Version 22.120.5: Sep 07, 2023 Fixed bugs in database queries related to buildings. (337625 lines) Version 22.120.4: Jul 11, 2023 Fixed bug in CSS related to global connected. (337624 lines)