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.5

This commit is contained in:
Antonio Cañas Vargas 2019-12-08 17:08:15 +01:00
parent 76a6927f53
commit ae063cacfa
5 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -490,7 +490,7 @@ 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.4 (2019-12-07)"
#define Log_PLATFORM_VERSION "SWAD 19.87.5 (2019-12-07)"
#define CSS_FILE "swad19.85.css"
#define JS_FILE "swad19.70.js"
/*
@ -498,6 +498,7 @@ ps2pdf source.ps destination.pdf
// 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
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)
Version 19.87.3: Dec 08, 2019 Changes in layout of matches results. (247997 lines)
Copy the following icon to icon public directory:

11
swad_game.c
View File

@ -396,6 +396,14 @@ void Gam_SeeOneGame (void)
void Gam_ShowOnlyOneGame (long GamCod,
bool ListGameQuestions,
bool PutFormNewMatch)
{
Gam_ShowOnlyOneGameBegin (GamCod,ListGameQuestions,PutFormNewMatch);
Gam_ShowOnlyOneGameEnd ();
}
void Gam_ShowOnlyOneGameBegin (long GamCod,
bool ListGameQuestions,
bool PutFormNewMatch)
{
extern const char *Hlp_ASSESSMENT_Games;
extern const char *Txt_Game;
@ -420,7 +428,10 @@ void Gam_ShowOnlyOneGame (long GamCod,
else
/***** List matches *****/
Mch_ListMatches (&Game,PutFormNewMatch);
}
void Gam_ShowOnlyOneGameEnd (void)
{
/***** End box *****/
Box_BoxEnd ();
}

4
swad_game.h
View File

@ -84,6 +84,10 @@ void Gam_SeeOneGame (void);
void Gam_ShowOnlyOneGame (long GamCod,
bool ListGameQuestions,
bool PutFormNewMatch);
void Gam_ShowOnlyOneGameBegin (long GamCod,
bool ListGameQuestions,
bool PutFormNewMatch);
void Gam_ShowOnlyOneGameEnd (void);
void Gam_PutHiddenParamGameOrder (void);
void Gam_RequestCreatOrEditGame (void);

2
swad_match.c
View File

@ -272,7 +272,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch)
/***** Begin box *****/
Gam_SetParamCurrentGamCod (Game->GamCod); // Used to pass parameter
Box_BoxBegin (NULL,Txt_Matches,Mch_PutIconsInListOfMatches,
Box_BoxBegin ("100%",Txt_Matches,Mch_PutIconsInListOfMatches,
Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE);
/***** Select whether show only my groups or all groups *****/

30
swad_match_result.c
View File

@ -207,7 +207,7 @@ void McR_ShowMyMchRes (void)
McR_BuildGamesSelectedCommas (&GamesSelectedCommas);
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Results,NULL,
Box_BoxBegin ("100%",Txt_Results,NULL,
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
/***** List games to select *****/
@ -253,13 +253,13 @@ void McR_ShowMyMchResInGame (void)
if (asprintf (&GamesSelectedCommas,"%ld",Game.GamCod) < 0)
Lay_NotEnoughMemoryExit ();
/***** Show game *****/
Gam_ShowOnlyOneGame (Game.GamCod,
false, // Do not list game questions
false); // Do not put form to start new match
/***** Game begin *****/
Gam_ShowOnlyOneGameBegin (Game.GamCod,
false, // Do not list game questions
false); // Do not put form to start new match
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Results,NULL,
Box_BoxBegin ("100%",Txt_Results,NULL,
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
/***** Start section with match results table *****/
@ -278,6 +278,9 @@ void McR_ShowMyMchResInGame (void)
/***** End box *****/
Box_BoxEnd ();
/***** Game end *****/
Gam_ShowOnlyOneGameEnd ();
/***** Free string with list of selected games separated by commas *****/
free (GamesSelectedCommas);
}
@ -310,7 +313,7 @@ static void McR_ShowUsrsMchResults (void)
McR_BuildGamesSelectedCommas (&GamesSelectedCommas);
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Results,NULL,
Box_BoxBegin ("100%",Txt_Results,NULL,
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
/***** List games to select *****/
@ -371,13 +374,13 @@ void McR_ShowUsrsMchResultsInGame (void)
if (asprintf (&GamesSelectedCommas,"%ld",Game.GamCod) < 0)
Lay_NotEnoughMemoryExit ();
/***** Show game *****/
Gam_ShowOnlyOneGame (Game.GamCod,
false, // Do not list game questions
false); // Do not put form to start new match
/***** Game begin *****/
Gam_ShowOnlyOneGameBegin (Game.GamCod,
false, // Do not list game questions
false); // Do not put form to start new match
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Results,NULL,
Box_BoxBegin ("100%",Txt_Results,NULL,
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
/***** Make database query *****/
@ -423,6 +426,9 @@ void McR_ShowUsrsMchResultsInGame (void)
/***** End box *****/
Box_BoxEnd ();
/***** Game end *****/
Gam_ShowOnlyOneGameEnd ();
/***** Free string with list of selected games separated by commas *****/
free (GamesSelectedCommas);
}