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.238.2

This commit is contained in:
acanas 2020-05-19 13:12:26 +02:00
parent 52646e3205
commit 4012b22789
3 changed files with 4249 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4222
css/swad19.238.2.css Normal file
View File

File diff suppressed because it is too large Load Diff

5
swad_changelog.h
View File

@ -557,10 +557,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.238.1 (2020-05-18)"
#define CSS_FILE "swad19.230.1.css"
#define Log_PLATFORM_VERSION "SWAD 19.238.2 (2020-05-18)"
#define CSS_FILE "swad19.238.2.css"
#define JS_FILE "swad19.236.4.js"
/*
Version 19.238.2: May 19, 2020 Exam description is written in exam heading. Suggested by Eva Martínez Ortigosa. (301254 lines)
Version 19.238.1: May 19, 2020 Fixed bug: clicks on answers of exam prints are logged. (301566 lines)
Version 19.238: May 18, 2020 Fix exam-related details.
Removal of exams. (301565 lines)

24
swad_exam_print.c
View File

@ -78,6 +78,7 @@ static void ExaPrn_CreatePrintInDB (struct ExaPrn_Print *Print);
static void ExaPrn_ShowExamPrintToFillIt (struct Exa_Exams *Exams,
const struct Exa_Exam *Exam,
const struct ExaPrn_Print *Print);
static void ExaPrn_GetAndWriteDescription (long ExaCod);
static void ExaPrn_ShowTableWithQstsToFill (const struct ExaPrn_Print *Print);
static void ExaPrn_WriteQstAndAnsToFill (const struct ExaPrn_Print *Print,
unsigned NumQst,
@ -577,10 +578,13 @@ static void ExaPrn_ShowExamPrintToFillIt (struct Exa_Exams *Exams,
Box_BoxBegin (NULL,Exam->Title,
NULL,NULL,
Hlp_ASSESSMENT_Exams,Box_NOT_CLOSABLE);
/***** Heading *****/
Lay_WriteHeaderClassPhoto (false,false,
Gbl.Hierarchy.Ins.InsCod,
Gbl.Hierarchy.Deg.DegCod,
Gbl.Hierarchy.Crs.CrsCod);
ExaPrn_GetAndWriteDescription (Exam->ExaCod);
if (Print->NumQsts)
{
@ -600,6 +604,26 @@ static void ExaPrn_ShowExamPrintToFillIt (struct Exa_Exams *Exams,
Box_BoxEnd ();
}
/*****************************************************************************/
/********************* Write description in an exam print ********************/
/*****************************************************************************/
static void ExaPrn_GetAndWriteDescription (long ExaCod)
{
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Get description from database *****/
Exa_GetExamTxtFromDB (ExaCod,Txt);
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, // Convert from HTML to rigorous HTML
Txt,Cns_MAX_BYTES_TEXT,false);
Str_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
/***** Write description *****/
HTM_DIV_Begin ("class=\"EXA_PRN_DESC DAT_SMALL\"");
HTM_Txt (Txt);
HTM_DIV_End ();
}
/*****************************************************************************/
/********* Show the main part (table) of an exam print to be answered ********/
/*****************************************************************************/