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.3

This commit is contained in:
Antonio Cañas Vargas 2019-08-01 00:03:56 +02:00
parent 875b733100
commit 125bc3653f
2 changed files with 31 additions and 28 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
*/
#define Log_PLATFORM_VERSION "SWAD 18.138.2 (2019-07-31)"
#define Log_PLATFORM_VERSION "SWAD 18.138.3 (2019-07-31)"
#define CSS_FILE "swad18.138.css"
#define JS_FILE "swad18.130.2.js"
/*
Version 18.138.4: Jul 31, 2019 Time of current match and current match question are stored in database. (? lines)
Version 18.138.3: Jul 31, 2019 Buttons backward and start on finished games. (? lines)
Version 18.138.3: Jul 31, 2019 Button backward on finished match. (244118 lines)
Version 18.138.2: Jul 31, 2019 Changes in backward and forward behaviour and buttons in matches. (244111 lines)
Version 18.138.1: Jul 31, 2019 Close button in games always present.
Number of players in left column. (244117 lines)

55
swad_game.c
View File

@ -1878,7 +1878,7 @@ static unsigned Gam_GetNextQuestionIndexInGame (long GamCod,unsigned QstInd)
{
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NextQstInd = 0;
unsigned NextQstInd = INT_MAX; // End of questions has been reached
/***** Get next question index in a game from database *****/
// Although indexes are always continuous...
@ -3423,8 +3423,10 @@ void Gam_PrevStatusMatchTch (void)
Match.MchCod = Gbl.Games.MchCodBeingPlayed;
Gam_GetDataOfMatchByCod (&Match);
/***** If not yet finished, update status *****/
if (!Match.Status.Finished)
/***** Update status *****/
if (Match.Status.Finished)
Gam_SetMatchStatusToPrevQuestion (&Match);
else
{
if (Match.Status.ShowingAnswers) // Showing answers currently
{
@ -3495,20 +3497,19 @@ 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.ShowingAnswers = true; // Show answers
}
else // No previous question
if (Match->Status.QstInd == 0) // Start of questions has been reached
{
Match->Status.QstCod = -1L; // No previous questions
Match->Status.BeingPlayed = false; // Match is not being played
Match->Status.ShowingAnswers = false; // Do not show answers
}
else
{
Match->Status.QstCod = Gam_GetQstCodFromQstInd (Match->GamCod,
Match->Status.QstInd);
Match->Status.BeingPlayed = true; // Match is being played
Match->Status.ShowingAnswers = true; // Show answers
}
Match->Status.Finished = false; // Match is not finished
}
@ -3521,19 +3522,17 @@ static void Gam_SetMatchStatusToNextQuestion (struct Match *Match)
/***** Get index of the next question *****/
Match->Status.QstInd = Gam_GetNextQuestionIndexInGame (Match->GamCod,
Match->Status.QstInd);
if (Match->Status.QstInd) // Not last question
if (Match->Status.QstInd == INT_MAX) // End of questions has been reached
{
Match->Status.QstCod = -1L; // No more questions
Match->Status.Finished = true; // Match is finished
}
else // No more questions
{
Match->Status.QstCod = Gam_GetQstCodFromQstInd (Match->GamCod,
Match->Status.QstInd);
Match->Status.Finished = false; // Match is not finished
}
else // No more questions
{
Match->Status.QstCod = -1L; // No more questions
Match->Status.Finished = true; // Match is finished
}
Match->Status.ShowingAnswers = false; // Don't show answers
}
@ -3663,7 +3662,11 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
/* Left button */
fprintf (Gbl.F.Out,"<div class=\"MATCH_BUTTON_LEFT_CONTAINER\">");
if (!Match->Status.Finished) // Not finished
if (Match->Status.Finished) // Finished
/* Put button to show last question */
Gam_PutBigButton (ActPrvMchTch,Match->MchCod,
"step-backward.svg",Txt_Previous_QUESTION);
else // Not finished
{
if (Match->Status.BeingPlayed)
{
@ -3704,14 +3707,14 @@ static void Gam_ShowLeftColumnTch (struct Match *Match)
/* Get index of the next question */
NxtQstInd = Gam_GetNextQuestionIndexInGame (Match->GamCod,
Match->Status.QstInd);
if (NxtQstInd) // Not last question
/* Put button to show next question */
Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
"step-forward.svg",Txt_Next_QUESTION);
else // Last question
if (NxtQstInd == INT_MAX) // Last question
/* Put button to finish */
Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
"flag-checkered.svg",Txt_Finish);
else // Not last question
/* Put button to show next question */
Gam_PutBigButton (ActNxtMchTch,Match->MchCod,
"step-forward.svg",Txt_Next_QUESTION);
}
else
/* Put button to show answers */