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 16.167.7

This commit is contained in:
Antonio Cañas Vargas 2017-03-26 01:57:43 +01:00
parent 799689ed9f
commit a6c8cfa463
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -1646,7 +1646,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeHld */{ 707,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_SeeHolidays ,NULL},
/* ActEdiHld */{ 713,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_EditHolidays ,NULL},
/* ActNewHld */{ 714,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_RecFormNewHoliday1 ,Hld_RecFormNewHoliday2 ,NULL},
/* ActRemHld */{ 716,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RemoveHoliday ,NULL},
/* ActRemHld */{ 716,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_RemoveHoliday1 ,Hld_RemoveHoliday2 ,NULL},
/* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeHolidayPlace ,NULL},
/* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_ChangeHolidayType1 ,Hld_ChangeHolidayType2 ,NULL},
/* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_ChangeStartDate1 ,Hld_ChangeDate2 ,NULL},

3
swad_changelog.h
View File

@ -209,13 +209,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.6 (2017-03-26)"
#define Log_PLATFORM_VERSION "SWAD 16.167.7 (2017-03-26)"
#define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.167.7: Mar 26, 2017 Changes in edition of holidays. (217674 lines)
Version 16.167.6: Mar 26, 2017 Changes in edition of holidays. (217667 lines)
Version 16.167.5: Mar 26, 2017 Changes in edition of holidays. (217660 lines)
Version 16.167.4: Mar 26, 2017 Changes in edition of holidays. (217643 lines)

11
swad_holiday.c
View File

@ -641,7 +641,7 @@ long Hld_GetParamHldCod (void)
/******************************* Remove a holiday ****************************/
/*****************************************************************************/
void Hld_RemoveHoliday (void)
void Hld_RemoveHoliday1 (void)
{
extern const char *Txt_Holiday_X_removed;
char Query[128];
@ -660,9 +660,16 @@ void Hld_RemoveHoliday (void)
DB_QueryDELETE (Query,"can not remove a holiday");
/***** Write message to show the change made *****/
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_Holiday_X_removed,
Hld.Name);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
}
void Hld_RemoveHoliday2 (void)
{
/***** Show success message *****/
Lay_ShowAlert (Gbl.AlertType,Gbl.Message);
/***** Show the form again *****/
Hld_EditHolidays ();

3
swad_holiday.h
View File

@ -81,7 +81,8 @@ void Hld_FreeListHolidays (void);
long Hld_GetParamHldCod (void);
void Hld_RemoveHoliday (void);
void Hld_RemoveHoliday1 (void);
void Hld_RemoveHoliday2 (void);
void Hld_ChangeHolidayPlace (void);