mirror of https://github.com/acanas/swad-core.git
Version19.87.5
This commit is contained in:
parent
76a6927f53
commit
ae063cacfa
|
@ -490,7 +490,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
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 CSS_FILE "swad19.85.css"
|
||||||
#define JS_FILE "swad19.70.js"
|
#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: 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 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.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)
|
Version 19.87.3: Dec 08, 2019 Changes in layout of matches results. (247997 lines)
|
||||||
Copy the following icon to icon public directory:
|
Copy the following icon to icon public directory:
|
||||||
|
|
11
swad_game.c
11
swad_game.c
|
@ -396,6 +396,14 @@ void Gam_SeeOneGame (void)
|
||||||
void Gam_ShowOnlyOneGame (long GamCod,
|
void Gam_ShowOnlyOneGame (long GamCod,
|
||||||
bool ListGameQuestions,
|
bool ListGameQuestions,
|
||||||
bool PutFormNewMatch)
|
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 *Hlp_ASSESSMENT_Games;
|
||||||
extern const char *Txt_Game;
|
extern const char *Txt_Game;
|
||||||
|
@ -420,7 +428,10 @@ void Gam_ShowOnlyOneGame (long GamCod,
|
||||||
else
|
else
|
||||||
/***** List matches *****/
|
/***** List matches *****/
|
||||||
Mch_ListMatches (&Game,PutFormNewMatch);
|
Mch_ListMatches (&Game,PutFormNewMatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Gam_ShowOnlyOneGameEnd (void)
|
||||||
|
{
|
||||||
/***** End box *****/
|
/***** End box *****/
|
||||||
Box_BoxEnd ();
|
Box_BoxEnd ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,6 +84,10 @@ void Gam_SeeOneGame (void);
|
||||||
void Gam_ShowOnlyOneGame (long GamCod,
|
void Gam_ShowOnlyOneGame (long GamCod,
|
||||||
bool ListGameQuestions,
|
bool ListGameQuestions,
|
||||||
bool PutFormNewMatch);
|
bool PutFormNewMatch);
|
||||||
|
void Gam_ShowOnlyOneGameBegin (long GamCod,
|
||||||
|
bool ListGameQuestions,
|
||||||
|
bool PutFormNewMatch);
|
||||||
|
void Gam_ShowOnlyOneGameEnd (void);
|
||||||
void Gam_PutHiddenParamGameOrder (void);
|
void Gam_PutHiddenParamGameOrder (void);
|
||||||
void Gam_RequestCreatOrEditGame (void);
|
void Gam_RequestCreatOrEditGame (void);
|
||||||
|
|
||||||
|
|
|
@ -272,7 +272,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch)
|
||||||
|
|
||||||
/***** Begin box *****/
|
/***** Begin box *****/
|
||||||
Gam_SetParamCurrentGamCod (Game->GamCod); // Used to pass parameter
|
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);
|
Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE);
|
||||||
|
|
||||||
/***** Select whether show only my groups or all groups *****/
|
/***** Select whether show only my groups or all groups *****/
|
||||||
|
|
|
@ -207,7 +207,7 @@ void McR_ShowMyMchRes (void)
|
||||||
McR_BuildGamesSelectedCommas (&GamesSelectedCommas);
|
McR_BuildGamesSelectedCommas (&GamesSelectedCommas);
|
||||||
|
|
||||||
/***** Begin box *****/
|
/***** Begin box *****/
|
||||||
Box_BoxBegin (NULL,Txt_Results,NULL,
|
Box_BoxBegin ("100%",Txt_Results,NULL,
|
||||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
||||||
|
|
||||||
/***** List games to select *****/
|
/***** List games to select *****/
|
||||||
|
@ -253,13 +253,13 @@ void McR_ShowMyMchResInGame (void)
|
||||||
if (asprintf (&GamesSelectedCommas,"%ld",Game.GamCod) < 0)
|
if (asprintf (&GamesSelectedCommas,"%ld",Game.GamCod) < 0)
|
||||||
Lay_NotEnoughMemoryExit ();
|
Lay_NotEnoughMemoryExit ();
|
||||||
|
|
||||||
/***** Show game *****/
|
/***** Game begin *****/
|
||||||
Gam_ShowOnlyOneGame (Game.GamCod,
|
Gam_ShowOnlyOneGameBegin (Game.GamCod,
|
||||||
false, // Do not list game questions
|
false, // Do not list game questions
|
||||||
false); // Do not put form to start new match
|
false); // Do not put form to start new match
|
||||||
|
|
||||||
/***** Begin box *****/
|
/***** Begin box *****/
|
||||||
Box_BoxBegin (NULL,Txt_Results,NULL,
|
Box_BoxBegin ("100%",Txt_Results,NULL,
|
||||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
||||||
|
|
||||||
/***** Start section with match results table *****/
|
/***** Start section with match results table *****/
|
||||||
|
@ -278,6 +278,9 @@ void McR_ShowMyMchResInGame (void)
|
||||||
/***** End box *****/
|
/***** End box *****/
|
||||||
Box_BoxEnd ();
|
Box_BoxEnd ();
|
||||||
|
|
||||||
|
/***** Game end *****/
|
||||||
|
Gam_ShowOnlyOneGameEnd ();
|
||||||
|
|
||||||
/***** Free string with list of selected games separated by commas *****/
|
/***** Free string with list of selected games separated by commas *****/
|
||||||
free (GamesSelectedCommas);
|
free (GamesSelectedCommas);
|
||||||
}
|
}
|
||||||
|
@ -310,7 +313,7 @@ static void McR_ShowUsrsMchResults (void)
|
||||||
McR_BuildGamesSelectedCommas (&GamesSelectedCommas);
|
McR_BuildGamesSelectedCommas (&GamesSelectedCommas);
|
||||||
|
|
||||||
/***** Begin box *****/
|
/***** Begin box *****/
|
||||||
Box_BoxBegin (NULL,Txt_Results,NULL,
|
Box_BoxBegin ("100%",Txt_Results,NULL,
|
||||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
||||||
|
|
||||||
/***** List games to select *****/
|
/***** List games to select *****/
|
||||||
|
@ -371,13 +374,13 @@ void McR_ShowUsrsMchResultsInGame (void)
|
||||||
if (asprintf (&GamesSelectedCommas,"%ld",Game.GamCod) < 0)
|
if (asprintf (&GamesSelectedCommas,"%ld",Game.GamCod) < 0)
|
||||||
Lay_NotEnoughMemoryExit ();
|
Lay_NotEnoughMemoryExit ();
|
||||||
|
|
||||||
/***** Show game *****/
|
/***** Game begin *****/
|
||||||
Gam_ShowOnlyOneGame (Game.GamCod,
|
Gam_ShowOnlyOneGameBegin (Game.GamCod,
|
||||||
false, // Do not list game questions
|
false, // Do not list game questions
|
||||||
false); // Do not put form to start new match
|
false); // Do not put form to start new match
|
||||||
|
|
||||||
/***** Begin box *****/
|
/***** Begin box *****/
|
||||||
Box_BoxBegin (NULL,Txt_Results,NULL,
|
Box_BoxBegin ("100%",Txt_Results,NULL,
|
||||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
||||||
|
|
||||||
/***** Make database query *****/
|
/***** Make database query *****/
|
||||||
|
@ -423,6 +426,9 @@ void McR_ShowUsrsMchResultsInGame (void)
|
||||||
/***** End box *****/
|
/***** End box *****/
|
||||||
Box_BoxEnd ();
|
Box_BoxEnd ();
|
||||||
|
|
||||||
|
/***** Game end *****/
|
||||||
|
Gam_ShowOnlyOneGameEnd ();
|
||||||
|
|
||||||
/***** Free string with list of selected games separated by commas *****/
|
/***** Free string with list of selected games separated by commas *****/
|
||||||
free (GamesSelectedCommas);
|
free (GamesSelectedCommas);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue