Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-09-22 00:00:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.28.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-09-30 22:31:07 +02:00
parent 4d28e43616
commit f7469538ab
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -483,10 +483,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.28.1 (2019-09-30)"
#define Log_PLATFORM_VERSION "SWAD 19.28.2 (2019-09-30)"
#define CSS_FILE "swad19.28.css"
#define JS_FILE "swad19.15.js"
/*
Version 19.28.2: Sep 30, 2019 Changed position of column in list of match results with the name of the match. (246762 lines)
Version 19.28.1: Sep 30, 2019 New column in list of match results with the name of the match. (246760 lines)
Version 19.28: Sep 30, 2019 Changes in layout of match playing. (246752 lines)
Version 19.27: Sep 30, 2019 Changes in layout of match playing. (246756 lines)

21
swad_match_result.c
View File

@ -69,7 +69,7 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static void McR_ShowHeaderMchResults (void);
static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther);
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther);
static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults,
unsigned NumResults,
@ -142,7 +142,7 @@ void McR_ShowMyMchResults (void)
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2);
/***** Header of the table with the list of users *****/
McR_ShowHeaderMchResults ();
McR_ShowHeaderMchResults (Usr_ME);
/***** List my matches results *****/
Tst_GetConfigTstFromDB (); // To get feedback type
@ -279,7 +279,7 @@ void McR_ShowUsrsMchResults (void)
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2);
/***** Header of the table with the list of users *****/
McR_ShowHeaderMchResults ();
McR_ShowHeaderMchResults (Usr_OTHER);
/***** List the matches results of the selected users *****/
Ptr = Gbl.Usrs.Selected.List[Rol_UNK];
@ -313,7 +313,7 @@ void McR_ShowUsrsMchResults (void)
/********************* Show header of my matches results *********************/
/*****************************************************************************/
static void McR_ShowHeaderMchResults (void)
static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
{
extern const char *Txt_User[Usr_NUM_SEXS];
extern const char *Txt_Match;
@ -355,10 +355,11 @@ static void McR_ShowHeaderMchResults (void)
"</th>"
"<th></th>"
"</tr>",
Txt_User[Usr_SEX_UNKNOWN],
Txt_Match,
Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex :
Usr_SEX_UNKNOWN],
Txt_START_END_TIME[Dat_START_TIME],
Txt_START_END_TIME[Dat_END_TIME],
Txt_Match,
Txt_Questions,
Txt_Non_blank_BR_questions,
Txt_Total_BR_score,
@ -444,10 +445,6 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
if (NumResult)
fprintf (Gbl.F.Out,"<tr>");
/* Write match title */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">%s</td>",
Gbl.RowEvenOdd,Match.Title);
/* Write start/end times (row[1], row[2] hold UTC start/end times) */
for (StartEndTime = (Dat_StartEndTime_t) 0;
StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
@ -469,6 +466,10 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
}
/* Write match title */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">%s</td>",
Gbl.RowEvenOdd,Match.Title);
/* Get number of questions (row[3]) */
if (sscanf (row[3],"%u",&NumQstsInThisResult) != 1)
NumQstsInThisResult = 0;