From 2194047dbf76264fa9631c9976380667f581a0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 10 Oct 2019 10:41:00 +0200 Subject: [PATCH] Version19.31.36 --- swad_changelog.h | 3 +- swad_test.c | 321 ++++++++++++++++++++++++--------------------- swad_test_import.c | 30 +++-- swad_timetable.c | 36 ++--- swad_user.c | 99 +++++++------- swad_zip.c | 10 +- 6 files changed, 257 insertions(+), 242 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b82c15c2..6606e0f1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,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.31.35 (2019-10-10)" +#define Log_PLATFORM_VERSION "SWAD 19.31.36 (2019-10-10)" #define CSS_FILE "swad19.29.css" #define JS_FILE "swad19.30.js" /* @@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf // TODO: Un TFG preasignado sin estudiante tiene que salir un triángulo amarillo // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) + Version 19.31.36: Oct 10, 2019 Code refactoring in HTML tables. (246620 lines) Version 19.31.35: Oct 10, 2019 Code refactoring in HTML tables. (246629 lines) Version 19.31.34: Oct 10, 2019 Code refactoring in HTML tables. (246628 lines) Version 19.31.33: Oct 09, 2019 Code refactoring in HTML tables. (246688 lines) diff --git a/swad_test.c b/swad_test.c index c52a1833..fb1dd342 100644 --- a/swad_test.c +++ b/swad_test.c @@ -355,14 +355,14 @@ void Tst_ShowFormAskTst (void) /***** Number of questions to generate ****/ Tbl_StartRow (); - fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\""); fprintf (Gbl.F.Out,"", The_ClassFormInBox[Gbl.Prefs.Theme],Txt_No_of_questions); Tbl_EndCell (); - fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\""); fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); + Tbl_StartCellAttr ("class=\"BIG_INDEX RIGHT_TOP COLOR%u\"",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"%u",NumQst + 1); Tbl_EndCell (); - fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); + Tbl_StartCellAttr ("class=\"DAT_LIGHT LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"%s",Txt_Question_removed); Tbl_EndCell (); @@ -1043,7 +1043,7 @@ static void Tst_WriteQstAndAnsTest (Tst_ActionToDoWithQuestions_t ActionToDoWith Tbl_StartRow (); /***** Write number of question *****/ - fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); + Tbl_StartCellAttr ("class=\"RIGHT_TOP COLOR%u\"",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"
%u
",NumQst + 1); /***** Write answer type (row[2]) *****/ @@ -1053,7 +1053,7 @@ static void Tst_WriteQstAndAnsTest (Tst_ActionToDoWithQuestions_t ActionToDoWith Tbl_EndCell (); /***** Write stem (row[4]) *****/ - fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); + Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd); Tst_WriteQstStem (row[4],"TEST_EXA"); /***** Get and show media (row[6]) *****/ @@ -1698,22 +1698,22 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, Tbl_StartRow (); /***** Label *****/ - fprintf (Gbl.F.Out,"",The_ClassFormInBox[Gbl.Prefs.Theme]); + Tbl_StartCellAttr ("class=\"RIGHT_TOP %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s:",Txt_Tags); Tbl_EndCell (); /***** Select all tags *****/ if (NumCols > 1) - fprintf (Gbl.F.Out,"",NumCols); + Tbl_StartCellAttr ("colspan=\"%u\" class=\"LEFT_TOP\"",NumCols); else - fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"LEFT_TOP\""); Tbl_StartTablePadding (2); Tbl_StartRow (); if (!ShowOnlyEnabledTags) Tbl_PutEmptyCells (1); - fprintf (Gbl.F.Out,""); + Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\""); fprintf (Gbl.F.Out,"