From bd746b234638f59dc9a9c8e87b6679a529762b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 3 Oct 2019 22:12:31 +0200 Subject: [PATCH] Version19.30.3 --- swad_changelog.h | 3 +- swad_help_URL.c | 290 ++++++++++++++++++++++------------------------- swad_match.c | 4 +- swad_test.c | 12 +- 4 files changed, 144 insertions(+), 165 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e936b1fe4..c1b087999 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -485,12 +485,13 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.30.2 (2019-10-03)" +#define Log_PLATFORM_VERSION "SWAD 19.30.3 (2019-10-03)" #define CSS_FILE "swad19.29.css" #define JS_FILE "swad19.30.js" /* // TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas) + Version 19.30.3: Oct 03, 2019 Changes in help links. (246895 lines) Version 19.30.2: Oct 03, 2019 Changes in edition of games. (246914 lines) Version 19.30.1: Oct 01, 2019 Changes in match playing. (246904 lines) Version 19.30: Oct 01, 2019 The match refreshment time for teachers is now different from the time for students. diff --git a/swad_help_URL.c b/swad_help_URL.c index 417b75531..d13d09285 100644 --- a/swad_help_URL.c +++ b/swad_help_URL.c @@ -1201,6 +1201,27 @@ const char *Hlp_ASSESSMENT_Tests = "ASSESSMENT.Tests.en"; #endif +const char *Hlp_ASSESSMENT_Tests_editing_questions = +#if L==1 + "ASSESSMENT.Tests.es#editar-preguntas"; +#elif L==2 + "ASSESSMENT.Tests.en#editing-questions"; +#elif L==3 + "ASSESSMENT.Tests.en#editing-questions"; +#elif L==4 + "ASSESSMENT.Tests.es#editar-preguntas"; +#elif L==5 + "ASSESSMENT.Tests.en#editing-questions"; +#elif L==6 + "ASSESSMENT.Tests.es#editar-preguntas"; +#elif L==7 + "ASSESSMENT.Tests.en#editing-questions"; +#elif L==8 + "ASSESSMENT.Tests.en#editing-questions"; +#elif L==9 + "ASSESSMENT.Tests.en#editing-questions"; +#endif + const char *Hlp_ASSESSMENT_Tests_writing_a_question = #if L==1 "ASSESSMENT.Tests.es#escribir-una-pregunta"; @@ -1224,25 +1245,129 @@ const char *Hlp_ASSESSMENT_Tests_writing_a_question = const char *Hlp_ASSESSMENT_Tests_results = #if L==1 - "ASSESSMENT.Tests.es#resultados-de-tests"; // TODO: Change to #resultados + "ASSESSMENT.Tests.es#resultados"; #elif L==2 - "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results + "ASSESSMENT.Tests.en#results"; #elif L==3 - "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results + "ASSESSMENT.Tests.en#results"; #elif L==4 - "ASSESSMENT.Tests.es#resultados-de-tests"; // TODO: Change to #resultados + "ASSESSMENT.Tests.es#resultados"; #elif L==5 - "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results + "ASSESSMENT.Tests.en#results"; #elif L==6 - "ASSESSMENT.Tests.es#resultados-de-tests"; // TODO: Change to #resultados + "ASSESSMENT.Tests.es#resultados"; #elif L==7 - "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results + "ASSESSMENT.Tests.en#results"; #elif L==8 - "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results + "ASSESSMENT.Tests.en#results"; #elif L==9 - "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results + "ASSESSMENT.Tests.en#results"; #endif +const char *Hlp_ASSESSMENT_Games = +#if L==1 + "ASSESSMENT.Games.es"; +#elif L==2 + "ASSESSMENT.Games.en"; +#elif L==3 + "ASSESSMENT.Games.en"; +#elif L==4 + "ASSESSMENT.Games.es"; +#elif L==5 + "ASSESSMENT.Games.en"; +#elif L==6 + "ASSESSMENT.Games.es"; +#elif L==7 + "ASSESSMENT.Games.en"; +#elif L==8 + "ASSESSMENT.Games.en"; +#elif L==9 + "ASSESSMENT.Games.en"; +#endif + +const char *Hlp_ASSESSMENT_Games_edit_game = +#if L==1 + "ASSESSMENT.Games.es#editar-juego"; +#elif L==2 + "ASSESSMENT.Games.en#edit-game"; +#elif L==3 + "ASSESSMENT.Games.en#edit-game"; +#elif L==4 + "ASSESSMENT.Games.es#editar-juego"; +#elif L==5 + "ASSESSMENT.Games.en#edit-game"; +#elif L==6 + "ASSESSMENT.Games.es#editar-juego"; +#elif L==7 + "ASSESSMENT.Games.en#edit-game"; +#elif L==8 + "ASSESSMENT.Games.en#edit-game"; +#elif L==9 + "ASSESSMENT.Games.en#edit-game"; +#endif + +const char *Hlp_ASSESSMENT_Games_matches = +#if L==1 + "ASSESSMENT.Games.es#partidas"; +#elif L==2 + "ASSESSMENT.Games.en#matches"; +#elif L==3 + "ASSESSMENT.Games.en#matches"; +#elif L==4 + "ASSESSMENT.Games.es#partidas"; +#elif L==5 + "ASSESSMENT.Games.en#matches"; +#elif L==6 + "ASSESSMENT.Games.es#partidas"; +#elif L==7 + "ASSESSMENT.Games.en#matches"; +#elif L==8 + "ASSESSMENT.Games.en#matches"; +#elif L==9 + "ASSESSMENT.Games.en#matches"; +#endif + +const char *Hlp_ASSESSMENT_Games_new_game = +#if L==1 + "ASSESSMENT.Games.es#nuevo-juego"; +#elif L==2 + "ASSESSMENT.Games.en#new-game"; +#elif L==3 + "ASSESSMENT.Games.en#new-game"; +#elif L==4 + "ASSESSMENT.Games.es#nuevo-juego"; +#elif L==5 + "ASSESSMENT.Games.en#new-game"; +#elif L==6 + "ASSESSMENT.Games.es#nuevo-juego"; +#elif L==7 + "ASSESSMENT.Games.en#new-game"; +#elif L==8 + "ASSESSMENT.Games.en#new-game"; +#elif L==9 + "ASSESSMENT.Games.en#new-game"; +#endif + +const char *Hlp_ASSESSMENT_Games_questions = +#if L==1 + "ASSESSMENT.Games.es#preguntas"; +#elif L==2 + "ASSESSMENT.Games.en#questions"; +#elif L==3 + "ASSESSMENT.Games.en#questions"; +#elif L==4 + "ASSESSMENT.Games.es#preguntas"; +#elif L==5 + "ASSESSMENT.Games.en#questions"; +#elif L==6 + "ASSESSMENT.Games.es#preguntas"; +#elif L==7 + "ASSESSMENT.Games.en#questions"; +#elif L==8 + "ASSESSMENT.Games.en#questions"; +#elif L==9 + "ASSESSMENT.Games.en#questions"; +#endif const char *Hlp_ASSESSMENT_Games_results = #if L==1 @@ -1349,153 +1474,6 @@ const char *Hlp_ASSESSMENT_Surveys_questions = "ASSESSMENT.Surveys.en#questions"; #endif -const char *Hlp_ASSESSMENT_Games = -#if L==1 - "ASSESSMENT.Games.es"; -#elif L==2 - "ASSESSMENT.Games.en"; -#elif L==3 - "ASSESSMENT.Games.en"; -#elif L==4 - "ASSESSMENT.Games.es"; -#elif L==5 - "ASSESSMENT.Games.en"; -#elif L==6 - "ASSESSMENT.Games.es"; -#elif L==7 - "ASSESSMENT.Games.en"; -#elif L==8 - "ASSESSMENT.Games.en"; -#elif L==9 - "ASSESSMENT.Games.en"; -#endif - -const char *Hlp_ASSESSMENT_Games_edit_game = -#if L==1 - "ASSESSMENT.Games.es#editar-juego"; -#elif L==2 - "ASSESSMENT.Games.en#edit-game"; -#elif L==3 - "ASSESSMENT.Games.en#edit-game"; -#elif L==4 - "ASSESSMENT.Games.es#editar-juego"; -#elif L==5 - "ASSESSMENT.Games.en#edit-game"; -#elif L==6 - "ASSESSMENT.Games.es#editar-juego"; -#elif L==7 - "ASSESSMENT.Games.en#edit-game"; -#elif L==8 - "ASSESSMENT.Games.en#edit-game"; -#elif L==9 - "ASSESSMENT.Games.en#edit-game"; -#endif - -const char *Hlp_ASSESSMENT_Games_new_game = -#if L==1 - "ASSESSMENT.Games.es#nuevo-juego"; -#elif L==2 - "ASSESSMENT.Games.en#new-game"; -#elif L==3 - "ASSESSMENT.Games.en#new-game"; -#elif L==4 - "ASSESSMENT.Games.es#nuevo-juego"; -#elif L==5 - "ASSESSMENT.Games.en#new-game"; -#elif L==6 - "ASSESSMENT.Games.es#nuevo-juego"; -#elif L==7 - "ASSESSMENT.Games.en#new-game"; -#elif L==8 - "ASSESSMENT.Games.en#new-game"; -#elif L==9 - "ASSESSMENT.Games.en#new-game"; -#endif - -const char *Hlp_ASSESSMENT_Games_edit_juego = -#if L==1 - "ASSESSMENT.Games.es#editar-juego"; -#elif L==2 - "ASSESSMENT.Games.en#edit-juego"; -#elif L==3 - "ASSESSMENT.Games.en#edit-juego"; -#elif L==4 - "ASSESSMENT.Games.es#editar-juego"; -#elif L==5 - "ASSESSMENT.Games.en#edit-juego"; -#elif L==6 - "ASSESSMENT.Games.es#editar-juego"; -#elif L==7 - "ASSESSMENT.Games.en#edit-juego"; -#elif L==8 - "ASSESSMENT.Games.en#edit-juego"; -#elif L==9 - "ASSESSMENT.Games.en#edit-juego"; -#endif - -const char *Hlp_ASSESSMENT_Games_matches = -#if L==1 - "ASSESSMENT.Games.es#partidas"; -#elif L==2 - "ASSESSMENT.Games.en#matches"; -#elif L==3 - "ASSESSMENT.Games.en#matches"; -#elif L==4 - "ASSESSMENT.Games.es#partidas"; -#elif L==5 - "ASSESSMENT.Games.en#matches"; -#elif L==6 - "ASSESSMENT.Games.es#partidas"; -#elif L==7 - "ASSESSMENT.Games.en#matches"; -#elif L==8 - "ASSESSMENT.Games.en#matches"; -#elif L==9 - "ASSESSMENT.Games.en#matches"; -#endif - -const char *Hlp_ASSESSMENT_Games_new_match = -#if L==1 - "ASSESSMENT.Games.es#nueva-partida"; -#elif L==2 - "ASSESSMENT.Games.en#new-match"; -#elif L==3 - "ASSESSMENT.Games.en#new-match"; -#elif L==4 - "ASSESSMENT.Games.es#nueva-partida"; -#elif L==5 - "ASSESSMENT.Games.en#new-match"; -#elif L==6 - "ASSESSMENT.Games.es#nueva-partida"; -#elif L==7 - "ASSESSMENT.Games.en#new-match"; -#elif L==8 - "ASSESSMENT.Games.en#new-match"; -#elif L==9 - "ASSESSMENT.Games.en#new-match"; -#endif - -const char *Hlp_ASSESSMENT_Games_questions = -#if L==1 - "ASSESSMENT.Games.es#preguntas"; -#elif L==2 - "ASSESSMENT.Games.en#questions"; -#elif L==3 - "ASSESSMENT.Games.en#questions"; -#elif L==4 - "ASSESSMENT.Games.es#preguntas"; -#elif L==5 - "ASSESSMENT.Games.en#questions"; -#elif L==6 - "ASSESSMENT.Games.es#preguntas"; -#elif L==7 - "ASSESSMENT.Games.en#questions"; -#elif L==8 - "ASSESSMENT.Games.en#questions"; -#elif L==9 - "ASSESSMENT.Games.en#questions"; -#endif - const char *Hlp_ASSESSMENT_Announcements = #if L==1 "ASSESSMENT.Announcements.es"; diff --git a/swad_match.c b/swad_match.c index 5e73ba0b6..dc178a87a 100644 --- a/swad_match.c +++ b/swad_match.c @@ -1175,7 +1175,7 @@ long Mch_GetParamMchCod (void) static void Mch_PutFormNewMatch (struct Game *Game) { - extern const char *Hlp_ASSESSMENT_Games_new_match; + extern const char *Hlp_ASSESSMENT_Games_matches; extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_New_match; extern const char *Txt_Title; @@ -1191,7 +1191,7 @@ static void Mch_PutFormNewMatch (struct Game *Game) /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_match,NULL, - Hlp_ASSESSMENT_Games_new_match,Box_NOT_CLOSABLE,2); + Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE,2); /***** Match title *****/ fprintf (Gbl.F.Out,"" diff --git a/swad_test.c b/swad_test.c index b9c81db87..27b7af8e2 100644 --- a/swad_test.c +++ b/swad_test.c @@ -1276,7 +1276,7 @@ static void Tst_UpdateLastAccTst (void) void Tst_ShowFormAskEditTsts (void) { - extern const char *Hlp_ASSESSMENT_Tests; + extern const char *Hlp_ASSESSMENT_Tests_editing_questions; extern const char *Txt_No_test_questions; extern const char *Txt_List_edit_questions; extern const char *Txt_Show_questions; @@ -1290,7 +1290,7 @@ void Tst_ShowFormAskEditTsts (void) /***** Start box *****/ Box_StartBox (NULL,Txt_List_edit_questions,Tst_PutIconsTests, - Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); + Hlp_ASSESSMENT_Tests_editing_questions,Box_NOT_CLOSABLE); /***** Get tags already present in the table of questions *****/ if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) @@ -1337,7 +1337,7 @@ void Tst_ShowFormAskEditTsts (void) void Tst_ShowFormAskSelectTstsForGame (void) { - extern const char *Hlp_ASSESSMENT_Tests; + extern const char *Hlp_ASSESSMENT_Games_questions; extern const char *Txt_No_test_questions; extern const char *Txt_Select_questions; extern const char *Txt_Show_questions; @@ -1346,7 +1346,7 @@ void Tst_ShowFormAskSelectTstsForGame (void) /***** Start box *****/ Box_StartBox (NULL,Txt_Select_questions,NULL, - Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); + Hlp_ASSESSMENT_Games_questions,Box_NOT_CLOSABLE); /***** Get tags already present in the table of questions *****/ if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) @@ -3052,7 +3052,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows, MYSQL_RES *mysql_res) { - extern const char *Hlp_ASSESSMENT_Tests; + extern const char *Hlp_ASSESSMENT_Games_questions; extern const char *Txt_Questions; extern const char *Txt_No_INDEX; extern const char *Txt_Code; @@ -3071,7 +3071,7 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows, /***** Start box *****/ Box_StartBox (NULL,Txt_Questions,NULL, - Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); + Hlp_ASSESSMENT_Games_questions,Box_NOT_CLOSABLE); /***** Start form *****/ Frm_StartForm (ActAddTstQstToGam);