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

Version19.145.1

This commit is contained in:
Antonio Cañas Vargas 2020-03-08 19:13:38 +01:00
parent ebf73792a5
commit 22ff1aca86
11 changed files with 103 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/actions.sql
View File

@ -51,4 +51,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2019-12-18 21:10:03
-- Dump completed on 2020-03-08 19:02:32

9
sql/centres.sql
View File

File diff suppressed because one or more lines are too long

2
sql/countries.sql
View File

@ -77,4 +77,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2019-12-18 21:10:17
-- Dump completed on 2020-03-08 19:02:52

2
sql/deg_types.sql
View File

@ -48,4 +48,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2019-12-18 21:10:54
-- Dump completed on 2020-03-08 19:03:44

6
sql/degrees.sql
View File

File diff suppressed because one or more lines are too long

2
sql/departments.sql
View File

@ -52,4 +52,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2019-12-18 21:11:23
-- Dump completed on 2020-03-08 19:04:15

10
sql/institutions.sql
View File

File diff suppressed because one or more lines are too long

6
sql/mail_domains.sql
View File

File diff suppressed because one or more lines are too long

6
sql/places.sql
View File

File diff suppressed because one or more lines are too long

3
swad_changelog.h
View File

@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.145 (2020-03-07)"
#define Log_PLATFORM_VERSION "SWAD 19.145.1 (2020-03-07)"
#define CSS_FILE "swad19.144.1.css"
#define JS_FILE "swad19.91.1.js"
/*
@ -526,6 +526,7 @@ Param
// TODO: Oresti Baños: cambiar ojos por candados en descriptores para prohibir/permitir y dejar los ojos para poder elegir descriptores
// TODO: Comprobar los resultados de partidas de juegos con preguntas eliminadas
Version 19.145.1: Mar 07, 2020 Changes in edition of games. (282365 lines)
Version 19.145: Mar 07, 2020 Fixed bug in log.
Fixed bug in matches, reported by Eva Martínez Ortigosa. (282346 lines)
Version 19.144.3: Mar 06, 2020 New social network: twitch. (282286 lines)

133
swad_game.c
View File

@ -139,7 +139,12 @@ static void Gam_RemoveGameFromAllTables (long GamCod);
static bool Gam_CheckIfSimilarGameExists (struct Game *Game);
static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame);
static void Gam_PutFormsEditionGame (struct Game *Game,
char Txt[Cns_MAX_BYTES_TEXT + 1],
bool ItsANewGame);
static bool Gam_ReceiveGameFieldsFromForm (struct Game *Game,
char Txt[Cns_MAX_BYTES_TEXT + 1]);
static bool Gam_CheckGameFieldsReceivedFromForm (const struct Game *Game);
static void Gam_CreateGame (struct Game *Game,const char *Txt);
static void Gam_UpdateGame (struct Game *Game,const char *Txt);
@ -1256,27 +1261,30 @@ void Gam_RequestCreatOrEditGame (void)
{
struct Game Game;
bool ItsANewGame;
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Check if I can create new games *****/
/***** Check if I can edit games *****/
if (!Gam_CheckIfICanEditGames ())
Lay_NoPermissionExit ();
/***** Get parameters *****/
Game.GamCod = Gam_GetParams ();
ItsANewGame = (Game.GamCod < 0);
ItsANewGame = ((Game.GamCod = Gam_GetParams ()) < 0);
/***** Put forms to create/edit a game *****/
Gam_PutFormsEditionGame (&Game,ItsANewGame);
Gam_PutFormsEditionGame (&Game,Txt,ItsANewGame);
/***** Show games again *****/
Gam_ListAllGames ();
if (ItsANewGame)
Gam_ListAllGames ();
}
/*****************************************************************************/
/********************* Put a form to create/edit a game **********************/
/*****************************************************************************/
static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
static void Gam_PutFormsEditionGame (struct Game *Game,
char Txt[Cns_MAX_BYTES_TEXT + 1],
bool ItsANewGame)
{
extern const char *Hlp_ASSESSMENT_Games_new_game;
extern const char *Hlp_ASSESSMENT_Games_edit_game;
@ -1289,7 +1297,6 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
extern const char *Txt_Description;
extern const char *Txt_Create_game;
extern const char *Txt_Save_changes;
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get game data *****/
if (ItsANewGame)
@ -1393,78 +1400,92 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
}
/*****************************************************************************/
/********************* Receive form to create a new game *******************/
/********************** Receive form to create a new game ********************/
/*****************************************************************************/
void Gam_RecFormGame (void)
{
extern const char *Txt_Already_existed_a_game_with_the_title_X;
extern const char *Txt_You_must_specify_the_title_of_the_game;
struct Game Game;
bool ItsANewGame;
bool NewGameIsCorrect = true;
char MaxGradeStr[64];
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get parameters *****/
Game.GamCod = Gam_GetParams ();
/***** Check if I can edit games *****/
if (!Gam_CheckIfICanEditGames ())
Lay_NoPermissionExit ();
/***** Check if game has matches *****/
/***** Get parameters *****/
ItsANewGame = ((Game.GamCod = Gam_GetParams ()) < 0);
/***** If I can edit games ==> receive game from form *****/
if (Gam_CheckIfICanEditGames ())
{
ItsANewGame = (Game.GamCod < 0);
/***** Get game title *****/
Par_GetParToText ("Title",Game.Title,Gam_MAX_BYTES_TITLE);
/***** Get maximum grade *****/
Par_GetParToText ("MaxGrade",MaxGradeStr,sizeof (MaxGradeStr) - 1);
Game.MaxGrade = Str_GetDoubleFromStr (MaxGradeStr);
if (Game.MaxGrade < 0.0) // Only positive values allowed
Game.MaxGrade = 0.0;
/***** Get visibility from form *****/
Game.Visibility = TsV_GetVisibilityFromForm ();
/***** Get game text and insert links *****/
Par_GetParToHTML ("Txt",Txt,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
/***** Check if title is correct *****/
if (Game.Title[0]) // If there's a game title
{
/* If title of game was in database... */
if (Gam_CheckIfSimilarGameExists (&Game))
{
NewGameIsCorrect = false;
Ale_ShowAlert (Ale_WARNING,Txt_Already_existed_a_game_with_the_title_X,
Game.Title);
}
}
else // If there is not a game title
{
NewGameIsCorrect = false;
Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_game);
}
/***** Create a new game or update an existing one *****/
if (NewGameIsCorrect)
Gam_ReceiveGameFieldsFromForm (&Game,Txt);
if (Gam_CheckGameFieldsReceivedFromForm (&Game))
{
/***** Create a new game or update an existing one *****/
if (ItsANewGame)
Gam_CreateGame (&Game,Txt); // Add new game to database
else
Gam_UpdateGame (&Game,Txt);
}
else
Gam_RequestCreatOrEditGame ();
/***** Put forms to create/edit a game *****/
Gam_PutFormsEditionGame (&Game,false);
Gam_PutFormsEditionGame (&Game,Txt,ItsANewGame);
}
else
Lay_NoPermissionExit ();
/***** Show games again *****/
Gam_ListAllGames ();
if (ItsANewGame)
Gam_ListAllGames ();
}
static void Gam_ReceiveGameFieldsFromForm (struct Game *Game,
char Txt[Cns_MAX_BYTES_TEXT + 1])
{
char MaxGradeStr[64];
/***** Get game title *****/
Par_GetParToText ("Title",Game->Title,Gam_MAX_BYTES_TITLE);
/***** Get maximum grade *****/
Par_GetParToText ("MaxGrade",MaxGradeStr,sizeof (MaxGradeStr) - 1);
Game->MaxGrade = Str_GetDoubleFromStr (MaxGradeStr);
if (Game->MaxGrade < 0.0) // Only positive values allowed
Game->MaxGrade = 0.0;
/***** Get visibility *****/
Game->Visibility = TsV_GetVisibilityFromForm ();
/***** Get game text *****/
Par_GetParToHTML ("Txt",Txt,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous)
}
static bool Gam_CheckGameFieldsReceivedFromForm (const struct Game *Game)
{
extern const char *Txt_Already_existed_a_game_with_the_title_X;
extern const char *Txt_You_must_specify_the_title_of_the_game;
bool NewGameIsCorrect;
/***** Check if title is correct *****/
NewGameIsCorrect = true;
if (Game->Title[0]) // If there's a game title
{
/* If title of game was in database... */
if (Gam_CheckIfSimilarGameExists (Game))
{
NewGameIsCorrect = false;
Ale_ShowAlert (Ale_WARNING,Txt_Already_existed_a_game_with_the_title_X,
Game->Title);
}
}
else // If there is not a game title
{
NewGameIsCorrect = false;
Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_game);
}
return NewGameIsCorrect;
}
/*****************************************************************************/