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

This commit is contained in:
Antonio Cañas Vargas 2017-03-26 03:10:07 +02:00
parent a6c8cfa463
commit b6aae8da18
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -1647,7 +1647,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* 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,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},
/* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Hld_ChangeHolidayPlace1 ,Hld_ChangeHolidayPlace2 ,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},

3
swad_changelog.h
View File

@ -209,13 +209,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.7 (2017-03-26)"
#define Log_PLATFORM_VERSION "SWAD 16.167.8 (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.8: Mar 26, 2017 Changes in edition of holidays. (217681 lines)
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)

22
swad_holiday.c
View File

@ -679,7 +679,7 @@ void Hld_RemoveHoliday2 (void)
/************************* Change the place of a holiday *********************/
/*****************************************************************************/
void Hld_ChangeHolidayPlace (void)
void Hld_ChangeHolidayPlace1 (void)
{
extern const char *Txt_The_place_of_the_holiday_X_has_changed_to_Y;
char Query[128];
@ -706,16 +706,22 @@ void Hld_ChangeHolidayPlace (void)
sprintf (Query,"UPDATE holidays SET PlcCod=%ld WHERE HldCod=%ld",
NewPlace.PlcCod,Hld->HldCod);
DB_QueryUPDATE (Query,"can not update the place of a holiday");
/***** Write message to show the change made *****/
sprintf (Gbl.Message,Txt_The_place_of_the_holiday_X_has_changed_to_Y,
Hld->Name,NewPlace.FullName);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
/***** Show the form again *****/
Hld->PlcCod = NewPlace.PlcCod;
Str_Copy (Hld->PlaceFullName,NewPlace.FullName,
Plc_MAX_BYTES_PLACE_FULL_NAME);
/***** Write message to show the change made *****/
Gbl.AlertType = Lay_SUCCESS;
sprintf (Gbl.Message,Txt_The_place_of_the_holiday_X_has_changed_to_Y,
Hld->Name,NewPlace.FullName);
}
void Hld_ChangeHolidayPlace2 (void)
{
/***** Show success message *****/
Lay_ShowAlert (Gbl.AlertType,Gbl.Message);
/***** Show the form again *****/
Hld_EditHolidays ();
}

3
swad_holiday.h
View File

@ -84,7 +84,8 @@ long Hld_GetParamHldCod (void);
void Hld_RemoveHoliday1 (void);
void Hld_RemoveHoliday2 (void);
void Hld_ChangeHolidayPlace (void);
void Hld_ChangeHolidayPlace1 (void);
void Hld_ChangeHolidayPlace2 (void);
void Hld_ChangeHolidayType1 (void);
void Hld_ChangeHolidayType2 (void);