Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.228.2

This commit is contained in:
acanas 2020-05-13 13:37:15 +02:00
parent e5d8df51c3
commit 68a174d4d5
3 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -548,10 +548,11 @@ 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.228.1 (2020-05-13)" #define Log_PLATFORM_VERSION "SWAD 19.228.2 (2020-05-13)"
#define CSS_FILE "swad19.217.css" #define CSS_FILE "swad19.217.css"
#define JS_FILE "swad19.223.js" #define JS_FILE "swad19.223.js"
/* /*
Version 19.228.2: May 13, 2020 Code refactoring in exam prints. (303829 lines)
Version 19.228.1: May 13, 2020 Code refactoring in exam prints. (303828 lines) Version 19.228.1: May 13, 2020 Code refactoring in exam prints. (303828 lines)
Version 19.228: May 13, 2020 Code refactoring and bug fixing in exam prints. (303837 lines) Version 19.228: May 13, 2020 Code refactoring and bug fixing in exam prints. (303837 lines)
Version 19.227.1: May 13, 2020 Cache of linked GIFs and videos. (303612 lines) Version 19.227.1: May 13, 2020 Cache of linked GIFs and videos. (303612 lines)

29
swad_exam_print.c
View File

@ -1117,50 +1117,45 @@ void ExaPrn_ComputeAnswerScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
static void ExaPrn_GetCorrectAndComputeIntAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void ExaPrn_GetCorrectAndComputeIntAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get the numerical value of the correct answer *****/ /***** Get the numerical value of the correct answer,
and compute score *****/
ExaPrn_GetCorrectIntAnswerFromDB (Question); ExaPrn_GetCorrectIntAnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeIntAnsScore (PrintedQuestion,Question); TstPrn_ComputeIntAnsScore (PrintedQuestion,Question);
} }
static void ExaPrn_GetCorrectAndComputeFltAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void ExaPrn_GetCorrectAndComputeFltAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get the numerical value of the minimum and maximum correct answers *****/ /***** Get the numerical value of the minimum and maximum correct answers,
and compute score *****/
ExaPrn_GetCorrectFltAnswerFromDB (Question); ExaPrn_GetCorrectFltAnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeFltAnsScore (PrintedQuestion,Question); TstPrn_ComputeFltAnsScore (PrintedQuestion,Question);
} }
static void ExaPrn_GetCorrectAndComputeTF_AnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void ExaPrn_GetCorrectAndComputeTF_AnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get answer true or false *****/ /***** Get answer true or false,
and compute score *****/
ExaPrn_GetCorrectTF_AnswerFromDB (Question); ExaPrn_GetCorrectTF_AnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeTF_AnsScore (PrintedQuestion,Question); TstPrn_ComputeTF_AnsScore (PrintedQuestion,Question);
} }
static void ExaPrn_GetCorrectAndComputeChoAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void ExaPrn_GetCorrectAndComputeChoAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get correct options of test question from database *****/ /***** Get correct options of test question from database,
and compute score *****/
ExaPrn_GetCorrectChoAnswerFromDB (Question); ExaPrn_GetCorrectChoAnswerFromDB (Question);
/***** Compute the total score of this question *****/
TstPrn_ComputeChoAnsScore (PrintedQuestion,Question); TstPrn_ComputeChoAnsScore (PrintedQuestion,Question);
} }
static void ExaPrn_GetCorrectAndComputeTxtAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void ExaPrn_GetCorrectAndComputeTxtAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get correct answers for this question from database *****/ /***** Get correct text answers for this question from database,
and compute score *****/
ExaPrn_GetCorrectTxtAnswerFromDB (Question); ExaPrn_GetCorrectTxtAnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeTxtAnsScore (PrintedQuestion,Question); TstPrn_ComputeTxtAnsScore (PrintedQuestion,Question);
} }

25
swad_test_print.c
View File

@ -425,50 +425,45 @@ void TstPrn_ComputeAnswerScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
static void TstPrn_GetCorrectAndComputeIntAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void TstPrn_GetCorrectAndComputeIntAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get the numerical value of the correct answer *****/ /***** Get the numerical value of the correct answer,
and compute score *****/
TstPrn_GetCorrectIntAnswerFromDB (Question); TstPrn_GetCorrectIntAnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeIntAnsScore (PrintedQuestion,Question); TstPrn_ComputeIntAnsScore (PrintedQuestion,Question);
} }
static void TstPrn_GetCorrectAndComputeFltAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void TstPrn_GetCorrectAndComputeFltAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get the numerical value of the minimum and maximum correct answers *****/ /***** Get the numerical value of the minimum and maximum correct answers,
and compute score *****/
TstPrn_GetCorrectFltAnswerFromDB (Question); TstPrn_GetCorrectFltAnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeFltAnsScore (PrintedQuestion,Question); TstPrn_ComputeFltAnsScore (PrintedQuestion,Question);
} }
static void TstPrn_GetCorrectAndComputeTF_AnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void TstPrn_GetCorrectAndComputeTF_AnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get answer true or false *****/ /***** Get answer true or false,
and compute score *****/
TstPrn_GetCorrectTF_AnswerFromDB (Question); TstPrn_GetCorrectTF_AnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeTF_AnsScore (PrintedQuestion,Question); TstPrn_ComputeTF_AnsScore (PrintedQuestion,Question);
} }
static void TstPrn_GetCorrectAndComputeChoAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void TstPrn_GetCorrectAndComputeChoAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get correct options of test question from database *****/ /***** Get correct options of test question from database,
and compute score *****/
TstPrn_GetCorrectChoAnswerFromDB (Question); TstPrn_GetCorrectChoAnswerFromDB (Question);
/***** Compute the total score of this question *****/
TstPrn_ComputeChoAnsScore (PrintedQuestion,Question); TstPrn_ComputeChoAnsScore (PrintedQuestion,Question);
} }
static void TstPrn_GetCorrectAndComputeTxtAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion, static void TstPrn_GetCorrectAndComputeTxtAnsScore (struct TstPrn_PrintedQuestion *PrintedQuestion,
struct Tst_Question *Question) struct Tst_Question *Question)
{ {
/***** Get correct answers for this question from database *****/ /***** Get correct text answers for this question from database,
and compute score *****/
TstPrn_GetCorrectTxtAnswerFromDB (Question); TstPrn_GetCorrectTxtAnswerFromDB (Question);
/***** Compute score *****/
TstPrn_ComputeTxtAnsScore (PrintedQuestion,Question); TstPrn_ComputeTxtAnsScore (PrintedQuestion,Question);
} }