From 2fa29b657be4a915ce8f8f746324aa4e440c98aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 18 Sep 2019 21:26:35 +0200 Subject: [PATCH] Version19.6.3 --- swad_changelog.h | 6 ++++- swad_help_URL.c | 20 +++++++-------- swad_match.c | 4 +-- swad_test.c | 40 +++++++++++++++--------------- swad_text.c | 63 ++++++++++++++++-------------------------------- 5 files changed, 58 insertions(+), 75 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 5d9455940..200871e38 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -441,6 +441,9 @@ Lo de mutear anuncios, en principio prefiero hacer una opci // TODO: Al confirmar una inscripción, mostrar ficha de retroalimentación similar a la que se muestra cuando se crea un administrador. Tal y como está ahora crea confusión al usuario. +// TODO: En Eventos de asistencia, poner un icono de enlace a horario de la asignatura ¿y otro a grupos? +// TODO: Reportado por Javier Fernández Baldomero. Un profesor debería poder cambiar la foto de un estudiante confirmado. Sale el icono, pero luego dice ue no hay permiso + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ @@ -459,10 +462,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.6.2 (2019-09-17)" +#define Log_PLATFORM_VERSION "SWAD 19.6.3 (2019-09-18)" #define CSS_FILE "swad19.3.css" #define JS_FILE "swad18.130.2.js" /* + Version 19.6.3: Sep 18, 2019 Change in text for test results and matches results. (244632 lines) Version 19.6.2: Sep 17, 2019 Link to see the matches results. Not finished. (244649 lines) Version 19.6.1: Sep 17, 2019 Fixed bug while removing a game. (244601 lines) Version 19.6: Sep 17, 2019 Remove actions to reset a game. (244600 lines) diff --git a/swad_help_URL.c b/swad_help_URL.c index 149dbd15b..d572297f2 100644 --- a/swad_help_URL.c +++ b/swad_help_URL.c @@ -1222,25 +1222,25 @@ const char *Hlp_ASSESSMENT_Tests_writing_a_question = "ASSESSMENT.Tests.en#writing-a-question"; #endif -const char *Hlp_ASSESSMENT_Tests_test_results = +const char *Hlp_ASSESSMENT_Tests_results = #if L==1 - "ASSESSMENT.Tests.es#resultados-de-tests"; + "ASSESSMENT.Tests.es#resultados-de-tests"; // TODO: Change to #resultados #elif L==2 - "ASSESSMENT.Tests.en#test-results"; + "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results #elif L==3 - "ASSESSMENT.Tests.en#test-results"; + "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results #elif L==4 - "ASSESSMENT.Tests.es#resultados-de-tests"; + "ASSESSMENT.Tests.es#resultados-de-tests"; // TODO: Change to #resultados #elif L==5 - "ASSESSMENT.Tests.en#test-results"; + "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results #elif L==6 - "ASSESSMENT.Tests.es#resultados-de-tests"; + "ASSESSMENT.Tests.es#resultados-de-tests"; // TODO: Change to #resultados #elif L==7 - "ASSESSMENT.Tests.en#test-results"; + "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results #elif L==8 - "ASSESSMENT.Tests.en#test-results"; + "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results #elif L==9 - "ASSESSMENT.Tests.en#test-results"; + "ASSESSMENT.Tests.en#test-results"; // TODO: Change to #results #endif const char *Hlp_ASSESSMENT_Surveys = diff --git a/swad_match.c b/swad_match.c index 08b4bb9fe..44d9b865e 100644 --- a/swad_match.c +++ b/swad_match.c @@ -2444,11 +2444,11 @@ static void Mch_DrawBarNumUsrs (unsigned NumAnswerersAns,unsigned NumAnswerersQs void Mch_PutFormToViewResultsOfMatches (Act_Action_t Action) { - extern const char *Txt_Matches_results; + extern const char *Txt_Results; fprintf (Gbl.F.Out,"
"); Lay_PutContextualLinkIconText (Action,NULL,NULL, "tasks.svg", - Txt_Matches_results); + Txt_Results); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_test.c b/swad_test.c index 718874a74..d338393fe 100644 --- a/swad_test.c +++ b/swad_test.c @@ -409,12 +409,12 @@ void Tst_ShowFormAskTst (void) static void Tst_PutFormToViewResultsOfUsersTests (Act_Action_t Action) { - extern const char *Txt_Test_results; + extern const char *Txt_Results; fprintf (Gbl.F.Out,"
"); Lay_PutContextualLinkIconText (Action,NULL,NULL, "tasks.svg", - Txt_Test_results); + Txt_Results); fprintf (Gbl.F.Out,"
"); } @@ -7318,9 +7318,9 @@ static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Hie_Level_t Scope,Ts void Tst_SelUsrsToSeeUsrsTestResults (void) { - extern const char *Hlp_ASSESSMENT_Tests_test_results; + extern const char *Hlp_ASSESSMENT_Tests_results; extern const char *The_ClassFormInBox[The_NUM_THEMES]; - extern const char *Txt_Test_results; + extern const char *Txt_Results; extern const char *Txt_Users; extern const char *Txt_View_test_results; unsigned NumTotalUsrs; @@ -7342,8 +7342,8 @@ void Tst_SelUsrsToSeeUsrsTestResults (void) Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; /***** Start box *****/ - Box_StartBox (NULL,Txt_Test_results,NULL, - Hlp_ASSESSMENT_Tests_test_results,Box_NOT_CLOSABLE); + Box_StartBox (NULL,Txt_Results,NULL, + Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE); /***** Show form to select the groups *****/ Grp_ShowFormToSelectSeveralGroups (NULL, @@ -7420,16 +7420,16 @@ void Tst_SelUsrsToSeeUsrsTestResults (void) void Tst_SelDatesToSeeMyTestResults (void) { - extern const char *Hlp_ASSESSMENT_Tests_test_results; - extern const char *Txt_Test_results; + extern const char *Hlp_ASSESSMENT_Tests_results; + extern const char *Txt_Results; extern const char *Txt_View_test_results; /***** Start form *****/ Frm_StartForm (ActSeeMyTstRes); /***** Start box and table *****/ - Box_StartBoxTable (NULL,Txt_Test_results,NULL, - Hlp_ASSESSMENT_Tests_test_results,Box_NOT_CLOSABLE,2); + Box_StartBoxTable (NULL,Txt_Results,NULL, + Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); /***** End table, send button and end box *****/ @@ -7483,8 +7483,8 @@ static void Tst_StoreScoreOfTestResultInDB (long TstCod, void Tst_ShowUsrsTestResults (void) { - extern const char *Hlp_ASSESSMENT_Tests_test_results; - extern const char *Txt_Test_results; + extern const char *Hlp_ASSESSMENT_Tests_results; + extern const char *Txt_Results; extern const char *Txt_You_must_select_one_ore_more_users; const char *Ptr; @@ -7498,8 +7498,8 @@ void Tst_ShowUsrsTestResults (void) if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected... { /***** Start box and table *****/ - Box_StartBoxTable (NULL,Txt_Test_results,NULL, - Hlp_ASSESSMENT_Tests_test_results,Box_NOT_CLOSABLE,2); + Box_StartBoxTable (NULL,Txt_Results,NULL, + Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); /***** Header of the table with the list of users *****/ Tst_ShowHeaderTestResults (); @@ -7586,15 +7586,15 @@ static void Tst_ShowHeaderTestResults (void) void Tst_ShowMyTestResults (void) { - extern const char *Hlp_ASSESSMENT_Tests_test_results; - extern const char *Txt_Test_results; + extern const char *Hlp_ASSESSMENT_Tests_results; + extern const char *Txt_Results; /***** Get starting and ending dates *****/ Dat_GetIniEndDatesFromForm (); /***** Start box and table *****/ - Box_StartBoxTable (NULL,Txt_Test_results,NULL, - Hlp_ASSESSMENT_Tests_test_results,Box_NOT_CLOSABLE,2); + Box_StartBoxTable (NULL,Txt_Results,NULL, + Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); /***** Header of the table with the list of users *****/ Tst_ShowHeaderTestResults (); @@ -8001,7 +8001,7 @@ static void Tst_ShowTestResultsSummaryRow (bool ItsMe, void Tst_ShowOneTestResult (void) { - extern const char *Hlp_ASSESSMENT_Tests_test_results; + extern const char *Hlp_ASSESSMENT_Tests_results; extern const char *Txt_Test_result; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Date; @@ -8081,7 +8081,7 @@ void Tst_ShowOneTestResult (void) /***** Start box *****/ Box_StartBox (NULL,Txt_Test_result,NULL, - Hlp_ASSESSMENT_Tests_test_results,Box_NOT_CLOSABLE); + Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (false,false, Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Deg.DegCod, diff --git a/swad_text.c b/swad_text.c index f3086ef97..efbbc2176 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18057,27 +18057,6 @@ const char *Txt_Matches = // of a game "Partidas"; #endif -const char *Txt_Matches_results = -#if L==1 // ca - "Resultats de partides"; -#elif L==2 // de - "Spielergebnisse"; -#elif L==3 // en - "Matches results"; -#elif L==4 // es - "Resultados de las partidas"; -#elif L==5 // fr - "Résultats des matchs"; -#elif L==6 // gn - "Resultados de las partidas"; // Okoteve traducción -#elif L==7 // it - "Risultati delle partite"; -#elif L==8 // pl - "Wyniki meczów"; -#elif L==9 // pt - "Resultados das partidas"; -#endif - const char *Txt_Materials = #if L==1 // ca "Materials"; @@ -33257,6 +33236,27 @@ const char *Txt_Reset_survey = "Reiniciar inquérito"; #endif +const char *Txt_Results = +#if L==1 // ca + "Resultats"; +#elif L==2 // de + "Ergebnisse"; +#elif L==3 // en + "Results"; +#elif L==4 // es + "Resultados"; +#elif L==5 // fr + "Résultats"; +#elif L==6 // gn + "Resultados"; // Okoteve traducción +#elif L==7 // it + "Risultati"; +#elif L==8 // pl + "Wyniki"; +#elif L==9 // pt + "Resultados"; +#endif + const char *Txt_results_per_page = #if L==1 // ca "resultats per pàgina"; @@ -42883,27 +42883,6 @@ const char *Txt_Test_result = "Resultado do teste"; #endif -const char *Txt_Test_results = -#if L==1 // ca - "Resultats de tests"; -#elif L==2 // de - "Testergebnisse"; -#elif L==3 // en - "Test results"; -#elif L==4 // es - "Resultados de los test"; -#elif L==5 // fr - "Résultats des tests"; -#elif L==6 // gn - "Resultados de los test"; // Okoteve traducción -#elif L==7 // it - "Risultati dei test"; -#elif L==8 // pl - "Wyniki testów"; -#elif L==9 // pt - "Resultados dos testes"; -#endif - const char *Txt_Text = #if L==1 // ca "Text";