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

Version18.138.6

This commit is contained in:
Antonio Cañas Vargas 2019-08-02 00:44:30 +02:00
parent 3224647ec9
commit 525d93dfd4
3 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -460,12 +460,12 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.138.5 (2019-08-01)" #define Log_PLATFORM_VERSION "SWAD 18.138.6 (2019-08-02)"
#define CSS_FILE "swad18.138.css" #define CSS_FILE "swad18.138.css"
#define JS_FILE "swad18.130.2.js" #define JS_FILE "swad18.130.2.js"
/* /*
Version 18.138.7: Aug 01, 2019 Time of current match and current match question are stored in database. (? lines) Version 18.138.7: Aug 01, 2019 Time of current match and current match question are stored in database. (? lines)
Version 18.138.6: Aug 01, 2019 Matches finished can be played again from list of matches. (? lines) Version 18.138.6: Aug 02, 2019 Matches finished can be played again from list of matches. (? lines)
Version 18.138.5: Aug 01, 2019 Finished column in matches replaced by a special value in question index. (244108 lines) Version 18.138.5: Aug 01, 2019 Finished column in matches replaced by a special value in question index. (244108 lines)
1 change necessary in database: 1 change necessary in database:
ALTER TABLE gam_matches DROP COLUMN Finished; ALTER TABLE gam_matches DROP COLUMN Finished;

68
swad_game.c
View File

@ -2788,7 +2788,6 @@ static void Gam_ListOneOrMoreMatches (struct Game *Game,
extern const char *Txt_Play; extern const char *Txt_Play;
extern const char *Txt_Resume; extern const char *Txt_Resume;
extern const char *Txt_Today; extern const char *Txt_Today;
extern const char *Txt_View_game_results;
unsigned NumMatch; unsigned NumMatch;
unsigned UniqueId; unsigned UniqueId;
struct Match Match; struct Match Match;
@ -2900,46 +2899,41 @@ static void Gam_ListOneOrMoreMatches (struct Game *Game,
/***** Match status ******/ /***** Match status ******/
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">",Gbl.RowEvenOdd);
if (Match.Status.QstInd >= Gam_AFTER_LAST_QUESTION) // Finished match
/* Icon to inform about finished match */ if (Match.Status.QstInd < Gam_AFTER_LAST_QUESTION) // Unfinished match
// Ico_PutIconOff ("flag-checkered.svg",Txt_Finished_match);
Lay_PutContextualLinkOnlyIcon (ActShoMchTch,NULL,
Gam_PutParamCurrentMchCod,
"flag-checkered.svg",
Txt_View_game_results);
else // Unfinished match
{
/* Current question index / total of questions */ /* Current question index / total of questions */
fprintf (Gbl.F.Out,"<div class=\"DAT\">%u/%u</div>", fprintf (Gbl.F.Out,"<div class=\"DAT\">%u/%u</div>",
Match.Status.QstInd,Game->NumQsts); Match.Status.QstInd,Game->NumQsts);
switch (Gbl.Usrs.Me.Role.Logged) switch (Gbl.Usrs.Me.Role.Logged)
{ {
case Rol_STD: case Rol_STD:
/* Icon to play as student */ /* Icon to play as student */
Gam_CurrentMchCod = Match.MchCod; Gam_CurrentMchCod = Match.MchCod;
Lay_PutContextualLinkOnlyIcon (ActPlyMchStd,NULL, Lay_PutContextualLinkOnlyIcon (ActPlyMchStd,NULL,
Gam_PutParamCurrentMchCod, Gam_PutParamCurrentMchCod,
"play.svg", Match.Status.QstInd < Gam_AFTER_LAST_QUESTION ? "play.svg" :
Txt_Play); "flag-checkered.svg",
break; Txt_Play);
case Rol_NET: break;
case Rol_TCH: case Rol_NET:
case Rol_DEG_ADM: case Rol_TCH:
case Rol_CTR_ADM: case Rol_DEG_ADM:
case Rol_INS_ADM: case Rol_CTR_ADM:
case Rol_SYS_ADM: case Rol_INS_ADM:
/* Icon to resume */ case Rol_SYS_ADM:
Gam_CurrentMchCod = Match.MchCod; /* Icon to resume */
Lay_PutContextualLinkOnlyIcon (ActResMchTch,NULL, Gam_CurrentMchCod = Match.MchCod;
Gam_PutParamCurrentMchCod, Lay_PutContextualLinkOnlyIcon (ActResMchTch,NULL,
"play.svg", Gam_PutParamCurrentMchCod,
Txt_Resume); Match.Status.QstInd < Gam_AFTER_LAST_QUESTION ? "play.svg" :
break; "flag-checkered.svg",
default: Txt_Resume);
break; break;
} default:
break;
} }
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");

4
swad_text.c
View File

@ -52659,7 +52659,7 @@ const char *Txt_View_game =
#elif L==9 // pt #elif L==9 // pt
"Ver jogo"; "Ver jogo";
#endif #endif
/*
const char *Txt_View_game_results = const char *Txt_View_game_results =
#if L==1 // ca #if L==1 // ca
"Veure resultats"; "Veure resultats";
@ -52680,7 +52680,7 @@ const char *Txt_View_game_results =
#elif L==9 // pt #elif L==9 // pt
"Ver resultados"; "Ver resultados";
#endif #endif
*/
const char *Txt_View_in_a_new_window = const char *Txt_View_in_a_new_window =
#if L==1 // ca #if L==1 // ca
"Mostrar en una finestra nova"; "Mostrar en una finestra nova";