From f28b2a03b144de9175587df04e7afeee86d04f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 9 Dec 2019 11:09:12 +0100 Subject: [PATCH] Version19.88.2 --- swad_changelog.h | 5 +++-- swad_game.c | 4 ++-- swad_match.c | 4 ++-- swad_match_result.c | 9 ++++++--- swad_match_result.h | 1 + swad_text.c | 36 ++++++++++++++++++------------------ 6 files changed, 32 insertions(+), 27 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 450447fbd..4af28ac09 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,14 +490,15 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.88.1 (2019-12-08)" +#define Log_PLATFORM_VERSION "SWAD 19.88.2 (2019-12-08)" #define CSS_FILE "swad19.85.css" #define JS_FILE "swad19.70.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Impedir la creación y edición de proyectos si no son editables. - Version 19.88.1: Dec 08, 2019 Changes in layoout of matches results. (248219 lines) + Version 19.88.2: Dec 08, 2019 Changes in matches results. (248224 lines) + Version 19.88.1: Dec 08, 2019 Changes in layout of matches results. (248219 lines) Version 19.88: Dec 08, 2019 Show matches results in a match. (248151 lines) Version 19.87.5: Dec 08, 2019 Results of a game are integrated in the box of that game. (248008 lines) Version 19.87.4: Dec 08, 2019 Code refactoring in games. (247989 lines) diff --git a/swad_game.c b/swad_game.c index 291b3d8e3..0033a1f67 100644 --- a/swad_game.c +++ b/swad_game.c @@ -596,12 +596,12 @@ static void Gam_PutIconToShowResultsOfGame (void) switch (Gbl.Usrs.Me.Role.Logged) { case Rol_STD: - Ico_PutContextualIconToShowResults (ActSeeMyMchResGam,McR_RESULTS_TABLE_ID,Gam_PutParams); + Ico_PutContextualIconToShowResults (ActSeeMyMchResGam,McR_RESULTS_BOX_ID,Gam_PutParams); break; case Rol_NET: case Rol_TCH: case Rol_SYS_ADM: - Ico_PutContextualIconToShowResults (ActSeeAllMchResGam,McR_RESULTS_TABLE_ID,Gam_PutParams); + Ico_PutContextualIconToShowResults (ActSeeAllMchResGam,McR_RESULTS_BOX_ID,Gam_PutParams); break; default: break; diff --git a/swad_match.c b/swad_match.c index 220d778ae..bcf6bec0c 100644 --- a/swad_match.c +++ b/swad_match.c @@ -762,7 +762,7 @@ static void Mch_ListOneOrMoreMatchesResultStd (const struct Match *Match) /* Result is visible by me */ Gam_SetCurrentGamCod (Match->GamCod); // Used to pass parameter Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter - Lay_PutContextualLinkOnlyIcon (ActSeeMyMchResMch,McR_RESULTS_TABLE_ID, + Lay_PutContextualLinkOnlyIcon (ActSeeMyMchResMch,McR_RESULTS_BOX_ID, Mch_PutParamsEdit, "trophy.svg", Txt_Results); @@ -785,7 +785,7 @@ static void Mch_ListOneOrMoreMatchesResultTch (const struct Match *Match) Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter /* Show match results */ - Lay_PutContextualLinkOnlyIcon (ActSeeAllMchResMch,McR_RESULTS_TABLE_ID, + Lay_PutContextualLinkOnlyIcon (ActSeeAllMchResMch,McR_RESULTS_BOX_ID, Mch_PutParamsEdit, "trophy.svg", Txt_Results); diff --git a/swad_match_result.c b/swad_match_result.c index 7b6dd157e..95e6b8f64 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -551,6 +551,7 @@ static void McR_ShowResultsBegin (const char *Title,bool ListGamesToSelect) extern const char *Hlp_ASSESSMENT_Games_results; /***** Begin box *****/ + HTM_SECTION_Begin (McR_RESULTS_BOX_ID); Box_BoxBegin ("100%",Title,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); @@ -558,19 +559,20 @@ static void McR_ShowResultsBegin (const char *Title,bool ListGamesToSelect) if (ListGamesToSelect) McR_ListGamesToSelect (); - /***** Start section with match results table *****/ + /***** Begin match results table *****/ HTM_SECTION_Begin (McR_RESULTS_TABLE_ID); HTM_TABLE_BeginWidePadding (2); } static void McR_ShowResultsEnd (void) { - /***** End section with match results table *****/ + /***** End match results table *****/ HTM_TABLE_End (); HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -579,6 +581,7 @@ static void McR_ShowResultsEnd (void) static void McR_ListGamesToSelect (void) { + extern const char *Hlp_ASSESSMENT_Games_results; extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES]; extern const char *Txt_Games; extern const char *Txt_Game; @@ -588,7 +591,7 @@ static void McR_ListGamesToSelect (void) struct Game Game; /***** Begin box *****/ - Box_BoxBegin (NULL,Txt_Games,NULL,NULL,Box_NOT_CLOSABLE); + Box_BoxBegin (NULL,Txt_Games,NULL,Hlp_ASSESSMENT_Games_results,Box_CLOSABLE); /***** Begin form to update the results depending on the games selected *****/ diff --git a/swad_match_result.h b/swad_match_result.h index 3a84f7a9e..8f65a27fe 100644 --- a/swad_match_result.h +++ b/swad_match_result.h @@ -31,6 +31,7 @@ /************************** Public types and constants ***********************/ /*****************************************************************************/ +#define McR_RESULTS_BOX_ID "mcr_box" #define McR_RESULTS_TABLE_ID "mcr_table" /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index dcb8dd4a2..d964bf9d8 100644 --- a/swad_text.c +++ b/swad_text.c @@ -33362,44 +33362,44 @@ const char *Txt_Results = const char *Txt_Results_of_game_X = // Warning: it is very important to include %s in the following sentences #if L==1 // ca - "Resultats del joc %s"; + "Resultats del joc "%s""; #elif L==2 // de - "Ergebnisse von Spiel %s"; + "Ergebnisse von Spiel "%s""; #elif L==3 // en - "Results of game %s"; + "Results of game "%s""; #elif L==4 // es - "Resultados del juego %s"; + "Resultados del juego "%s""; #elif L==5 // fr - "Résultats du jeu %s"; + "Résultats du jeu "%s""; #elif L==6 // gn - "Resultados del juego %s"; // Okoteve traducción + "Resultados del juego "%s""; // Okoteve traducción #elif L==7 // it - "Risultati del gioco %s"; + "Risultati del gioco "%s""; #elif L==8 // pl - "Wyniki gry %s"; + "Wyniki gry "%s""; #elif L==9 // pt - "Resultados do jogo %s"; + "Resultados do jogo "%s""; #endif const char *Txt_Results_of_match_X = // Warning: it is very important to include %s in the following sentences #if L==1 // ca - "Resultats de la partida %s"; + "Resultats de la partida "%s""; #elif L==2 // de - "Ergebnisse von Spiel %s"; + "Ergebnisse von Spiel "%s""; #elif L==3 // en - "Results of match %s"; + "Results of match "%s""; #elif L==4 // es - "Resultados de la partida %s"; + "Resultados de la partida "%s""; #elif L==5 // fr - "Résultats du match %s"; + "Résultats du match "%s""; #elif L==6 // gn - "Resultados de la partida %s"; // Okoteve traducción + "Resultados de la partida "%s""; // Okoteve traducción #elif L==7 // it - "Risultati della partita %s"; + "Risultati della partita "%s""; #elif L==8 // pl - "Wyniki mecz %s"; + "Wyniki mecz "%s""; #elif L==9 // pt - "Resultados do jogo %s"; + "Resultados do jogo "%s""; #endif const char *Txt_results_per_page =