From 90b9eef04ac39845570059dbf41a0adaa860feeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 5 Nov 2019 15:47:35 +0100 Subject: [PATCH] Version19.53 --- swad_HTML.c | 10 +-- swad_attendance.c | 3 +- swad_centre.c | 36 +++++---- swad_changelog.h | 4 +- swad_country.c | 5 +- swad_course.c | 43 +++++------ swad_date.c | 173 +++++++++++++++++++++++++++----------------- swad_degree.c | 30 ++++---- swad_degree_type.c | 5 +- swad_department.c | 19 ++--- swad_enrolment.c | 3 +- swad_exam.c | 17 +++-- swad_figure.c | 3 +- swad_file_browser.c | 10 ++- swad_group.c | 38 +++++----- swad_holiday.c | 16 ++-- swad_institution.c | 22 +++--- swad_language.c | 6 +- swad_message.c | 3 +- swad_photo.c | 18 ++--- swad_project.c | 6 +- swad_record.c | 54 +++++++------- swad_role.c | 15 +++- swad_scope.c | 7 +- swad_search.c | 3 +- swad_statistic.c | 30 ++++---- swad_test.c | 10 ++- swad_timetable.c | 19 ++--- swad_user.c | 5 +- 29 files changed, 329 insertions(+), 284 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index a55b7431..1d95fae3 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -66,7 +66,7 @@ static unsigned HTM_A_NestingLevel = 0; static unsigned HTM_SCRIPT_NestingLevel = 0; static unsigned HTM_LABEL_NestingLevel = 0; static unsigned HTM_TEXTAREA_NestingLevel = 0; -// static unsigned HTM_SELECT_NestingLevel = 0; +static unsigned HTM_SELECT_NestingLevel = 0; /*****************************************************************************/ /***************************** Private prototypes ****************************/ @@ -1195,7 +1195,7 @@ void HTM_SELECT_Begin (bool SubmitOnChange, Gbl.Form.Id); fprintf (Gbl.F.Out," />"); - // HTM_SELECT_NestingLevel++; + HTM_SELECT_NestingLevel++; } static void HTM_SELECT_BeginWithoutAttr (void) @@ -1205,12 +1205,12 @@ static void HTM_SELECT_BeginWithoutAttr (void) void HTM_SELECT_End (void) { - // if (HTM_SELECT_NestingLevel == 0) // No SELECT open - // Ale_ShowAlert (Ale_ERROR,"Trying to close unopened SELECT."); + if (HTM_SELECT_NestingLevel == 0) // No SELECT open + Ale_ShowAlert (Ale_ERROR,"Trying to close unopened SELECT."); fprintf (Gbl.F.Out,""); - // HTM_SELECT_NestingLevel--; + HTM_SELECT_NestingLevel--; } /*****************************************************************************/ diff --git a/swad_attendance.c b/swad_attendance.c index 397a9e6a..62322bfa 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1129,7 +1129,8 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); - fprintf (Gbl.F.Out,"", - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "name=\"PlcCod\" class=\"INPUT_SHORT_NAME\""); fprintf (Gbl.F.Out,"" "", (unsigned) Ctr_GetStatusBitsFromStatusTxt (Ctr_STATUS_PENDING), @@ -2503,7 +2500,8 @@ static void Ctr_PutFormToCreateCentre (void) /***** Place *****/ HTM_TD_Begin ("class=\"LM\""); - fprintf (Gbl.F.Out,"", - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "id=\"OthCrsYear\" name=\"OthCrsYear\""); for (Year = 0; Year <= Deg_MAX_YEARS_PER_DEGREE; Year++) @@ -886,13 +884,13 @@ void Crs_WriteSelectorOfCourse (void) /***** Begin form *****/ Frm_StartFormGoTo (ActSeeCrsInf); - fprintf (Gbl.F.Out,"", - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "name=\"OthCrsYear\" class=\"HIE_SEL_NARROW\""); for (YearAux = 0; YearAux <= Deg_MAX_YEARS_PER_DEGREE; YearAux++) // All the years are permitted because it's possible to move this course to another degree (with other active years) @@ -1555,9 +1551,8 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) { Frm_StartForm (ActChgCrsSta); Crs_PutParamOtherCrsCod (Crs->CrsCod); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (false, + "name=\"OthCrsYear\" class=\"HIE_SEL_NARROW\""); for (Year = 0; Year <= Deg_MAX_YEARS_PER_DEGREE; Year++) @@ -3291,7 +3287,8 @@ void Crs_AskRemoveOldCrss (void) HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s ", Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (false, + "id=\"%sYear\" name=\"%sYear\"" + " onchange=\"" + "adjustDateForm('%s');" + "setUTCFromLocalDateTimeForm('%s');" + "document.getElementById('%s').submit();return false;", + Id,ParamName,Id,Id, + Gbl.Form.Id); + else + HTM_SELECT_Begin (false, + "id=\"%sYear\" name=\"%sYear\"" + " onchange=\"" + "adjustDateForm('%s');" + "setUTCFromLocalDateTimeForm('%s');", + Id,ParamName,Id,Id); for (Year = FirstYear; Year <= LastYear; Year++) @@ -581,15 +588,22 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, /***** Month *****/ HTM_TD_Begin ("class=\"CM\""); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (false, + "id=\"%sDay\" name=\"%sDay\"" + " onchange=\"setUTCFromLocalDateTimeForm('%s');" + "document.getElementById('%s').submit();return false;", + Id,ParamName,Id, + Gbl.Form.Id); + else + HTM_SELECT_Begin (false, + "id=\"%sDay\" name=\"%sDay\"" + " onchange=\"setUTCFromLocalDateTimeForm('%s');", + Id,ParamName,Id); for (Day = 1; Day <= 31; Day++) @@ -617,13 +636,18 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, /***** Hour *****/ HTM_TD_Begin ("class=\"RM\""); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (false, + "id=\"%sMinute\" name=\"%sMinute\"" + " onchange=\"setUTCFromLocalDateTimeForm('%s');" + "document.getElementById('%s').submit();return false;", + Id,ParamName,Id, + Gbl.Form.Id); + else + HTM_SELECT_Begin (false, + "id=\"%sMinute\" name=\"%sMinute\"" + " onchange=\"setUTCFromLocalDateTimeForm('%s');", + Id,ParamName,Id); for (Minute = 0; Minute < 60; @@ -655,13 +684,18 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (FormSeconds == Dat_FORM_SECONDS_ON) { HTM_TD_Begin ("class=\"LM\""); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (false, + "id=\"%sYear\" name=\"%sYear\"%s" + " onchange=\"adjustDateForm('%s');", + "document.getElementById('%s').submit();return false;", + Id,Id, + Disabled ? " disabled=\"disabled\"" : "", + Id, + Gbl.Form.Id); + else + HTM_SELECT_Begin (false, + "id=\"%sYear\" name=\"%sYear\"%s" + " onchange=\"adjustDateForm('%s');", + Id,Id, + Disabled ? " disabled=\"disabled\"" : "", + Id); fprintf (Gbl.F.Out,""); for (Year = FirstYear; Year <= LastYear; @@ -851,16 +891,22 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, /***** Month *****/ HTM_TD_Begin ("class=\"CM\""); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (SubmitFormOnChange, + "id=\"%sDay\" name=\"%sDay\"%s", + Id,Id, + Disabled ? " disabled=\"disabled\"" : ""); fprintf (Gbl.F.Out,""); NumDaysSelectedMonth = (DateSelected->Month == 0) ? 31 : ((DateSelected->Month == 2) ? Dat_GetNumDaysFebruary (DateSelected->Year) : diff --git a/swad_degree.c b/swad_degree.c index 554f36b5..ad56a447 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -357,10 +357,9 @@ static void Deg_Configuration (bool PrintView) /* Put form to select centre */ Frm_StartForm (ActChgDegCtrCfg); - fprintf (Gbl.F.Out," 0) - fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();return false;\"", - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "id=\"deg\" name=\"deg\" class=\"HIE_SEL\""); else - fprintf (Gbl.F.Out," disabled=\"disabled\""); - fprintf (Gbl.F.Out,">"); + HTM_SELECT_Begin (false, + "id=\"deg\" name=\"deg\" class=\"HIE_SEL\"" + " disabled=\"disabled\""); fprintf (Gbl.F.Out,"" "", (unsigned) Deg_GetStatusBitsFromStatusTxt (Deg_STATUS_PENDING), @@ -970,7 +967,8 @@ static void Deg_PutFormToCreateDegree (void) /***** Degree type *****/ HTM_TD_Begin ("class=\"LM\""); - fprintf (Gbl.F.Out,"", - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "id=\"OthDegTypCod\" name=\"OthDegTypCod\""); fprintf (Gbl.F.Out,"" "", (unsigned) Ins_GetStatusBitsFromStatusTxt (Ins_STATUS_PENDING), diff --git a/swad_language.c b/swad_language.c index ddd635db..4cd25985 100644 --- a/swad_language.c +++ b/swad_language.c @@ -116,10 +116,8 @@ void Lan_PutSelectorToSelectLanguage (void) Lan_Language_t Lan; Frm_StartForm (ActReqChgLan); - fprintf (Gbl.F.Out,""); + HTM_SELECT_Begin (false, + "name=\"FilterCrsCod\""); fprintf (Gbl.F.Out,"" "" "" "", @@ -5087,9 +5088,10 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], /***** Write the tags already existing in a selector *****/ HTM_TD_Begin ("class=\"LM\""); - fprintf (Gbl.F.Out,"", - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "name=\"TTTyp\" class=\"TT_TYP\""); for (CT = (TT_ClassType_t) 0; CT < (TT_ClassType_t) TT_NUM_CLASS_TYPES; CT++) @@ -1636,9 +1635,8 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co else { /***** Class duration *****/ - fprintf (Gbl.F.Out,"", - CellStr, - Gbl.Form.Id); + HTM_SELECT_Begin (true, + "id=\"TTGrp%s\" name=\"TTGrp\"" + " class=\"TT_GRP\"", + CellStr); fprintf (Gbl.F.Out,"