From ac0d12a845ce98c64dc40f3e71215c7262fdfde2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 7 Nov 2019 00:34:20 +0100 Subject: [PATCH] Version19.54.9 --- swad_changelog.h | 10 ++++++---- swad_date.c | 6 +++++- swad_test.c | 35 ++++++++++++++++++++--------------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index cf254f137..42c05d117 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,7 +490,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.54.8 (2019-11-06)" +#define Log_PLATFORM_VERSION "SWAD 19.54.9 (2019-11-07)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* @@ -498,9 +498,11 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) - Version 19.54.8: Nov 05, 2019 Fixed bug in groups open time. (245925 lines) - Version 19.54.7: Nov 05, 2019 Code refactoring in HTML select options. (245923 lines) - Version 19.54.6: Nov 05, 2019 Code refactoring in HTML select options. (245941 lines) + Version 19.54.9: Nov 07, 2019 Code refactoring in HTML select options. + Fixed bug in dates form. (245936 lines) + Version 19.54.8: Nov 06, 2019 Fixed bug in groups open time. (245925 lines) + Version 19.54.7: Nov 06, 2019 Code refactoring in HTML select options. (245923 lines) + Version 19.54.6: Nov 06, 2019 Code refactoring in HTML select options. (245941 lines) Version 19.54.5: Nov 05, 2019 Code refactoring in HTML select options. (245985 lines) Version 19.54.4: Nov 05, 2019 Code refactoring in HTML select options. (246023 lines) Version 19.54.3: Nov 05, 2019 Code refactoring in HTML select options. (246050 lines) diff --git a/swad_date.c b/swad_date.c index d5b1ce731..f2a847bd3 100644 --- a/swad_date.c +++ b/swad_date.c @@ -555,6 +555,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, 1, // Dat_FORM_SECONDS_ON }; char *IdTimeUTC; + char *ParamNameTimeUTC; /***** Begin table *****/ HTM_TABLE_Begin (NULL); @@ -710,7 +711,10 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, /***** Hidden field with UTC time (seconds since 1970) used to send time *****/ if (asprintf (&IdTimeUTC,"%sTimeUTC",Id) < 0) Lay_NotEnoughMemoryExit (); - Par_PutHiddenParamLong (IdTimeUTC,"OpenTimeUTC",(long) TimeUTC); + if (asprintf (&ParamNameTimeUTC,"%sTimeUTC",ParamName) < 0) + Lay_NotEnoughMemoryExit (); + Par_PutHiddenParamLong (IdTimeUTC,ParamNameTimeUTC,(long) TimeUTC); + free (ParamNameTimeUTC); free (IdTimeUTC); /***** Script to set selectors to local date and time from UTC time *****/ diff --git a/swad_test.c b/swad_test.c index aa2b3f78b..cfc4cb8cf 100644 --- a/swad_test.c +++ b/swad_test.c @@ -3517,11 +3517,9 @@ static void Tst_WriteTFAnsViewTest (unsigned NumQst) /***** Write selector for the answer *****/ HTM_SELECT_Begin (false, "name=\"Ans%06u\"",NumQst); - fprintf (Gbl.F.Out,"" - "" - "", - Txt_TF_QST[0], - Txt_TF_QST[1]); + HTM_OPTION (HTM_Type_STRING,"" ,true ,false," "); + HTM_OPTION (HTM_Type_STRING,"T",false,false,"%s",Txt_TF_QST[0]); + HTM_OPTION (HTM_Type_STRING,"F",false,false,"%s",Txt_TF_QST[1]); HTM_SELECT_End (); } @@ -5032,7 +5030,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], unsigned NumOpt; Tst_AnswerType_t AnsType; unsigned NumTag; - bool TagNotFound; + bool IsThisTag; + bool TagFound; bool OptionsDisabled; bool AnswerHasContent; bool DisplayRightColumn; @@ -5092,9 +5091,9 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], "id=\"SelDesc%u\" name=\"SelDesc%u\"" " class=\"TAG_SEL\" onchange=\"changeTxtTag('%u')\"", NumTag,NumTag,NumTag); - fprintf (Gbl.F.Out,""); + HTM_OPTION (HTM_Type_STRING,"",false,false," "); mysql_data_seek (mysql_res,0); - TagNotFound = true; + TagFound = false; for (NumRow = 1; NumRow <= NumRows; NumRow++) @@ -5105,19 +5104,25 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], row[1] TagTxt row[2] TagHidden */ - fprintf (Gbl.F.Out,"",row[1]); + HTM_OPTION (HTM_Type_STRING,row[1], + IsThisTag,false, + "%s",row[1]); } /* If it's a new tag received from the form */ - if (TagNotFound && Gbl.Test.Tags.Txt[NumTag][0]) - fprintf (Gbl.F.Out,"", - Gbl.Test.Tags.Txt[NumTag],Gbl.Test.Tags.Txt[NumTag]); - fprintf (Gbl.F.Out,"",Txt_new_tag); + if (!TagFound && Gbl.Test.Tags.Txt[NumTag][0]) + HTM_OPTION (HTM_Type_STRING,Gbl.Test.Tags.Txt[NumTag], + true,false, + "%s",Gbl.Test.Tags.Txt[NumTag]); + HTM_OPTION (HTM_Type_STRING,"", + false,false, + "[%s]",Txt_new_tag); HTM_SELECT_End (); HTM_TD_End ();