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

This commit is contained in:
Antonio Cañas Vargas 2019-09-30 10:51:44 +02:00
parent af9d4bb1fd
commit 72e11e1ec2
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/cambios.sql
View File

@ -12911,7 +12911,7 @@ SELECT gam_questions.QstCod,
swad 18.129.1 ----> swad 19.25
swad 18.128 ----> swad 19.25
Ficheros:
---------
@ -12928,6 +12928,9 @@ sudo cp -a fontawesome /var/www/html/swad/
Base de datos:
--------------
UPDATE actions SET Txt='Solicitar la creación de una cuenta (1/2)' WHERE ActCod='36' AND Language='es';
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1787','es','N','Solicitar la creación de una cuenta (2/2)');
ALTER TABLE games DROP COLUMN StartTime,DROP COLUMN EndTime;
UPDATE actions SET Obsolete='Y' WHERE ActCod=1779;
@ -12996,7 +12999,6 @@ RENAME TABLE gam_players TO mch_players;
RENAME TABLE gam_mch_being_played TO mch_playing;
RENAME TABLE gam_time TO mch_times;
RENAME TABLE games TO gam_games;
DROP TABLE gam_playing;
ALTER TABLE mch_matches DROP COLUMN Showing;
ALTER TABLE mch_matches ADD COLUMN Showing ENUM('nothing','stem','answers','results') NOT NULL DEFAULT 'nothing' AFTER ShowResults;

6
swad_changelog.h
View File

@ -474,10 +474,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.25.2 (2019-09-30)"
#define Log_PLATFORM_VERSION "SWAD 19.25.3 (2019-09-30)"
#define CSS_FILE "swad19.15.css"
#define JS_FILE "swad19.15.js"
/*
Version 19.25.3: Sep 30, 2019 Fixed bug: students should not see icon to add a match. (246745 lines)
Version 19.25.2: Sep 30, 2019 Fixed bug in match results. (246744 lines)
Version 19.25.1: Sep 30, 2019 Fixed bug in match results. (246743 lines)
Version 19.25: Sep 30, 2019 Code refactoring in match results. (246743 lines)
@ -636,7 +637,7 @@ ALTER TABLE mch_matches ADD COLUMN Showing ENUM('nothing','stem','answers','resu
Version 19.4.2: Sep 17, 2019 Fixed bug when removing a question in a game. (244654 lines)
Version 19.4.1: Sep 17, 2019 Fixed bug when removing a question in a game. (244650 lines)
Version 19.4: Sep 17, 2019 Changes in games ans matches tables. (244644 lines)
8 changes necessary in database:
7 changes necessary in database:
RENAME TABLE gam_answers TO mch_answers;
RENAME TABLE gam_grp TO mch_groups;
RENAME TABLE gam_matches TO mch_matches;
@ -644,7 +645,6 @@ RENAME TABLE gam_players TO mch_players;
RENAME TABLE gam_mch_being_played TO mch_playing;
RENAME TABLE gam_time TO mch_times;
RENAME TABLE games TO gam_games;
DROP TABLE gam_playing;
Version 19.3: Sep 15, 2019 Changes in match results. (244680 lines)
2 changes necessary in database:

9
swad_match.c
View File

@ -87,7 +87,7 @@ long Mch_CurrentMchCod = -1L; // Used as parameter in contextual links
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static void Mch_PutIconToPlayNewMatch (void);
static void Mch_PutIconToCreateNewMatch (void);
static void Mch_ListOneOrMoreMatches (struct Game *Game,
unsigned NumMatches,
@ -198,6 +198,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch)
char *SubQuery;
MYSQL_RES *mysql_res;
unsigned NumMatches;
bool ICanEditMatches = Mch_CheckIfICanEditMatches ();
/***** Get data of matches from database *****/
/* Fill subquery for game */
@ -243,7 +244,8 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch)
/***** Start box *****/
Gam_SetParamCurrentGamCod (Game->GamCod); // Used to pass parameter
Box_StartBox (NULL,Txt_Matches,Mch_PutIconToPlayNewMatch,
Box_StartBox (NULL,Txt_Matches,ICanEditMatches ? Mch_PutIconToCreateNewMatch :
NULL,
Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE);
/***** Select whether show only my groups or all groups *****/
@ -342,7 +344,7 @@ void Mch_GetDataOfMatchByCod (struct Match *Match)
/********************* Put icon to create a new match ************************/
/*****************************************************************************/
static void Mch_PutIconToPlayNewMatch (void)
static void Mch_PutIconToCreateNewMatch (void)
{
extern const char *Txt_New_match;
@ -483,7 +485,6 @@ static bool Mch_CheckIfICanEditMatches (void)
default:
return false;
}
return false;
}
/*****************************************************************************/