diff --git a/swad_action.c b/swad_action.c index a1d4f6715..ef53087dc 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1793,13 +1793,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgDptWWW */{ 691,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dpt_ChangeDptWWW ,Dpt_ContEditAfterChgDpt ,NULL}, /* ActEdiHld */{ 713,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hld_EditHolidays ,NULL}, - /* ActNewHld */{ 714,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RecFormNewHoliday1 ,Hld_RecFormNewHoliday2 ,NULL}, - /* ActRemHld */{ 716,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RemoveHoliday1 ,Hld_RemoveHoliday2 ,NULL}, - /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayPlace1 ,Hld_ChangeHolidayPlace2 ,NULL}, - /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayType1 ,Hld_ChangeHolidayType2 ,NULL}, - /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeStartDate1 ,Hld_ChangeDate2 ,NULL}, - /* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeEndDate1 ,Hld_ChangeDate2 ,NULL}, - /* ActRenHld */{ 766,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RenameHoliday1 ,Hld_RenameHoliday2 ,NULL}, + /* ActNewHld */{ 714,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RecFormNewHoliday ,Hld_ContEditAfterChgHld ,NULL}, + /* ActRemHld */{ 716,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RemoveHoliday ,Hld_ContEditAfterChgHld ,NULL}, + /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayPlace ,Hld_ContEditAfterChgHld ,NULL}, + /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayType ,Hld_ContEditAfterChgHld ,NULL}, + /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeStartDate ,Hld_ContEditAfterChgHld ,NULL}, + /* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeEndDate ,Hld_ContEditAfterChgHld ,NULL}, + /* ActRenHld */{ 766,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RenameHoliday ,Hld_ContEditAfterChgHld ,NULL}, // TabCtr ****************************************************************** // Actions in menu: diff --git a/swad_changelog.h b/swad_changelog.h index 700a9a09c..eb63de2a5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -464,10 +464,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.104 (2019-04-09)" +#define Log_PLATFORM_VERSION "SWAD 18.105 (2019-04-09)" #define CSS_FILE "swad18.92.css" #define JS_FILE "swad18.92.js" /* + Version 18.105: Apr 09, 2019 Code refactoring in edition of holidays. (242152 lines) Version 18.104: Apr 09, 2019 Code refactoring in edition of classrooms. (242151 lines) Version 18.103: Apr 09, 2019 Code refactoring in edition of places. (242091 lines) Version 18.102: Apr 08, 2019 Code refactoring in edition of departments. (242033 lines) diff --git a/swad_global.c b/swad_global.c index df9c11e30..f8efdcb6a 100644 --- a/swad_global.c +++ b/swad_global.c @@ -255,13 +255,6 @@ void Gbl_InitializeGlobals (void) Gbl.Hlds.Num = 0; Gbl.Hlds.Lst = NULL; Gbl.Hlds.SelectedOrder = Hld_DEFAULT_ORDER_TYPE; - Gbl.Hlds.EditingHld.HldCod = -1L; - Gbl.Hlds.EditingHld.PlcCod = -1L; - Gbl.Hlds.EditingHld.HldTyp = Hld_HOLIDAY; - Gbl.Hlds.EditingHld.StartDate.Year = Gbl.Hlds.EditingHld.EndDate.Year = Gbl.Now.Date.Year; - Gbl.Hlds.EditingHld.StartDate.Month = Gbl.Hlds.EditingHld.EndDate.Month = Gbl.Now.Date.Month; - Gbl.Hlds.EditingHld.StartDate.Day = Gbl.Hlds.EditingHld.EndDate.Day = Gbl.Now.Date.Day; - Gbl.Hlds.EditingHld.Name[0] = '\0'; Gbl.DegTypes.Num = 0; Gbl.DegTypes.Lst = NULL; diff --git a/swad_global.h b/swad_global.h index 31290b982..177ca1598 100644 --- a/swad_global.h +++ b/swad_global.h @@ -243,7 +243,6 @@ struct Globals unsigned Num; // Number of holidays struct Holiday *Lst; // List of holidays Hld_Order_t SelectedOrder; - struct Holiday EditingHld; } Hlds; struct { diff --git a/swad_holiday.c b/swad_holiday.c index 1a078c2fc..cc5cf5bd4 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -57,6 +57,8 @@ extern struct Globals Gbl; /***************************** Private variables *****************************/ /*****************************************************************************/ +static struct Holiday *Hld_EditingHld = NULL; // Static variable to keep the holiday being edited + /*****************************************************************************/ /***************************** Private prototypes ****************************/ /*****************************************************************************/ @@ -64,6 +66,8 @@ extern struct Globals Gbl; static void Hld_GetParamHldOrder (void); static void Hld_PutIconsSeeHolidays (void); +static void Hld_EditHolidaysInternal (void); + static void Hld_GetDataOfHolidayByCod (struct Holiday *Hld); static Hld_HolidayType_t Hld_GetParamHldType (void); @@ -75,6 +79,9 @@ static void Hld_PutFormToCreateHoliday (void); static void Hld_PutHeadHolidays (void); static void Hld_CreateHoliday (struct Holiday *Hld); +static void Hld_EditingHolidayConstructor (void); +static void Hld_EditingHolidayDestructor (void); + /*****************************************************************************/ /*************************** List all the holidays ***************************/ /*****************************************************************************/ @@ -237,6 +244,18 @@ void Hld_PutIconToSeeHlds (void) /*****************************************************************************/ void Hld_EditHolidays (void) + { + /***** Holiday constructor *****/ + Hld_EditingHolidayConstructor (); + + /***** Edit holidays *****/ + Hld_EditHolidaysInternal (); + + /***** Holiday destructor *****/ + Hld_EditingHolidayDestructor (); + } + +static void Hld_EditHolidaysInternal (void) { /***** Get list of places *****/ Plc_GetListPlaces (); @@ -663,53 +682,46 @@ long Hld_GetParamHldCod (void) /******************************* Remove a holiday ****************************/ /*****************************************************************************/ -void Hld_RemoveHoliday1 (void) +void Hld_RemoveHoliday (void) { extern const char *Txt_Holiday_X_removed; - struct Holiday Hld; + + /***** Holiday constructor *****/ + Hld_EditingHolidayConstructor (); /***** Get holiday code *****/ - if ((Hld.HldCod = Hld_GetParamHldCod ()) == -1L) + if ((Hld_EditingHld->HldCod = Hld_GetParamHldCod ()) == -1L) Lay_ShowErrorAndExit ("Code of holiday is missing."); /***** Get data of the holiday from database *****/ - Hld_GetDataOfHolidayByCod (&Hld); + Hld_GetDataOfHolidayByCod (Hld_EditingHld); /***** Remove holiday *****/ DB_QueryDELETE ("can not remove a holiday", "DELETE FROM holidays WHERE HldCod=%ld", - Hld.HldCod); + Hld_EditingHld->HldCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, Txt_Holiday_X_removed, - Hld.Name); - } - -void Hld_RemoveHoliday2 (void) - { - /***** Show success message *****/ - Ale_ShowAlerts (NULL); - - /***** Show the form again *****/ - Hld_EditHolidays (); + Hld_EditingHld->Name); } /*****************************************************************************/ /************************* Change the place of a holiday *********************/ /*****************************************************************************/ -void Hld_ChangeHolidayPlace1 (void) +void Hld_ChangeHolidayPlace (void) { extern const char *Txt_The_place_of_the_holiday_X_has_changed_to_Y; - struct Holiday *Hld; struct Place NewPlace; - Hld = &Gbl.Hlds.EditingHld; + /***** Holiday constructor *****/ + Hld_EditingHolidayConstructor (); /***** Get parameters from form *****/ /* Get the code of the holiday */ - if ((Hld->HldCod = Hld_GetParamHldCod ()) == -1L) + if ((Hld_EditingHld->HldCod = Hld_GetParamHldCod ()) == -1L) Lay_ShowErrorAndExit ("Code of holiday is missing."); /* Get the new place for the holiday */ @@ -719,79 +731,61 @@ void Hld_ChangeHolidayPlace1 (void) Plc_GetDataOfPlaceByCod (&NewPlace); /***** Get from the database the data of the holiday *****/ - Hld_GetDataOfHolidayByCod (Hld); + Hld_GetDataOfHolidayByCod (Hld_EditingHld); /***** Update the place in database *****/ DB_QueryUPDATE ("can not update the place of a holiday", "UPDATE holidays SET PlcCod=%ld WHERE HldCod=%ld", - NewPlace.PlcCod,Hld->HldCod); - Hld->PlcCod = NewPlace.PlcCod; - Str_Copy (Hld->PlaceFullName,NewPlace.FullName, + NewPlace.PlcCod,Hld_EditingHld->HldCod); + Hld_EditingHld->PlcCod = NewPlace.PlcCod; + Str_Copy (Hld_EditingHld->PlaceFullName,NewPlace.FullName, Plc_MAX_BYTES_PLACE_FULL_NAME); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, Txt_The_place_of_the_holiday_X_has_changed_to_Y, - Hld->Name,NewPlace.FullName); - } - -void Hld_ChangeHolidayPlace2 (void) - { - /***** Show success message *****/ - Ale_ShowAlerts (NULL); - - /***** Show the form again *****/ - Hld_EditHolidays (); + Hld_EditingHld->Name,NewPlace.FullName); } /*****************************************************************************/ /************************* Change the type of a holiday **********************/ /*****************************************************************************/ -void Hld_ChangeHolidayType1 (void) +void Hld_ChangeHolidayType (void) { extern const char *Txt_The_type_of_the_holiday_X_has_changed; - struct Holiday *Hld; - Hld = &Gbl.Hlds.EditingHld; + /***** Holiday constructor *****/ + Hld_EditingHolidayConstructor (); /***** Get the code of the holiday *****/ - if ((Hld->HldCod = Hld_GetParamHldCod ()) == -1L) + if ((Hld_EditingHld->HldCod = Hld_GetParamHldCod ()) == -1L) Lay_ShowErrorAndExit ("Code of holiday is missing."); /***** Get from the database the data of the holiday *****/ - Hld_GetDataOfHolidayByCod (Hld); + Hld_GetDataOfHolidayByCod (Hld_EditingHld); /***** Get the new type for the holiday *****/ - Hld->HldTyp = Hld_GetParamHldType (); + Hld_EditingHld->HldTyp = Hld_GetParamHldType (); /***** Update holiday/no school period in database *****/ - Dat_AssignDate (&Hld->EndDate,&Hld->StartDate); + Dat_AssignDate (&Hld_EditingHld->EndDate,&Hld_EditingHld->StartDate); DB_QueryUPDATE ("can not update the type of a holiday", "UPDATE holidays SET HldTyp=%u,EndDate=StartDate" " WHERE HldCod=%ld", - (unsigned) Hld->HldTyp,Hld->HldCod); + (unsigned) Hld_EditingHld->HldTyp,Hld_EditingHld->HldCod); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, Txt_The_type_of_the_holiday_X_has_changed, - Hld->Name); - } - -void Hld_ChangeHolidayType2 (void) - { - /***** Show success message *****/ - Ale_ShowAlerts (NULL); - - /***** Show the form again *****/ - Hld_EditHolidays (); + Hld_EditingHld->Name); } /*****************************************************************************/ /*** Change the date of a holiday / the start date of a non school period ****/ /*****************************************************************************/ -void Hld_ChangeStartDate1 (void) +void Hld_ChangeStartDate (void) { Hld_ChangeDate (HLD_START_DATE); } @@ -800,7 +794,7 @@ void Hld_ChangeStartDate1 (void) /*************** Change the end date of a non school period ******************/ /*****************************************************************************/ -void Hld_ChangeEndDate1 (void) +void Hld_ChangeEndDate (void) { Hld_ChangeDate (HLD_END_DATE); } @@ -812,27 +806,27 @@ void Hld_ChangeEndDate1 (void) static void Hld_ChangeDate (Hld_StartOrEndDate_t StartOrEndDate) { extern const char *Txt_The_date_of_the_holiday_X_has_changed_to_Y; - struct Holiday *Hld; struct Date NewDate; struct Date *PtrDate = NULL; // Initialized to avoid warning const char *StrStartOrEndDate = NULL; // Initialized to avoid warning char StrDate[Cns_MAX_BYTES_DATE + 1]; - Hld = &Gbl.Hlds.EditingHld; + /***** Holiday constructor *****/ + Hld_EditingHolidayConstructor (); /***** Get the code of the holiday *****/ - if ((Hld->HldCod = Hld_GetParamHldCod ()) == -1L) + if ((Hld_EditingHld->HldCod = Hld_GetParamHldCod ()) == -1L) Lay_ShowErrorAndExit ("Code of holiday is missing."); /***** Get from the database the data of the holiday *****/ - Hld_GetDataOfHolidayByCod (Hld); + Hld_GetDataOfHolidayByCod (Hld_EditingHld); /***** Get the new date for the holiday *****/ switch (StartOrEndDate) { case HLD_START_DATE: StrStartOrEndDate = "StartDate"; - PtrDate = &(Hld->StartDate); + PtrDate = &Hld_EditingHld->StartDate; Dat_GetDateFromForm ("StartDay","StartMonth","StartYear", &(NewDate.Day),&(NewDate.Month),&(NewDate.Year)); if (NewDate.Day == 0 || @@ -842,11 +836,11 @@ static void Hld_ChangeDate (Hld_StartOrEndDate_t StartOrEndDate) break; case HLD_END_DATE: StrStartOrEndDate = "EndDate"; - PtrDate = &(Hld->EndDate); - switch (Hld->HldTyp) + PtrDate = &Hld_EditingHld->EndDate; + switch (Hld_EditingHld->HldTyp) { case Hld_HOLIDAY: - Dat_AssignDate (&NewDate,&Hld->StartDate); + Dat_AssignDate (&NewDate,&Hld_EditingHld->StartDate); break; case Hld_NON_SCHOOL_PERIOD: Dat_GetDateFromForm ("EndDay","EndMonth","EndYear", @@ -867,92 +861,86 @@ static void Hld_ChangeDate (Hld_StartOrEndDate_t StartOrEndDate) NewDate.Year, NewDate.Month, NewDate.Day, - Hld->HldCod); + Hld_EditingHld->HldCod); Dat_AssignDate (PtrDate,&NewDate); /***** Write message to show the change made *****/ Dat_ConvDateToDateStr (&NewDate,StrDate); Ale_CreateAlert (Ale_SUCCESS,NULL, Txt_The_date_of_the_holiday_X_has_changed_to_Y, - Hld->Name,StrDate); - } - -/*****************************************************************************/ -/*********** Show message and form after changing a holiday date *************/ -/*****************************************************************************/ - -void Hld_ChangeDate2 (void) - { - /***** Show success message *****/ - Ale_ShowAlerts (NULL); - - /***** Show the form again *****/ - Hld_EditHolidays (); + Hld_EditingHld->Name,StrDate); } /*****************************************************************************/ /************************ Change the name of a degree ************************/ /*****************************************************************************/ -void Hld_RenameHoliday1 (void) +void Hld_RenameHoliday (void) { extern const char *Txt_You_can_not_leave_the_name_of_the_holiday_X_empty; extern const char *Txt_The_name_of_the_holiday_X_has_changed_to_Y; extern const char *Txt_The_name_of_the_holiday_X_has_not_changed; - struct Holiday *Hld; char NewHldName[Hld_MAX_BYTES_HOLIDAY_NAME + 1]; - Hld = &Gbl.Hlds.EditingHld; + /***** Holiday constructor *****/ + Hld_EditingHolidayConstructor (); /***** Get parameters from form *****/ /* Get the code of the holiday */ - if ((Hld->HldCod = Hld_GetParamHldCod ()) == -1L) + if ((Hld_EditingHld->HldCod = Hld_GetParamHldCod ()) == -1L) Lay_ShowErrorAndExit ("Code of holiday is missing."); /* Get the new name for the holiday */ Par_GetParToText ("Name",NewHldName,Hld_MAX_BYTES_HOLIDAY_NAME); /***** Get from the database the old names of the holiday *****/ - Hld_GetDataOfHolidayByCod (Hld); + Hld_GetDataOfHolidayByCod (Hld_EditingHld); /***** Check if new name is empty *****/ if (!NewHldName[0]) Ale_CreateAlert (Ale_WARNING,NULL, Txt_You_can_not_leave_the_name_of_the_holiday_X_empty, - Hld->Name); + Hld_EditingHld->Name); else { /***** Check if old and new names are the same (this happens when return is pressed without changes) *****/ - if (strcmp (Hld->Name,NewHldName)) // Different names + if (strcmp (Hld_EditingHld->Name,NewHldName)) // Different names { /***** If degree was in database... *****/ /* Update the table changing old name by new name */ DB_QueryUPDATE ("can not update the text of a holiday", "UPDATE holidays SET Name='%s' WHERE HldCod=%ld", - NewHldName,Hld->HldCod); - Str_Copy (Hld->Name,NewHldName, + NewHldName,Hld_EditingHld->HldCod); + Str_Copy (Hld_EditingHld->Name,NewHldName, Hld_MAX_BYTES_HOLIDAY_NAME); /***** Write message to show the change made *****/ Ale_CreateAlert (Ale_SUCCESS,NULL, Txt_The_name_of_the_holiday_X_has_changed_to_Y, - Hld->Name,NewHldName); + Hld_EditingHld->Name,NewHldName); } else // The same name Ale_CreateAlert (Ale_INFO,NULL, Txt_The_name_of_the_holiday_X_has_not_changed, - Hld->Name); + Hld_EditingHld->Name); } } -void Hld_RenameHoliday2 (void) +/*****************************************************************************/ +/******** Show alerts after changing a holiday and continue editing **********/ +/*****************************************************************************/ + +void Hld_ContEditAfterChgHld (void) { - /***** Write error/success message *****/ + /***** Write message to show the change made *****/ Ale_ShowAlerts (NULL); /***** Show the form again *****/ - Hld_EditHolidays (); + Hld_EditHolidaysInternal (); + + /***** Holiday destructor *****/ + Hld_EditingHolidayDestructor (); } /*****************************************************************************/ @@ -970,12 +958,9 @@ static void Hld_PutFormToCreateHoliday (void) extern const char *Txt_Holiday; extern const char *Txt_HOLIDAY_TYPES[Hld_NUM_TYPES_HOLIDAY]; extern const char *Txt_Create_holiday; - struct Holiday *Hld; unsigned NumPlc; Hld_HolidayType_t HolidayType; - Hld = &Gbl.Hlds.EditingHld; - /***** Start form *****/ Frm_StartForm (ActNewHld); @@ -1012,7 +997,7 @@ static void Hld_PutFormToCreateHoliday (void) "