diff --git a/swad_action.c b/swad_action.c index 0c706176c..8a1a492c1 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2152,7 +2152,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActReqNewMchTch */{1670,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Gam_RequestNewMatchTch ,NULL}, /* ActNewMchTch */{1671,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,Gam_CreateNewMatchTch ,Gam_RequestStartResumeMatchTch ,NULL}, /* ActResMchTch */{1785,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,Gam_GetMatchBeingPlayed ,Gam_RequestStartResumeMatchTch ,NULL}, - /* ActCurMchTch */{1789,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Gam_GetMatchBeingPlayed ,Gam_CurrentStatusMatchTch ,NULL}, + /* ActCurMchTch */{1789,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Gam_GetMatchBeingPlayed ,Gam_ResumeMatchTch ,NULL}, /* ActNxtMchTch */{1672,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Gam_GetMatchBeingPlayed ,Gam_NextStatusMatchTch ,NULL}, /* ActRefMchTch */{1788,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_RFRESH,Gam_GetMatchBeingPlayed ,Gam_RefreshMatchTch ,NULL}, /* ActShoMchTch */{1786,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Gam_ShowFinishedMatchResults ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index d78d00472..7b7efc38a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -458,10 +458,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.135 (2019-07-17)" +#define Log_PLATFORM_VERSION "SWAD 18.135.1 (2019-07-17)" #define CSS_FILE "swad18.132.2.css" #define JS_FILE "swad18.130.2.js" /* + Version 18.135.1: Jul 17, 2019 When a teacher resumes a match, no answers are shown. (243708 lines) Version 18.135: Jul 17, 2019 A match is put in pause for students when the teacher closes the tab. (243707 lines) 1 change necessary in database: CREATE TABLE IF NOT EXISTS gam_mch_being_played (MchCod INT NOT NULL,TS TIMESTAMP,UNIQUE INDEX(MchCod)); diff --git a/swad_game.c b/swad_game.c index cf17806b9..7dbb63943 100644 --- a/swad_game.c +++ b/swad_game.c @@ -3363,7 +3363,7 @@ static void Gam_UpdateMatchBeingPlayed (struct Match *Match) /** Show current match status (current question, answers...) (by a teacher) **/ /*****************************************************************************/ -void Gam_CurrentStatusMatchTch (void) +void Gam_ResumeMatchTch (void) { struct Match Match; long NxtQstInd; @@ -3392,11 +3392,11 @@ void Gam_CurrentStatusMatchTch (void) Match.Status.QstCod = -1L; // No more questions Match.Status.Finished = true; // Match is finished } - Match.Status.ShowingAnswers = false; // Don't show answers - - /* Update match status in database */ - Gam_UpdateMatchBeingPlayed (&Match); } + Match.Status.ShowingAnswers = false; // Don't show answers + + /* Update match status in database */ + Gam_UpdateMatchBeingPlayed (&Match); } /***** Show current match status *****/ @@ -3473,7 +3473,7 @@ void Gam_NextStatusMatchTch (void) Match.Status.Finished = false; // Match is not finished Match.Status.ShowingAnswers = true; // Show answers } - } + } /* Update match status in database */ Gam_UpdateMatchBeingPlayed (&Match); diff --git a/swad_game.h b/swad_game.h index b89a12472..86c56ba04 100644 --- a/swad_game.h +++ b/swad_game.h @@ -123,7 +123,7 @@ void Gam_RequestNewMatchTch (void); void Gam_CreateNewMatchTch (void); void Gam_RequestStartResumeMatchTch (void); -void Gam_CurrentStatusMatchTch (void); +void Gam_ResumeMatchTch (void); void Gam_NextStatusMatchTch (void); void Gam_ShowFinishedMatchResults (void);