From 3a8f49e20426014076cdbc5c320bf5007b56360b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 8 Dec 2019 15:03:40 +0100 Subject: [PATCH] Version19.87.3 --- icon/trophy.svg | 1 + swad_changelog.h | 8 ++++++-- swad_icon.c | 2 +- swad_match_result.c | 43 +++++++++++++++++++------------------------ 4 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 icon/trophy.svg diff --git a/icon/trophy.svg b/icon/trophy.svg new file mode 100644 index 00000000..b81fb068 --- /dev/null +++ b/icon/trophy.svg @@ -0,0 +1 @@ + diff --git a/swad_changelog.h b/swad_changelog.h index 73f6b53c..e8670e41 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,15 +490,19 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.87.1 (2019-12-07)" +#define Log_PLATFORM_VERSION "SWAD 19.87.3 (2019-12-07)" #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. // TODO: En cada partida, poder listar los resultados en una tabla como la de resultados globales -// TODO: En el resultado detallado de una partida, cambiar título "Resultado de una partida" por el título de la partida + Version 19.87.3: Dec 08, 2019 Changes in layout of matches results. (247997 lines) + Copy the following icon to icon public directory: +sudo cp -a icon/trophy.svg /var/www/html/swad/icon/ + + Version 19.87.2: Dec 08, 2019 Fixed bug in results of matches. (247995 lines) Version 19.87.1: Dec 08, 2019 Changes and bug fixing in results of matches. (248000 lines) Version 19.87: Dec 08, 2019 Show matches results in a game for all students. (247990 lines) Version 19.86.1: Dec 07, 2019 Show matches results in a game for a student. (247901 lines) diff --git a/swad_icon.c b/swad_icon.c index c37115f9..ee9c8195 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -331,7 +331,7 @@ void Ico_PutContextualIconToShowResults (Act_Action_t NextAction,const char *Anc extern const char *Txt_Results; Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,FuncParams, - "tasks.svg", + "trophy.svg", Txt_Results); } diff --git a/swad_match_result.c b/swad_match_result.c index b30a0bee..166c1ffe 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -199,7 +199,6 @@ void McR_ShowMyMchRes (void) extern const char *Hlp_ASSESSMENT_Games_results; extern const char *Hlp_ASSESSMENT_Games_results; extern const char *Txt_Results; - extern const char *Txt_No_games; char *GamesSelectedCommas = NULL; // Initialized to avoid warning /***** Get list of games *****/ @@ -207,30 +206,28 @@ void McR_ShowMyMchRes (void) Gam_GetListSelectedGamCods (); McR_BuildGamesSelectedCommas (&GamesSelectedCommas); - if (Gbl.Games.NumSelected) - { - /***** Begin box *****/ - Box_BoxBegin (NULL,Txt_Results,NULL, - Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); + /***** Begin box *****/ + Box_BoxBegin (NULL,Txt_Results,NULL, + Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); - /***** Start section with match results table *****/ - HTM_SECTION_Begin (McR_RESULTS_TABLE_ID); - HTM_TABLE_BeginWidePadding (2); - McR_ShowHeaderMchResults (Usr_ME); + /***** List games to select *****/ + McR_ListGamesToSelect (); - /***** List my matches results *****/ - Tst_GetConfigTstFromDB (); // Get feedback type - McR_ShowMchResults (Usr_ME,GamesSelectedCommas); + /***** Start section with match results table *****/ + HTM_SECTION_Begin (McR_RESULTS_TABLE_ID); + HTM_TABLE_BeginWidePadding (2); + McR_ShowHeaderMchResults (Usr_ME); - /***** End section with match results table *****/ - HTM_TABLE_End (); - HTM_SECTION_End (); + /***** List my matches results *****/ + Tst_GetConfigTstFromDB (); // Get feedback type + McR_ShowMchResults (Usr_ME,GamesSelectedCommas); - /***** End box *****/ - Box_BoxEnd (); - } - else - Ale_ShowAlert (Ale_WARNING,Txt_No_games); + /***** End section with match results table *****/ + HTM_TABLE_End (); + HTM_SECTION_End (); + + /***** End box *****/ + Box_BoxEnd (); /***** Free list of games *****/ free (GamesSelectedCommas); @@ -247,7 +244,6 @@ void McR_ShowMyMchResInGame (void) extern const char *Hlp_ASSESSMENT_Games_results; extern const char *Hlp_ASSESSMENT_Games_results; extern const char *Txt_Results; - extern const char *Txt_No_games; struct Game Game; char *GamesSelectedCommas; @@ -306,7 +302,6 @@ static void McR_ShowUsrsMchResults (void) { extern const char *Hlp_ASSESSMENT_Games_results; extern const char *Txt_Results; - extern const char *Txt_No_games; char *GamesSelectedCommas = NULL; // Initialized to avoid warning const char *Ptr; @@ -993,7 +988,7 @@ void McR_ShowOneMchResult (void) &NumQsts,&NumQstsNotBlank); /***** Begin box *****/ - Box_BoxBegin (NULL,Txt_Match_result,NULL, + Box_BoxBegin (NULL,Match.Title,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (false,false, Gbl.Hierarchy.Ins.InsCod,