diff --git a/swad_changelog.h b/swad_changelog.h index b1d5946be..b5dfb4095 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,7 +490,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.80.6 (2019-11-28)" +#define Log_PLATFORM_VERSION "SWAD 19.80.7 (2019-11-29)" #define CSS_FILE "swad19.78.1.css" #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: 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.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) diff --git a/swad_info.c b/swad_info.c index f23de2ddd..9bab17ae9 100644 --- a/swad_info.c +++ b/swad_info.c @@ -564,7 +564,7 @@ void Inf_WriteMsgYouMustReadInfo (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Required_reading,NULL, - NULL,Box_NOT_CLOSABLE); + NULL,Box_CLOSABLE); /***** Write message *****/ Ale_ShowAlert (Ale_WARNING,Txt_You_should_read_the_following_information); diff --git a/swad_match_result.c b/swad_match_result.c index e3bb180e0..15ba2d381 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -80,8 +80,7 @@ static void McR_ShowMchResultsSummaryRow (unsigned NumResults, unsigned NumTotalQsts, unsigned NumTotalQstsNotBlank, double TotalScoreOfAllResults, - double TotalGrade, - double TotalMaxGrade); + double TotalGrade); static void McR_GetMatchResultDataByMchCod (long MchCod,long UsrCod, time_t TimeUTC[Dat_NUM_START_END_TIME], unsigned *NumQsts, @@ -497,7 +496,6 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, double MaxGrade; double Grade; double TotalGrade = 0.0; - double TotalMaxGrade = 0.0; time_t TimeUTC[Dat_NUM_START_END_TIME]; /***** Trivial check: there should be games selected *****/ @@ -618,7 +616,6 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, /* Get maximum grade (row[6]) */ if (sscanf (row[6],"%lg",&MaxGrade) != 1) MaxGrade = 0.0; - TotalMaxGrade += MaxGrade; Str_SetDecimalPointToLocal (); // Return to local system } @@ -701,7 +698,7 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, McR_ShowMchResultsSummaryRow (NumResults, NumTotalQsts,NumTotalQstsNotBlank, TotalScoreOfAllResults, - TotalGrade,TotalMaxGrade); + TotalGrade); } else { @@ -723,8 +720,7 @@ static void McR_ShowMchResultsSummaryRow (unsigned NumResults, unsigned NumTotalQsts, unsigned NumTotalQstsNotBlank, double TotalScoreOfAllResults, - double TotalGrade, - double TotalMaxGrade) + double TotalGrade) { extern const char *Txt_Matches; @@ -761,8 +757,8 @@ static void McR_ShowMchResultsSummaryRow (unsigned NumResults, HTM_TD_End (); /***** Write total grade *****/ - HTM_TD_Begin ("class=\"DAT_N_LINE_TOP CM COLOR%u\"",Gbl.RowEvenOdd); - Tst_ShowGrade (TotalGrade,TotalMaxGrade); + HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); + HTM_Double (TotalGrade); HTM_TD_End (); /***** Last cell *****/