");
Gam_ShowMatchStatusForTch (&Match);
@@ -3359,7 +3363,10 @@ static void Gam_UpdateMatchStatusInDB (struct Match *Match)
'N',
Match->MchCod,Gbl.Hierarchy.Crs.CrsCod);
- if (Match->Status.Finished)
+ if (Match->Status.BeingPlayed)
+ /* Update match as being played */
+ Gam_UpdateMatchAsBeingPlayed (Match->MchCod);
+ else
/* Update match as not being played */
Gam_SetMatchAsNotBeingPlayed (Match->MchCod);
}
@@ -3388,11 +3395,48 @@ void Gam_ResumeMatchTch (void)
Match.Status.ShowingAnswers = false; // Don't show answers in any case
Match.Status.BeingPlayed = true; // Resume match
-
- /* Update match status in database */
- Gam_UpdateMatchStatusInDB (&Match);
}
+ /***** Update match status in database *****/
+ Gam_UpdateMatchStatusInDB (&Match);
+
+ /***** Show current match status *****/
+ fprintf (Gbl.F.Out,"
");
+ Gam_ShowMatchStatusForTch (&Match);
+ fprintf (Gbl.F.Out,"
");
+ }
+
+/*****************************************************************************/
+/* Show previous match status (previous question, answers...) (by a teacher) */
+/*****************************************************************************/
+
+void Gam_PrevStatusMatchTch (void)
+ {
+ struct Match Match;
+
+ /***** Remove old players.
+ This function must be called before getting match status. *****/
+ Gam_RemoveOldPlayers ();
+
+ /***** Get data of the match from database *****/
+ Match.MchCod = Gbl.Games.MchCodBeingPlayed;
+ Gam_GetDataOfMatchByCod (&Match);
+
+ /***** If not yet finished, update status *****/
+ if (!Match.Status.Finished)
+ {
+ if (Match.Status.ShowingAnswers) // Showing answers currently
+ {
+ Match.Status.Finished = false; // Match is not finished
+ Match.Status.ShowingAnswers = false; // Do not show answers
+ }
+ else
+ Gam_SetMatchStatusToPrevQuestion (&Match);
+ }
+
+ /***** Update match status in database *****/
+ Gam_UpdateMatchStatusInDB (&Match);
+
/***** Show current match status *****/
fprintf (Gbl.F.Out,"
");
Gam_ShowMatchStatusForTch (&Match);
@@ -3430,17 +3474,43 @@ void Gam_NextStatusMatchTch (void)
Match.Status.ShowingAnswers = true; // Show answers
}
}
-
- /* Update match status in database */
- Gam_UpdateMatchStatusInDB (&Match);
}
+ /***** Update match status in database *****/
+ Gam_UpdateMatchStatusInDB (&Match);
+
/***** Show current match status *****/
fprintf (Gbl.F.Out,"
");
Gam_ShowMatchStatusForTch (&Match);
fprintf (Gbl.F.Out,"
");
}
+/*****************************************************************************/
+/******************* Set match status to previous question *******************/
+/*****************************************************************************/
+
+static void Gam_SetMatchStatusToPrevQuestion (struct Match *Match)
+ {
+ /***** Get index of the previous question *****/
+ Match->Status.QstInd = Gam_GetPrevQuestionIndexInGame (Match->GamCod,
+ Match->Status.QstInd);
+
+ if (Match->Status.QstInd) // Not first question
+ {
+ Match->Status.QstCod = Gam_GetQstCodFromQstInd (Match->GamCod,
+ Match->Status.QstInd);
+ Match->Status.Finished = false; // Match is not finished
+ }
+ else // No previous question
+ {
+ Match->Status.QstCod = -1L; // No previous questions
+ Match->Status.BeingPlayed = false; // Match is not being played
+ Match->Status.Finished = false; // Match is not finished
+ }
+
+ Match->Status.ShowingAnswers = false; // Don't show answers
+ }
+
/*****************************************************************************/
/********************* Set match status to next question *********************/
/*****************************************************************************/
@@ -3486,20 +3556,11 @@ static void Gam_ShowMatchStatusForTch (struct Match *Match)
Gam_ShowMatchTitleAndPlayers (Match);
/***** Bottom row *****/
- fprintf (Gbl.F.Out,"
");
-
if (!Match->Status.Finished &&
Match->Status.BeingPlayed)
- {
/* Show current question and possible answers */
Gam_ShowQuestionAndAnswersTch (Match);
- /* Update match as being played */
- Gam_UpdateMatchAsBeingPlayed (Match->MchCod);
- }
-
- fprintf (Gbl.F.Out,"
");
-
/* End right container */
fprintf (Gbl.F.Out,"
");
}
@@ -3533,9 +3594,10 @@ static void Gam_ShowMatchStatusForStd (struct Match *Match)
Gam_ShowMatchTitleAndPlayers (Match);
/***** Bottom row *****/
- fprintf (Gbl.F.Out,"
");
if (!Match->Status.Finished)
{
+ fprintf (Gbl.F.Out,"
");
+
/***** Update players ******/
Gam_RegisterMeAsPlayerInMatch (Match->MchCod);
@@ -3551,8 +3613,9 @@ static void Gam_ShowMatchStatusForStd (struct Match *Match)
Cfg_URL_ICON_PUBLIC,
Txt_Please_wait_,
Txt_Please_wait_);
+
+ fprintf (Gbl.F.Out,"
");
}
- fprintf (Gbl.F.Out,"
");
/* End right container */
fprintf (Gbl.F.Out,"
");
+
/* Write stem (row[1]) */
Tst_WriteQstStem (row[1],"MATCH_TCH_QST");
@@ -3754,6 +3869,8 @@ static void Gam_ShowQuestionAndAnswersTch (struct Match *Match)
Match->Status.QstInd,
Match->Status.QstCod,
"MATCH_TCH_QST",false); // Don't show result
+
+ fprintf (Gbl.F.Out,"
");
}
/*****************************************************************************/
@@ -3772,8 +3889,6 @@ static void Gam_ShowQuestionAndAnswersStd (struct Match *Match)
bool ErrorInIndex = false;
/***** Show question *****/
- fprintf (Gbl.F.Out,"");
-
/* Write buttons for answers? */
if (Match->Status.ShowingAnswers)
{
@@ -3864,8 +3979,6 @@ static void Gam_ShowQuestionAndAnswersStd (struct Match *Match)
else
Ale_ShowAlert (Ale_ERROR,"Type of answer not valid in a game.");
}
-
- fprintf (Gbl.F.Out,"
");
}
/*****************************************************************************/
@@ -3885,7 +3998,7 @@ static void Gam_PutBigButton (Act_Action_t NextAction,long MchCod,
and not lose clicks due to refresh */
fprintf (Gbl.F.Out,"![\"%s\"](\"%s/close.svg\"" "\\"%s\\"")
"
@@ -3946,7 +4059,7 @@ static void Gam_RemoveOldPlayers (void)
static void Gam_UpdateMatchAsBeingPlayed (long MchCod)
{
- /***** Insert me as match player *****/
+ /***** Insert match as being played *****/
DB_QueryREPLACE ("can not set match as being played",
"REPLACE gam_mch_being_played (MchCod) VALUE (%ld)",
MchCod);
@@ -4055,12 +4168,11 @@ void Gam_RefreshMatchTch (void)
Match.MchCod = Gbl.Games.MchCodBeingPlayed;
Gam_GetDataOfMatchByCod (&Match);
+ /***** Update match status in database *****/
+ Gam_UpdateMatchStatusInDB (&Match);
+
/***** Show current match status *****/
Gam_ShowMatchStatusForTch (&Match);
-
- /***** Update match as being played *****/
- if (Match.Status.BeingPlayed)
- Gam_UpdateMatchAsBeingPlayed (Match.MchCod);
}
/*****************************************************************************/
diff --git a/swad_game.h b/swad_game.h
index 558a2d94..0451de25 100644
--- a/swad_game.h
+++ b/swad_game.h
@@ -123,6 +123,7 @@ void Gam_RequestNewMatchTch (void);
void Gam_CreateNewMatchTch (void);
void Gam_RequestStartResumeMatchTch (void);
void Gam_ResumeMatchTch (void);
+void Gam_PrevStatusMatchTch (void);
void Gam_NextStatusMatchTch (void);
void Gam_ShowFinishedMatchResults (void);
diff --git a/swad_layout.c b/swad_layout.c
index 313059b0..993ba560 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -684,6 +684,7 @@ static void Lay_WriteScriptInit (void)
break;
case ActNewMchTch:
case ActResMchTch:
+ case ActPrvMchTch:
case ActCurMchTch:
case ActNxtMchTch:
case ActPlyMchStd:
@@ -804,6 +805,7 @@ static void Lay_WriteScriptParamsAJAX (void)
/* Parameters related with match refreshing (for teachers) */
case ActNewMchTch:
case ActResMchTch:
+ case ActPrvMchTch:
case ActCurMchTch:
case ActNxtMchTch:
fprintf (Gbl.F.Out,"var RefreshParamNxtActGam = \"act=%ld\";\n"
diff --git a/swad_text.c b/swad_text.c
index dd9829ea..0b9d5a09 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -29668,6 +29668,27 @@ const char *Txt_Presents =
"Presentes";
#endif
+const char *Txt_Previous_QUESTION =
+#if L==1 // ca
+ "Anterior";
+#elif L==2 // de
+ "Vorherige";
+#elif L==3 // en
+ "Previous";
+#elif L==4 // es
+ "Anterior";
+#elif L==5 // fr
+ "Précédente";
+#elif L==6 // gn
+ "Anterior"; // Okoteve traducción
+#elif L==7 // it
+ "Precedente";
+#elif L==8 // pl
+ "Poprzednie";
+#elif L==9 // pt
+ "Anterior";
+#endif
+
const char *Txt_Print =
#if L==1 // ca
"Imprimir";