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 22.120.7: Sep 09, 2023 Code refactoring related to hidden-visible in agendas.

This commit is contained in:
acanas 2023-09-09 13:04:11 +02:00
parent b7e888addf
commit 2d3a7590f2
4 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
swad_agenda.c
View File

@ -119,6 +119,8 @@ static void Agd_GetventDataByCod (struct Agd_Event *AgdEvent);
static void Agd_FreeListEvents (struct Agd_Agenda *Agenda); static void Agd_FreeListEvents (struct Agd_Agenda *Agenda);
static void Agd_HideUnhideEvent (HidVis_HiddenOrVisible_t HiddenOrVisible);
/*****************************************************************************/ /*****************************************************************************/
/*************************** Reset agenda context ****************************/ /*************************** Reset agenda context ****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -1196,39 +1198,20 @@ void Agd_RemoveEvent (void)
} }
/*****************************************************************************/ /*****************************************************************************/
/********************************* Hide event ********************************/ /**************************** Hide/unhide event ******************************/
/*****************************************************************************/ /*****************************************************************************/
void Agd_HideEvent (void) void Agd_HideEvent (void)
{ {
struct Agd_Agenda Agenda; Agd_HideUnhideEvent (HidVis_HIDDEN);
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);
} }
/*****************************************************************************/
/****************************** Unhide event *********************************/
/*****************************************************************************/
void Agd_UnhideEvent (void) void Agd_UnhideEvent (void)
{
Agd_HideUnhideEvent (HidVis_VISIBLE);
}
static void Agd_HideUnhideEvent (HidVis_HiddenOrVisible_t HiddenOrVisible)
{ {
struct Agd_Agenda Agenda; struct Agd_Agenda Agenda;
struct Agd_Event AgdEvent; struct Agd_Event AgdEvent;
@ -1247,7 +1230,7 @@ void Agd_UnhideEvent (void)
Agd_GetventDataByCod (&AgdEvent); Agd_GetventDataByCod (&AgdEvent);
/***** Unhide event *****/ /***** Unhide event *****/
Agd_DB_HideOrUnhideEvent (AgdEvent.AgdCod,AgdEvent.UsrCod,false); Agd_DB_HideOrUnhideEvent (AgdEvent.AgdCod,AgdEvent.UsrCod,HiddenOrVisible);
/***** Show events again *****/ /***** Show events again *****/
Agd_ShowMyAgenda (&Agenda); Agd_ShowMyAgenda (&Agenda);

7
swad_agenda_database.c
View File

@ -275,15 +275,16 @@ void Agd_DB_UpdateEvent (const struct Agd_Event *AgdEvent,const char *Txt)
/*************************** Hide/unhide an event ****************************/ /*************************** 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", DB_QueryUPDATE ("can not hide/unhide event",
"UPDATE agd_agendas" "UPDATE agd_agendas"
" SET Hidden='%c'" " SET Hidden='%c'"
" WHERE AgdCod=%ld" " WHERE AgdCod=%ld"
" AND UsrCod=%ld", " AND UsrCod=%ld",
Hide ? 'Y' : HiddenOrVisible == HidVis_HIDDEN ? 'Y' :
'N', 'N',
AgdCod, AgdCod,
UsrCod); UsrCod);
} }

3
swad_agenda_database.h
View File

@ -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); 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_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_MakeEventPublic (const struct Agd_Event *AgdEvent);
void Agd_DB_MakeEventPrivate (const struct Agd_Event *AgdEvent); void Agd_DB_MakeEventPrivate (const struct Agd_Event *AgdEvent);

3
swad_changelog.h
View File

@ -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. 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 CSS_FILE "swad22.120.4.css"
#define JS_FILE "swad22.49.js" #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.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.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) Version 22.120.4: Jul 11, 2023 Fixed bug in CSS related to global connected. (337624 lines)