diff --git a/swad_changelog.h b/swad_changelog.h index f20f4fd3d..b1d5946be 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.5 (2019-11-28)" +#define Log_PLATFORM_VERSION "SWAD 19.80.6 (2019-11-28)" #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.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) Version 19.80.3: Nov 28, 2019 Fixed bug in games. (247286 lines) diff --git a/swad_match_result.c b/swad_match_result.c index 5ea6e73a8..e3bb180e0 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -458,7 +458,7 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther) HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions); HTM_TH (1,1,"RT",Txt_Score); HTM_TH (1,1,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); - HTM_TH (1,1,"CT",Txt_Grade); + HTM_TH (1,1,"RT",Txt_Grade); HTM_TH_Empty (1); HTM_TR_End (); diff --git a/swad_test.c b/swad_test.c index 47983a10e..88589b80b 100644 --- a/swad_test.c +++ b/swad_test.c @@ -671,13 +671,9 @@ double Tst_ComputeGrade (unsigned NumQsts,double Score,double MaxGrade) void Tst_ShowGrade (double Grade,double MaxGrade) { - extern const char *Txt_out_of_PART_OF_A_SCORE; - /***** Write grade over maximum grade *****/ HTM_Double (Grade); - HTM_NBSP (); - HTM_Txt (Txt_out_of_PART_OF_A_SCORE); - HTM_NBSP (); + HTM_Txt ("/"); HTM_Double (MaxGrade); } @@ -7694,8 +7690,7 @@ static void Tst_ShowHeaderTestResults (void) extern const char *Txt_Non_blank_BR_questions; extern const char *Txt_Score; extern const char *Txt_Average_BR_score_BR_per_question_BR_from_0_to_1; - extern const char *Txt_Score; - extern const char *Txt_out_of_PART_OF_A_SCORE; + extern const char *Txt_Grade; HTM_TR_Begin (NULL); @@ -7705,13 +7700,7 @@ static void Tst_ShowHeaderTestResults (void) HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions); HTM_TH (1,1,"RT",Txt_Score); HTM_TH (1,1,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); - HTM_TH_Begin (1,1,"RT"); - HTM_Txt (Txt_Score); - HTM_BR (); - HTM_Txt (Txt_out_of_PART_OF_A_SCORE); - HTM_BR (); - HTM_Unsigned (Tst_SCORE_MAX); - HTM_TH_End (); + HTM_TH (1,1,"RT",Txt_Grade); HTM_TH_Empty (1); HTM_TR_End (); @@ -7873,12 +7862,10 @@ static void Tst_ShowTstResults (struct UsrData *UsrDat) 0.0); HTM_TD_End (); - /* Write score over Tst_SCORE_MAX */ + /* Write grade */ HTM_TD_Begin ("class=\"%s RT COLOR%u\"",ClassDat,Gbl.RowEvenOdd); if (ICanViewScore) - HTM_Double (NumQstsInThisTest ? ScoreInThisTest * Tst_SCORE_MAX / - (double) NumQstsInThisTest : - 0.0); + Tst_ComputeAndShowGrade (NumQstsInThisTest,ScoreInThisTest,Tst_SCORE_MAX); HTM_TD_End (); /* Link to show this result */ @@ -8006,9 +7993,7 @@ static void Tst_ShowTestResultsSummaryRow (bool ItsMe, /***** Write score over Tst_SCORE_MAX *****/ HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); if (ICanViewTotalScore) - HTM_Double (NumTotalQsts ? TotalScoreOfAllTests * Tst_SCORE_MAX / - (double) NumTotalQsts : - 0.0); + Tst_ComputeAndShowGrade (NumTotalQsts,TotalScoreOfAllTests,Tst_SCORE_MAX); HTM_TD_End (); /***** Last cell *****/ diff --git a/swad_text.c b/swad_text.c index ad3344af1..790f40027 100644 --- a/swad_text.c +++ b/swad_text.c @@ -28545,27 +28545,6 @@ const char *Txt_Other_recipients = "Outros destinatários"; #endif -const char *Txt_out_of_PART_OF_A_SCORE = // Example: score is 2 out of 10 -#if L==1 // ca - "sobre"; // Necessita traduccio -#elif L==2 // de - "von"; -#elif L==3 // en - "out of"; -#elif L==4 // es - "sobre"; -#elif L==5 // fr - "sur"; -#elif L==6 // gn - "sobre"; // Okoteve traducción -#elif L==7 // it - "su"; -#elif L==8 // pl - "obecnie"; -#elif L==9 // pt - "out of"; -#endif - const char *Txt_page = #if L==1 // ca "pàg.";