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

Version19.80.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-11-28 22:17:00 +01:00
parent 803e04baad
commit d23ab85991
4 changed files with 44 additions and 54 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.4 (2019-11-28)" #define Log_PLATFORM_VERSION "SWAD 19.80.5 (2019-11-28)"
#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.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)
Version 19.80.3: Nov 28, 2019 Fixed bug in games. (247286 lines) Version 19.80.3: Nov 28, 2019 Fixed bug in games. (247286 lines)
Version 19.80.2: Nov 28, 2019 Changes in test results and match results. (247285 lines) Version 19.80.2: Nov 28, 2019 Changes in test results and match results. (247285 lines)

70
swad_match_result.c
View File

@ -76,12 +76,12 @@ static void McR_ListGamesToSelect (void);
static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther); static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther);
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
unsigned NumGamesSelected); unsigned NumGamesSelected);
static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults, static void McR_ShowMchResultsSummaryRow (unsigned NumResults,
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,
@ -443,7 +443,7 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME]; extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Questions; extern const char *Txt_Questions;
extern const char *Txt_Non_blank_BR_questions; extern const char *Txt_Non_blank_BR_questions;
extern const char *Txt_Total_BR_score; extern const char *Txt_Score;
extern const char *Txt_Average_BR_score_BR_per_question_BR_from_0_to_1; extern const char *Txt_Average_BR_score_BR_per_question_BR_from_0_to_1;
extern const char *Txt_Grade; extern const char *Txt_Grade;
@ -456,7 +456,7 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
HTM_TH (1,1,"LT",Txt_Match); HTM_TH (1,1,"LT",Txt_Match);
HTM_TH (1,1,"RT",Txt_Questions); HTM_TH (1,1,"RT",Txt_Questions);
HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions); HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions);
HTM_TH (1,1,"RT",Txt_Total_BR_score); 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,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1);
HTM_TH (1,1,"CT",Txt_Grade); HTM_TH (1,1,"CT",Txt_Grade);
HTM_TH_Empty (1); HTM_TH_Empty (1);
@ -497,6 +497,7 @@ 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 *****/
@ -595,18 +596,18 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
HTM_Txt (Match.Title); HTM_Txt (Match.Title);
HTM_TD_End (); HTM_TD_End ();
/* Get number of questions (row[3]) */
if (sscanf (row[3],"%u",&NumQstsInThisResult) != 1)
NumQstsInThisResult = 0;
NumTotalQsts += NumQstsInThisResult;
/* Get number of questions not blank (row[4]) */
if (sscanf (row[4],"%u",&NumQstsNotBlankInThisResult) != 1)
NumQstsNotBlankInThisResult = 0;
NumTotalQstsNotBlank += NumQstsNotBlankInThisResult;
if (ShowResultThisMatch) if (ShowResultThisMatch)
{ {
/* Get number of questions (row[3]) */
if (sscanf (row[3],"%u",&NumQstsInThisResult) != 1)
NumQstsInThisResult = 0;
NumTotalQsts += NumQstsInThisResult;
/* Get number of questions not blank (row[4]) */
if (sscanf (row[4],"%u",&NumQstsNotBlankInThisResult) != 1)
NumQstsNotBlankInThisResult = 0;
NumTotalQstsNotBlank += NumQstsNotBlankInThisResult;
Str_SetDecimalPointToUS (); // To get the decimal point as a dot Str_SetDecimalPointToUS (); // To get the decimal point as a dot
/* Get score (row[5]) */ /* Get score (row[5]) */
@ -617,24 +618,33 @@ 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
} }
/* Write number of questions */ /* Write number of questions */
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
HTM_Unsigned (NumQstsInThisResult); if (ShowResultThisMatch)
HTM_Unsigned (NumQstsInThisResult);
else
Ico_PutIconOff ("eye-slash.svg",Txt_Hidden_result);
HTM_TD_End (); HTM_TD_End ();
/* Write number of questions not blank */ /* Write number of questions not blank */
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
HTM_Unsigned (NumQstsNotBlankInThisResult); if (ShowResultThisMatch)
HTM_Unsigned (NumQstsNotBlankInThisResult);
else
Ico_PutIconOff ("eye-slash.svg",Txt_Hidden_result);
HTM_TD_End (); HTM_TD_End ();
/* Write score */ /* Write score */
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
if (ShowResultThisMatch) if (ShowResultThisMatch)
HTM_Double (ScoreInThisResult); HTM_Double (ScoreInThisResult);
else
Ico_PutIconOff ("eye-slash.svg",Txt_Hidden_result);
HTM_TD_End (); HTM_TD_End ();
/* Write average score per question */ /* Write average score per question */
@ -643,6 +653,8 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
HTM_Double (NumQstsInThisResult ? ScoreInThisResult / HTM_Double (NumQstsInThisResult ? ScoreInThisResult /
(double) NumQstsInThisResult : (double) NumQstsInThisResult :
0.0); 0.0);
else
Ico_PutIconOff ("eye-slash.svg",Txt_Hidden_result);
HTM_TD_End (); HTM_TD_End ();
/* Write grade over maximum grade */ /* Write grade over maximum grade */
@ -653,6 +665,8 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
Tst_ShowGrade (Grade,MaxGrade); Tst_ShowGrade (Grade,MaxGrade);
TotalGrade += Grade; TotalGrade += Grade;
} }
else
Ico_PutIconOff ("eye-slash.svg",Txt_Hidden_result);
HTM_TD_End (); HTM_TD_End ();
/* Link to show this result */ /* Link to show this result */
@ -684,11 +698,10 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
} }
/***** Write totals for this user *****/ /***** Write totals for this user *****/
McR_ShowMchResultsSummaryRow (ShowSummaryResults, McR_ShowMchResultsSummaryRow (NumResults,
NumResults,
NumTotalQsts,NumTotalQstsNotBlank, NumTotalQsts,NumTotalQstsNotBlank,
TotalScoreOfAllResults, TotalScoreOfAllResults,
TotalGrade); TotalGrade,TotalMaxGrade);
} }
else else
{ {
@ -706,12 +719,12 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
/************** Show row with summary of user's matches results **************/ /************** Show row with summary of user's matches results **************/
/*****************************************************************************/ /*****************************************************************************/
static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults, static void McR_ShowMchResultsSummaryRow (unsigned NumResults,
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;
@ -738,21 +751,18 @@ static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults,
/***** Write total score *****/ /***** Write total score *****/
HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd);
if (ShowSummaryResults) HTM_Double (TotalScoreOfAllResults);
HTM_Double (TotalScoreOfAllResults);
HTM_TD_End (); HTM_TD_End ();
/***** Write average score per question *****/ /***** Write average score per question *****/
HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd);
if (ShowSummaryResults) HTM_Double (NumTotalQsts ? TotalScoreOfAllResults / (double) NumTotalQsts :
HTM_Double (NumTotalQsts ? TotalScoreOfAllResults / (double) NumTotalQsts : 0.0);
0.0);
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 CM COLOR%u\"",Gbl.RowEvenOdd);
if (ShowSummaryResults) Tst_ShowGrade (TotalGrade,TotalMaxGrade);
HTM_Double (TotalGrade);
HTM_TD_End (); HTM_TD_End ();
/***** Last cell *****/ /***** Last cell *****/

4
swad_test.c
View File

@ -7692,7 +7692,7 @@ static void Tst_ShowHeaderTestResults (void)
extern const char *Txt_Date; extern const char *Txt_Date;
extern const char *Txt_Questions; extern const char *Txt_Questions;
extern const char *Txt_Non_blank_BR_questions; extern const char *Txt_Non_blank_BR_questions;
extern const char *Txt_Total_BR_score; extern const char *Txt_Score;
extern const char *Txt_Average_BR_score_BR_per_question_BR_from_0_to_1; extern const char *Txt_Average_BR_score_BR_per_question_BR_from_0_to_1;
extern const char *Txt_Score; extern const char *Txt_Score;
extern const char *Txt_out_of_PART_OF_A_SCORE; extern const char *Txt_out_of_PART_OF_A_SCORE;
@ -7703,7 +7703,7 @@ static void Tst_ShowHeaderTestResults (void)
HTM_TH (1,1,"RT",Txt_Date); HTM_TH (1,1,"RT",Txt_Date);
HTM_TH (1,1,"RT",Txt_Questions); HTM_TH (1,1,"RT",Txt_Questions);
HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions); HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions);
HTM_TH (1,1,"RT",Txt_Total_BR_score); 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,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1);
HTM_TH_Begin (1,1,"RT"); HTM_TH_Begin (1,1,"RT");
HTM_Txt (Txt_Score); HTM_Txt (Txt_Score);

21
swad_text.c
View File

@ -50294,27 +50294,6 @@ const char *Txt_Total =
"Total"; "Total";
#endif #endif
const char *Txt_Total_BR_score =
#if L==1 // ca
"Puntuaci&oacute;<br />total";
#elif L==2 // de
"Gesamt";
#elif L==3 // en
"Total<br />score";
#elif L==4 // es
"Puntuaci&oacute;n<br />total";
#elif L==5 // fr
"Note<br />total";
#elif L==6 // gn
"Puntuaci&oacute;n<br />total "; // Okoteve traducción
#elif L==7 // it
"Punteggio<br />totale";
#elif L==8 // pl
"Ca&lstrok;kowity<br />wynik";
#elif L==9 // pt
"Pontua&ccedil;&atilde;o<br />total";
#endif
const char *Txt_TST_Answer_given_by_the_teachers = const char *Txt_TST_Answer_given_by_the_teachers =
#if L==1 // ca #if L==1 // ca
"Resposta donada pels professors"; "Resposta donada pels professors";