Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 14:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.80.7

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-11-29 17:42:05 +01:00
parent ef1bddd431
commit 075d2ecd8c
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -490,7 +490,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.80.6 (2019-11-28)" #define Log_PLATFORM_VERSION "SWAD 19.80.7 (2019-11-29)"
#define CSS_FILE "swad19.78.1.css" #define CSS_FILE "swad19.78.1.css"
#define JS_FILE "swad19.70.js" #define JS_FILE "swad19.70.js"
/* /*
@ -498,6 +498,7 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: En cada juego, poder listar los resultados en una tabla como la de resultados globales // TODO: En cada juego, poder listar los resultados en una tabla como la de resultados globales
Version 19.80.7: Nov 29, 2019 Changes in match results. (247242 lines)
Version 19.80.6: Nov 28, 2019 Changes in match results and test results. (247245 lines) Version 19.80.6: Nov 28, 2019 Changes in match results and test results. (247245 lines)
Version 19.80.5: Nov 28, 2019 Total grade is always displayed in results. (247278 lines) Version 19.80.5: Nov 28, 2019 Total grade is always displayed in results. (247278 lines)
Version 19.80.4: Nov 28, 2019 Fixed bug in games. (247287 lines) Version 19.80.4: Nov 28, 2019 Fixed bug in games. (247287 lines)

2
swad_info.c
View File

@ -564,7 +564,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
/***** Begin box *****/ /***** Begin box *****/
Box_BoxBegin (NULL,Txt_Required_reading,NULL, Box_BoxBegin (NULL,Txt_Required_reading,NULL,
NULL,Box_NOT_CLOSABLE); NULL,Box_CLOSABLE);
/***** Write message *****/ /***** Write message *****/
Ale_ShowAlert (Ale_WARNING,Txt_You_should_read_the_following_information); Ale_ShowAlert (Ale_WARNING,Txt_You_should_read_the_following_information);

14
swad_match_result.c
View File

@ -80,8 +80,7 @@ static void McR_ShowMchResultsSummaryRow (unsigned NumResults,
unsigned NumTotalQsts, unsigned NumTotalQsts,
unsigned NumTotalQstsNotBlank, unsigned NumTotalQstsNotBlank,
double TotalScoreOfAllResults, double TotalScoreOfAllResults,
double TotalGrade, double TotalGrade);
double TotalMaxGrade);
static void McR_GetMatchResultDataByMchCod (long MchCod,long UsrCod, static void McR_GetMatchResultDataByMchCod (long MchCod,long UsrCod,
time_t TimeUTC[Dat_NUM_START_END_TIME], time_t TimeUTC[Dat_NUM_START_END_TIME],
unsigned *NumQsts, unsigned *NumQsts,
@ -497,7 +496,6 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
double MaxGrade; double MaxGrade;
double Grade; double Grade;
double TotalGrade = 0.0; double TotalGrade = 0.0;
double TotalMaxGrade = 0.0;
time_t TimeUTC[Dat_NUM_START_END_TIME]; time_t TimeUTC[Dat_NUM_START_END_TIME];
/***** Trivial check: there should be games selected *****/ /***** Trivial check: there should be games selected *****/
@ -618,7 +616,6 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
/* Get maximum grade (row[6]) */ /* Get maximum grade (row[6]) */
if (sscanf (row[6],"%lg",&MaxGrade) != 1) if (sscanf (row[6],"%lg",&MaxGrade) != 1)
MaxGrade = 0.0; MaxGrade = 0.0;
TotalMaxGrade += MaxGrade;
Str_SetDecimalPointToLocal (); // Return to local system Str_SetDecimalPointToLocal (); // Return to local system
} }
@ -701,7 +698,7 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
McR_ShowMchResultsSummaryRow (NumResults, McR_ShowMchResultsSummaryRow (NumResults,
NumTotalQsts,NumTotalQstsNotBlank, NumTotalQsts,NumTotalQstsNotBlank,
TotalScoreOfAllResults, TotalScoreOfAllResults,
TotalGrade,TotalMaxGrade); TotalGrade);
} }
else else
{ {
@ -723,8 +720,7 @@ static void McR_ShowMchResultsSummaryRow (unsigned NumResults,
unsigned NumTotalQsts, unsigned NumTotalQsts,
unsigned NumTotalQstsNotBlank, unsigned NumTotalQstsNotBlank,
double TotalScoreOfAllResults, double TotalScoreOfAllResults,
double TotalGrade, double TotalGrade)
double TotalMaxGrade)
{ {
extern const char *Txt_Matches; extern const char *Txt_Matches;
@ -761,8 +757,8 @@ static void McR_ShowMchResultsSummaryRow (unsigned NumResults,
HTM_TD_End (); HTM_TD_End ();
/***** Write total grade *****/ /***** Write total grade *****/
HTM_TD_Begin ("class=\"DAT_N_LINE_TOP CM COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd);
Tst_ShowGrade (TotalGrade,TotalMaxGrade); HTM_Double (TotalGrade);
HTM_TD_End (); HTM_TD_End ();
/***** Last cell *****/ /***** Last cell *****/