Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.87.3

This commit is contained in:
Antonio Cañas Vargas 2019-12-08 15:03:40 +01:00
parent 366f44f0ec
commit 3a8f49e204
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
icon/trophy.svg Normal file
View File

@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="trophy" class="svg-inline--fa fa-trophy fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="#404040" d="M552 64H448V24c0-13.3-10.7-24-24-24H152c-13.3 0-24 10.7-24 24v40H24C10.7 64 0 74.7 0 88v56c0 35.7 22.5 72.4 61.9 100.7 31.5 22.7 69.8 37.1 110 41.7C203.3 338.5 240 360 240 360v72h-48c-35.3 0-64 20.7-64 56v12c0 6.6 5.4 12 12 12h296c6.6 0 12-5.4 12-12v-12c0-35.3-28.7-56-64-56h-48v-72s36.7-21.5 68.1-73.6c40.3-4.6 78.6-19 110-41.7 39.3-28.3 61.9-65 61.9-100.7V88c0-13.3-10.7-24-24-24zM99.3 192.8C74.9 175.2 64 155.6 64 144v-16h64.2c1 32.6 5.8 61.2 12.8 86.2-15.1-5.2-29.2-12.4-41.7-21.4zM512 144c0 16.1-17.7 36.1-35.3 48.8-12.5 9-26.7 16.2-41.8 21.4 7-25 11.8-53.6 12.8-86.2H512v16z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 808 B

8
swad_changelog.h
View File

@ -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)

2
swad_icon.c
View File

@ -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);
}

43
swad_match_result.c
View File

@ -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,