From 6e9d4bab419f0a6d0c3406a9f5e40bb0a83bf9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 26 Oct 2015 20:13:09 +0100 Subject: [PATCH] Version 15.24.1 --- swad_changelog.h | 3 +- swad_date.c | 150 ++++------------------------------------------- swad_date.h | 9 +-- swad_group.c | 4 +- 4 files changed, 17 insertions(+), 149 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index f88617cf2..22c24ba9f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -108,11 +108,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.24 (2015/10/26)" +#define Log_PLATFORM_VERSION "SWAD 15.24.1 (2015/10/26)" // 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 15.24.1: Oct 26, 2015 Remove unused code related to date-times. (186217 lines) Version 15.24: Oct 26, 2015 Lot of changes in swad.js related to date-times. (186336 lines) Version 15.23: Oct 26, 2015 Date-times to open groups are displayed in client local date-time. (186259 lines) Version 15.22.1: Oct 26, 2015 Date-times in notices are displayed in client local date-time. (186344 lines) diff --git a/swad_date.c b/swad_date.c index bfe579739..e8a77ec48 100644 --- a/swad_date.c +++ b/swad_date.c @@ -210,7 +210,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (void) Gbl.DateRange.TimeUTC[0], Cfg_LOG_START_YEAR, Gbl.Now.Date.Year, - false,false); + false); /***** "Yesterday" and "Today" buttons *****/ fprintf (Gbl.F.Out,"" @@ -244,7 +244,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (void) Gbl.DateRange.TimeUTC[1], Cfg_LOG_START_YEAR, Gbl.Now.Date.Year, - false,false); + false); fprintf (Gbl.F.Out,"" ""); @@ -292,7 +292,7 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2]) TimeUTC[StartOrEndTime], Gbl.Now.Date.Year - 1, Gbl.Now.Date.Year + 1, - false,false); + false); fprintf (Gbl.F.Out,"" "" @@ -310,7 +310,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, const char *ParamName, time_t TimeUTC, unsigned FirstYear,unsigned LastYear, - bool SubmitFormOnChange,bool Disabled) + bool SubmitFormOnChange) { extern const char *Txt_MONTHS_SMALL[12]; unsigned Day; @@ -334,10 +334,8 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) fprintf (Gbl.F.Out,"document.getElementById('%s').submit();", Gbl.FormId); - fprintf (Gbl.F.Out,"\""); - if (Disabled) - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">"); + fprintf (Gbl.F.Out,"\">" + ""); for (Year = FirstYear; Year <= LastYear; Year++) @@ -356,10 +354,8 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) fprintf (Gbl.F.Out,"document.getElementById('%s').submit();", Gbl.FormId); - fprintf (Gbl.F.Out,"\""); - if (Disabled) - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">"); + fprintf (Gbl.F.Out,"\">" + ""); for (Month = 1; Month <= 12; Month++) @@ -376,10 +372,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) fprintf (Gbl.F.Out,"document.getElementById('%s').submit();", Gbl.FormId); - fprintf (Gbl.F.Out,"\""); - if (Disabled) - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">" + fprintf (Gbl.F.Out,"\">" ""); for (Day = 1; Day <= 31; @@ -397,10 +390,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) fprintf (Gbl.F.Out,"document.getElementById('%s').submit();", Gbl.FormId); - fprintf (Gbl.F.Out,"\""); - if (Disabled) - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">"); + fprintf (Gbl.F.Out,"\">"); for (Hour = 0; Hour <= 23; Hour++) @@ -417,10 +407,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) fprintf (Gbl.F.Out,"document.getElementById('%s').submit();", Gbl.FormId); - fprintf (Gbl.F.Out,"\""); - if (Disabled) - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">"); + fprintf (Gbl.F.Out,"\">"); for (Minute = 0; Minute <= 59; Minute++) @@ -437,10 +424,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) fprintf (Gbl.F.Out,"document.getElementById('%s').submit();", Gbl.FormId); - fprintf (Gbl.F.Out,"\""); - if (Disabled) - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">"); + fprintf (Gbl.F.Out,"\">"); for (Second = 0; Second <= 59; Second++) @@ -581,66 +565,6 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, ""); } -/*****************************************************************************/ -/*************** Show a form to enter a hour-minute time *********************/ -/*****************************************************************************/ - -void Dat_WriteFormHourMinute (const char *NameSelectHour,const char *NameSelectMinute, - struct Time *TimeSelected, - bool SubmitFormOnChange,bool Disabled) - { - unsigned Hour; - unsigned Minute; - - /***** Hour *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - "
" - "" - "" - "" - "
"); - } - /*****************************************************************************/ /*************************** Get a date from a form **************************/ /*****************************************************************************/ @@ -666,26 +590,6 @@ void Dat_GetDateFromForm (const char *ParamNameDay,const char *ParamNameMonth,co *Year = 0; } -/*****************************************************************************/ -/***************** Get an hour-minute time from a form ***********************/ -/*****************************************************************************/ - -void Dat_GetHourMinuteFromForm (const char *ParamNameHour,const char *ParamNameMinute, - unsigned *Hour,unsigned *Minute) - { - char UnsignedStr[10+1]; - - /**** Get hour ****/ - Par_GetParToText (ParamNameHour,UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",Hour) != 1) - *Hour = 0; - - /**** Get minute ****/ - Par_GetParToText (ParamNameMinute,UnsignedStr,10); - if (sscanf (UnsignedStr,"%u",Minute) != 1) - *Minute = 0; - } - /*****************************************************************************/ /************************** Get initial and end dates ************************/ /*****************************************************************************/ @@ -725,36 +629,6 @@ void Dat_GetIniEndDatesFromForm (void) Gbl.DateRange.TimeUTC[1] = Dat_GetTimeUTCFromForm ("EndTimeUTC"); } -/*****************************************************************************/ -/******************************** Write a date *******************************/ -/*****************************************************************************/ -// DateTime must be in YYYYMMDD[...] format - -void Dat_WriteDate (const char *YYYYMMDD) - { - extern const char *Txt_Today; - - if (strncmp (YYYYMMDD,Gbl.Now.Date.YYYYMMDD,8)) // If date is not today - fprintf (Gbl.F.Out,"%c%c/%c%c/%c%c", - YYYYMMDD[6],YYYYMMDD[7], - YYYYMMDD[4],YYYYMMDD[5], - YYYYMMDD[2],YYYYMMDD[3]); - else // If date is today - fprintf (Gbl.F.Out,"%s",Txt_Today); - } - -/*****************************************************************************/ -/************************* Write hour and minute *****************************/ -/*****************************************************************************/ -// DateTime must be in HHMM[SS] format - -void Dat_WriteHourMinute (const char *HHMM) - { - fprintf (Gbl.F.Out,"%c%c:%c%c", - HHMM[0],HHMM[1], - HHMM[2],HHMM[3]); - } - /*****************************************************************************/ /****************** Write a UTC date into RFC 822 format *********************/ /*****************************************************************************/ diff --git a/swad_date.h b/swad_date.h index 56a2fae61..7ffa3699f 100644 --- a/swad_date.h +++ b/swad_date.h @@ -83,25 +83,18 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, const char *ParamName, time_t TimeUTC, unsigned FirstYear,unsigned LastYear, - bool SubmitFormOnChange,bool Disabled); + bool SubmitFormOnChange); time_t Dat_GetTimeUTCFromForm (const char *ParamName); void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, const char *Id, struct Date *DateSelected, bool SubmitFormOnChange,bool Disabled); -void Dat_WriteFormHourMinute (const char *NameSelectHour,const char *NameSelectMinute, - struct Time *TimeSelected, - bool SubmitFormOnChange,bool Disabled); void Dat_GetDateFromForm (const char *ParamNameDay,const char *ParamNameMonth,const char *ParamNameYear, unsigned *Day,unsigned *Month,unsigned *Year); -void Dat_GetHourMinuteFromForm (const char *ParamNameHour,const char *ParamNameMinute, - unsigned *Hour,unsigned *Minute); void Dat_GetIniEndDatesFromForm (void); -void Dat_WriteDate (const char *YYYYMMDD); -void Dat_WriteHourMinute (const char *HHMM); void Dat_WriteRFC822DateFromTM (FILE *File,struct tm *tm); void Dat_GetDateBefore (struct Date *Date,struct Date *PrecedingDate); diff --git a/swad_group.c b/swad_group.c index 3ca38ed8f..f6e0c74af 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1226,7 +1226,7 @@ static void Grp_ListGroupTypesForEdition (void) Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].OpenTimeUTC, Gbl.Now.Date.Year, Gbl.Now.Date.Year + 1, - true,false); + true); fprintf (Gbl.F.Out,"" "" ""); @@ -2122,7 +2122,7 @@ static void Grp_PutFormToCreateGroupType (void) Gbl.CurrentCrs.Grps.GrpTyp.OpenTimeUTC, Gbl.Now.Date.Year, Gbl.Now.Date.Year + 1, - false,false); + false); fprintf (Gbl.F.Out,"" "" ""