diff --git a/swad_changelog.h b/swad_changelog.h index 679be11cc..393ba0b91 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -250,14 +250,17 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.254.1 (2017-09-13)" +#define Log_PLATFORM_VERSION "SWAD 16.254.2 (2017-09-13)" #define CSS_FILE "swad16.252.2.css" #define JS_FILE "swad16.206.3.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* - Version 16.254.1: Sep 12, 2017 Icon to start playing a game. (227122 lines) + Version 16.254.2: Sep 13, 2017 Removed notifications in games. + Start playing a game. + Changes in pagination in games. (227141 lines) + Version 16.254.1: Sep 13, 2017 Icon to start playing a game. (227122 lines) Copy the following icon to icon public directory: sudo cp icon/play64x64.png /var/www/html/swad/icon/ diff --git a/swad_game.c b/swad_game.c index f37c42d13..473581eef 100644 --- a/swad_game.c +++ b/swad_game.c @@ -36,7 +36,6 @@ #include "swad_game.h" #include "swad_global.h" #include "swad_group.h" -#include "swad_notification.h" #include "swad_pagination.h" #include "swad_parameter.h" #include "swad_role.h" @@ -89,7 +88,10 @@ static void Gam_PutButtonToCreateNewGame (void); static void Gam_PutParamsToCreateNewGame (void); static void Gam_PutFormToSelectWhichGroupsToShow (void); static void Gam_ParamsWhichGroupsToShow (void); -static void Gam_ShowOneGame (long GamCod,bool ShowOnlyThisGameComplete); +static void Gam_ShowOneGame (long GamCod, + bool ShowOnlyThisGame, + bool ListGameQuestions, + bool PutButtonToStart); static void Gam_WriteAuthor (struct Game *Game); static void Gam_WriteStatus (struct Game *Game); static void Gam_GetParamGameOrder (void); @@ -107,8 +109,7 @@ static void Gam_PutButtonToResetGame (void); static bool Gam_CheckIfSimilarGameExists (struct Game *Game); static void Gam_SetDefaultAndAllowedScope (struct Game *Game); static void Gam_ShowLstGrpsToEditGame (long GamCod); -static void Gam_UpdateNumUsrsNotifiedByEMailAboutGame (long GamCod, - unsigned NumUsrsToBeNotifiedByEMail); + static void Gam_CreateGame (struct Game *Game,const char *Txt); static void Gam_UpdateGame (struct Game *Game,const char *Txt); static bool Gam_CheckIfGamIsAssociatedToGrps (long GamCod); @@ -147,6 +148,8 @@ static void Gam_PutParamsOneQst (void); static void Gam_ExchangeQuestions (long GamCod, unsigned QstIndTop,unsigned QstIndBottom); +static void Gam_PutBigButtonToStartGame (void); + static void Gam_ReceiveAndStoreUserAnswersToAGame (long GamCod); static void Gam_IncreaseAnswerInDB (long QstCod,unsigned AnsInd); static void Gam_RegisterIHaveAnsweredGame (long GamCod); @@ -162,7 +165,7 @@ void Gam_SeeAllGames (void) /***** Get parameters *****/ Gam_GetParamGameOrder (); Grp_GetParamWhichGrps (); - Gbl.Games.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); + Gbl.Games.CurrentPage = Pag_GetParamPagNum (Pag_GAMES); /***** Show all the games *****/ Gam_ListAllGames (); @@ -200,7 +203,7 @@ static void Gam_ListAllGames (void) /***** Write links to pages *****/ if (Pagination.MoreThanOnePage) - Pag_WriteLinksToPagesCentered (Pag_SURVEYS, + Pag_WriteLinksToPagesCentered (Pag_GAMES, 0, &Pagination); @@ -227,7 +230,7 @@ static void Gam_ListAllGames (void) /* Form to change order */ Act_FormStart (ActSeeAllGam); Grp_PutParamWhichGrps (); - Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Games.CurrentPage); + Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Games.SelectedOrder) @@ -254,7 +257,10 @@ static void Gam_ListAllGames (void) for (NumGame = Pagination.FirstItemVisible; NumGame <= Pagination.LastItemVisible; NumGame++) - Gam_ShowOneGame (Gbl.Games.LstGamCods[NumGame - 1],false); + Gam_ShowOneGame (Gbl.Games.LstGamCods[NumGame - 1], + false, + false, + false); /***** End table *****/ Tbl_EndTable (); @@ -271,7 +277,7 @@ static void Gam_ListAllGames (void) /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) - Pag_WriteLinksToPagesCentered (Pag_SURVEYS, + Pag_WriteLinksToPagesCentered (Pag_GAMES, 0, &Pagination); @@ -354,7 +360,7 @@ static void Gam_PutParamsToCreateNewGame (void) { Gam_PutHiddenParamGameOrder (); Grp_PutParamWhichGrps (); - Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Games.CurrentPage); + Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); } /*****************************************************************************/ @@ -371,7 +377,7 @@ static void Gam_PutFormToSelectWhichGroupsToShow (void) static void Gam_ParamsWhichGroupsToShow (void) { Gam_PutHiddenParamGameOrder (); - Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Games.CurrentPage); + Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); } /*****************************************************************************/ @@ -385,21 +391,27 @@ void Gam_SeeOneGame (void) /***** Get parameters *****/ Gam_GetParamGameOrder (); Grp_GetParamWhichGrps (); - Gbl.Games.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); + Gbl.Games.CurrentPage = Pag_GetParamPagNum (Pag_GAMES); /***** Get game code *****/ if ((Game.GamCod = Gam_GetParamGameCod ()) == -1L) Lay_ShowErrorAndExit ("Code of game is missing."); /***** Show game *****/ - Gam_ShowOneGame (Game.GamCod,true); + Gam_ShowOneGame (Game.GamCod, + true, // Show only this game + true, // List game questions + false); } /*****************************************************************************/ -/****************************** Show one game ******************************/ +/******************************* Show one game *******************************/ /*****************************************************************************/ -static void Gam_ShowOneGame (long GamCod,bool ShowOnlyThisGameComplete) +static void Gam_ShowOneGame (long GamCod, + bool ShowOnlyThisGame, + bool ListGameQuestions, + bool PutButtonToStart) { extern const char *Hlp_ASSESSMENT_Games; extern const char *Txt_Game; @@ -421,7 +433,7 @@ static void Gam_ShowOneGame (long GamCod,bool ShowOnlyThisGameComplete) char Txt[Cns_MAX_BYTES_TEXT + 1]; /***** Start box *****/ - if (ShowOnlyThisGameComplete) + if (ShowOnlyThisGame) Box_StartBox (NULL,Txt_Game,NULL, Hlp_ASSESSMENT_Games,Box_NOT_CLOSABLE); @@ -430,14 +442,14 @@ static void Gam_ShowOneGame (long GamCod,bool ShowOnlyThisGameComplete) Gam_GetDataOfGameByCod (&Game); /***** Start table *****/ - if (ShowOnlyThisGameComplete) + if (ShowOnlyThisGame) Tbl_StartTableWide (2); /***** Write first row of data of this assignment *****/ /* Forms to remove/edit this assignment */ fprintf (Gbl.F.Out,"" ""); if (Game.Status.ICanEdit) @@ -449,10 +461,10 @@ static void Gam_ShowOneGame (long GamCod,bool ShowOnlyThisGameComplete) fprintf (Gbl.F.Out,"" "