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.6

This commit is contained in:
Antonio Cañas Vargas 2017-03-26 01:51:00 +01:00
parent 305244b153
commit 799689ed9f
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -1648,7 +1648,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* 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},
/* 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,NULL ,Hld_ChangeHolidayType ,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},
/* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_ChangeEndDate1 ,Hld_ChangeDate2 ,NULL},
/* ActRenHld */{ 766,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_RenameHoliday1 ,Hld_RenameHoliday2 ,NULL},

5
swad_changelog.h
View File

@ -209,14 +209,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.5 (2017-03-26)"
#define Log_PLATFORM_VERSION "SWAD 16.167.6 (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.5: Mar 26, 2017 Changes in edition of holidays. (? 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)
Version 16.167.3: Mar 25, 2017 Changes in edition of holidays. (217632 lines)
Version 16.167.2: Mar 25, 2017 Contextual link to holidays is changed to a left-top contextual icon. (217577 lines)

10
swad_holiday.c
View File

@ -716,7 +716,7 @@ void Hld_ChangeHolidayPlace (void)
/************************* Change the type of a holiday **********************/
/*****************************************************************************/
void Hld_ChangeHolidayType (void)
void Hld_ChangeHolidayType1 (void)
{
extern const char *Txt_The_type_of_the_holiday_X_has_changed;
char Query[256];
@ -742,9 +742,15 @@ void Hld_ChangeHolidayType (void)
DB_QueryUPDATE (Query,"can not update the type of a holiday");
/***** Write message to show the change made *****/
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_The_type_of_the_holiday_X_has_changed,
Hld->Name);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
}
void Hld_ChangeHolidayType2 (void)
{
/***** Show success message *****/
Lay_ShowAlert (Gbl.AlertType,Gbl.Message);
/***** Show the form again *****/
Hld_EditHolidays ();

6
swad_holiday.h
View File

@ -80,9 +80,13 @@ void Hld_GetListHolidays (void);
void Hld_FreeListHolidays (void);
long Hld_GetParamHldCod (void);
void Hld_RemoveHoliday (void);
void Hld_ChangeHolidayPlace (void);
void Hld_ChangeHolidayType (void);
void Hld_ChangeHolidayType1 (void);
void Hld_ChangeHolidayType2 (void);
void Hld_ChangeStartDate1 (void);
void Hld_ChangeEndDate1 (void);