From 4b27ee2917fba8e78991b207fb2f07a3e4f255e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 24 Sep 2019 15:29:39 +0200 Subject: [PATCH] Version19.12.3 --- sql/cambios.sql | 10 ++++++++++ swad_changelog.h | 3 ++- swad_match.c | 11 ++++++----- swad_test.c | 6 +++--- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sql/cambios.sql b/sql/cambios.sql index 1ca83a614..c4c856dc9 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -12882,6 +12882,16 @@ INSERT INTO gam_time (MchCod,QstInd) VALUES (61,1,SEC_TO_TIME(1)) ON DUPLICATE K ---------------- +SELECT gam_questions.QstCod, + gam_questions.QstInd, + mch_indexes.Indexes + FROM mch_matches,gam_questions,mch_indexes + WHERE mch_matches.MchCod=69 + AND mch_matches.GamCod=gam_questions.GamCod + AND mch_matches.MchCod=mch_indexes.MchCod + AND gam_questions.QstInd=mch_indexes.QstInd + ORDER BY gam_questions.QstInd; + SELECT gam_questions.QstCod, gam_questions.QstInd, mch_indexes.Indexes diff --git a/swad_changelog.h b/swad_changelog.h index 8e146b0e2..ac18dd694 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -470,10 +470,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.12.2 (2019-09-24)" +#define Log_PLATFORM_VERSION "SWAD 19.12.3 (2019-09-24)" #define CSS_FILE "swad19.3.css" #define JS_FILE "swad18.130.2.js" /* + Version 19.12.3: Sep 24, 2019 View matches results. Not finished. (245979 lines) Version 19.12.2: Sep 24, 2019 View matches results. Not finished. (245977 lines) Version 19.12.1: Sep 24, 2019 View matches results. Not finished. (245987 lines) Version 19.12: Sep 24, 2019 View matches results. Not finished. (245973 lines) diff --git a/swad_match.c b/swad_match.c index b742c6487..26d589fca 100644 --- a/swad_match.c +++ b/swad_match.c @@ -3496,13 +3496,13 @@ void Mch_ShowOneMchResult (void) /***** Write answers and solutions *****/ Tst_ShowTestResult (NumQsts,TimeUTC[Dat_START_TIME]); + /***** End table *****/ + Tbl_EndTable (); + /***** Write total mark of test *****/ if (ICanViewScore) Tst_ShowTstTotalMark (NumQsts,TotalScore); - /***** End table *****/ - Tbl_EndTable (); - /***** End box *****/ Box_EndBox (); } @@ -3535,8 +3535,9 @@ static void Mch_GetMatchResultQuestionsFromDB (long MchCod,long UsrCod) " WHERE mch_matches.MchCod=%ld" " AND mch_matches.GamCod=gam_questions.GamCod" " AND mch_matches.MchCod=mch_indexes.MchCod" - " AND mch_matches.QstInd=mch_indexes.QstInd" - " ORDER BY gam_questions.QstInd"); + " AND gam_questions.QstInd=mch_indexes.QstInd" + " ORDER BY gam_questions.QstInd", + MchCod); for (NumQst = 0; NumQst < NumQsts; NumQst++) diff --git a/swad_test.c b/swad_test.c index 3aae156b9..96d178cca 100644 --- a/swad_test.c +++ b/swad_test.c @@ -8202,13 +8202,13 @@ void Tst_ShowOneTstResult (void) /***** Write answers and solutions *****/ Tst_ShowTestResult (Gbl.Test.NumQsts,TstTimeUTC); + /***** End table *****/ + Tbl_EndTable (); + /***** Write total mark of test *****/ if (ICanViewScore) Tst_ShowTstTotalMark (Gbl.Test.NumQsts,TotalScore); - /***** End table *****/ - Tbl_EndTable (); - /***** End box *****/ Box_EndBox (); }