Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-03 23:35:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.88.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-12-09 11:09:12 +01:00
parent cacc574dc2
commit f28b2a03b1
6 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -490,14 +490,15 @@ 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.88.1 (2019-12-08)" #define Log_PLATFORM_VERSION "SWAD 19.88.2 (2019-12-08)"
#define CSS_FILE "swad19.85.css" #define CSS_FILE "swad19.85.css"
#define JS_FILE "swad19.70.js" #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: 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: 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.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.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)

4
swad_game.c
View File

@ -596,12 +596,12 @@ static void Gam_PutIconToShowResultsOfGame (void)
switch (Gbl.Usrs.Me.Role.Logged) switch (Gbl.Usrs.Me.Role.Logged)
{ {
case Rol_STD: case Rol_STD:
Ico_PutContextualIconToShowResults (ActSeeMyMchResGam,McR_RESULTS_TABLE_ID,Gam_PutParams); Ico_PutContextualIconToShowResults (ActSeeMyMchResGam,McR_RESULTS_BOX_ID,Gam_PutParams);
break; break;
case Rol_NET: case Rol_NET:
case Rol_TCH: case Rol_TCH:
case Rol_SYS_ADM: case Rol_SYS_ADM:
Ico_PutContextualIconToShowResults (ActSeeAllMchResGam,McR_RESULTS_TABLE_ID,Gam_PutParams); Ico_PutContextualIconToShowResults (ActSeeAllMchResGam,McR_RESULTS_BOX_ID,Gam_PutParams);
break; break;
default: default:
break; break;

4
swad_match.c
View File

@ -762,7 +762,7 @@ static void Mch_ListOneOrMoreMatchesResultStd (const struct Match *Match)
/* Result is visible by me */ /* Result is visible by me */
Gam_SetCurrentGamCod (Match->GamCod); // Used to pass parameter Gam_SetCurrentGamCod (Match->GamCod); // Used to pass parameter
Mch_SetCurrentMchCod (Match->MchCod); // 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, Mch_PutParamsEdit,
"trophy.svg", "trophy.svg",
Txt_Results); Txt_Results);
@ -785,7 +785,7 @@ static void Mch_ListOneOrMoreMatchesResultTch (const struct Match *Match)
Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter
/* Show match results */ /* Show match results */
Lay_PutContextualLinkOnlyIcon (ActSeeAllMchResMch,McR_RESULTS_TABLE_ID, Lay_PutContextualLinkOnlyIcon (ActSeeAllMchResMch,McR_RESULTS_BOX_ID,
Mch_PutParamsEdit, Mch_PutParamsEdit,
"trophy.svg", "trophy.svg",
Txt_Results); Txt_Results);

9
swad_match_result.c
View File

@ -551,6 +551,7 @@ static void McR_ShowResultsBegin (const char *Title,bool ListGamesToSelect)
extern const char *Hlp_ASSESSMENT_Games_results; extern const char *Hlp_ASSESSMENT_Games_results;
/***** Begin box *****/ /***** Begin box *****/
HTM_SECTION_Begin (McR_RESULTS_BOX_ID);
Box_BoxBegin ("100%",Title,NULL, Box_BoxBegin ("100%",Title,NULL,
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
@ -558,19 +559,20 @@ static void McR_ShowResultsBegin (const char *Title,bool ListGamesToSelect)
if (ListGamesToSelect) if (ListGamesToSelect)
McR_ListGamesToSelect (); McR_ListGamesToSelect ();
/***** Start section with match results table *****/ /***** Begin match results table *****/
HTM_SECTION_Begin (McR_RESULTS_TABLE_ID); HTM_SECTION_Begin (McR_RESULTS_TABLE_ID);
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginWidePadding (2);
} }
static void McR_ShowResultsEnd (void) static void McR_ShowResultsEnd (void)
{ {
/***** End section with match results table *****/ /***** End match results table *****/
HTM_TABLE_End (); HTM_TABLE_End ();
HTM_SECTION_End (); HTM_SECTION_End ();
/***** End box *****/ /***** End box *****/
Box_BoxEnd (); Box_BoxEnd ();
HTM_SECTION_End ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -579,6 +581,7 @@ static void McR_ShowResultsEnd (void)
static void McR_ListGamesToSelect (void) static void McR_ListGamesToSelect (void)
{ {
extern const char *Hlp_ASSESSMENT_Games_results;
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES]; extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *Txt_Games; extern const char *Txt_Games;
extern const char *Txt_Game; extern const char *Txt_Game;
@ -588,7 +591,7 @@ static void McR_ListGamesToSelect (void)
struct Game Game; struct Game Game;
/***** Begin box *****/ /***** 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 /***** Begin form to update the results
depending on the games selected *****/ depending on the games selected *****/

1
swad_match_result.h
View File

@ -31,6 +31,7 @@
/************************** Public types and constants ***********************/ /************************** Public types and constants ***********************/
/*****************************************************************************/ /*****************************************************************************/
#define McR_RESULTS_BOX_ID "mcr_box"
#define McR_RESULTS_TABLE_ID "mcr_table" #define McR_RESULTS_TABLE_ID "mcr_table"
/*****************************************************************************/ /*****************************************************************************/

36
swad_text.c
View File

@ -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 const char *Txt_Results_of_game_X = // Warning: it is very important to include %s in the following sentences
#if L==1 // ca #if L==1 // ca
"Resultats del joc %s"; "Resultats del joc "%s"";
#elif L==2 // de #elif L==2 // de
"Ergebnisse von Spiel %s"; "Ergebnisse von Spiel "%s"";
#elif L==3 // en #elif L==3 // en
"Results of game %s"; "Results of game "%s"";
#elif L==4 // es #elif L==4 // es
"Resultados del juego %s"; "Resultados del juego "%s"";
#elif L==5 // fr #elif L==5 // fr
"Résultats du jeu %s"; "Résultats du jeu "%s"";
#elif L==6 // gn #elif L==6 // gn
"Resultados del juego %s"; // Okoteve traducción "Resultados del juego "%s""; // Okoteve traducción
#elif L==7 // it #elif L==7 // it
"Risultati del gioco %s"; "Risultati del gioco "%s"";
#elif L==8 // pl #elif L==8 // pl
"Wyniki gry %s"; "Wyniki gry "%s"";
#elif L==9 // pt #elif L==9 // pt
"Resultados do jogo %s"; "Resultados do jogo "%s"";
#endif #endif
const char *Txt_Results_of_match_X = // Warning: it is very important to include %s in the following sentences const char *Txt_Results_of_match_X = // Warning: it is very important to include %s in the following sentences
#if L==1 // ca #if L==1 // ca
"Resultats de la partida %s"; "Resultats de la partida "%s"";
#elif L==2 // de #elif L==2 // de
"Ergebnisse von Spiel %s"; "Ergebnisse von Spiel "%s"";
#elif L==3 // en #elif L==3 // en
"Results of match %s"; "Results of match "%s"";
#elif L==4 // es #elif L==4 // es
"Resultados de la partida %s"; "Resultados de la partida "%s"";
#elif L==5 // fr #elif L==5 // fr
"Résultats du match %s"; "Résultats du match "%s"";
#elif L==6 // gn #elif L==6 // gn
"Resultados de la partida %s"; // Okoteve traducción "Resultados de la partida "%s""; // Okoteve traducción
#elif L==7 // it #elif L==7 // it
"Risultati della partita %s"; "Risultati della partita "%s"";
#elif L==8 // pl #elif L==8 // pl
"Wyniki mecz %s"; "Wyniki mecz "%s"";
#elif L==9 // pt #elif L==9 // pt
"Resultados do jogo %s"; "Resultados do jogo "%s"";
#endif #endif
const char *Txt_results_per_page = const char *Txt_results_per_page =