Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-11 03:05:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.196.1

Browse Source
This commit is contained in:
acanas 2020-04-25 23:53:15 +02:00
parent 1fc51aa084
commit 23abb64f34
2 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -544,10 +544,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.196 (2020-04-25)" #define Log_PLATFORM_VERSION "SWAD 19.196.1 (2020-04-25)"
#define CSS_FILE "swad19.193.1.css" #define CSS_FILE "swad19.193.1.css"
#define JS_FILE "swad19.193.1.js" #define JS_FILE "swad19.193.1.js"
/* /*
Version 19.196.1: Apr 25, 2020 Changes in edition of exams. (298857 lines)
Version 19.196: Apr 25, 2020 Changes in edition of sets of questions. (298866 lines) Version 19.196: Apr 25, 2020 Changes in edition of sets of questions. (298866 lines)
Version 19.195.1: Apr 25, 2020 Translation of messages related to sets of questions. (298840 lines) Version 19.195.1: Apr 25, 2020 Translation of messages related to sets of questions. (298840 lines)
Version 19.195: Apr 25, 2020 Changes in sets of questions. (298699 lines) Version 19.195: Apr 25, 2020 Changes in sets of questions. (298699 lines)

43
swad_exam.c
View File

@ -1513,15 +1513,13 @@ static void Exa_PutFormsOneExam (struct Exa_Exams *Exams,
/***** Put form to create/edit an exam *****/ /***** Put form to create/edit an exam *****/
Exa_PutFormEditionExam (Exams,Exam,Txt,ItsANewExam); Exa_PutFormEditionExam (Exams,Exam,Txt,ItsANewExam);
/***** Show list of sets *****/ /***** Show other lists *****/
if (!ItsANewExam) if (ItsANewExam)
{ /* Show exams again */
/* Show sets of the exam ready to be edited */ Exa_ListAllExams (Exams);
else
/* Show list of sets */
ExaSet_ListExamSets (Exams,Exam,Set); ExaSet_ListExamSets (Exams,Exam,Set);
/* Show questions of the exam ready to be edited */
Exa_ListExamQuestions (Exams,Exam);
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1794,6 +1792,7 @@ void Exa_RecFormExam (void)
{ {
struct Exa_Exams Exams; struct Exa_Exams Exams;
struct Exa_Exam Exam; struct Exa_Exam Exam;
struct ExaSet_Set Set;
bool ItsANewExam; bool ItsANewExam;
char Txt[Cns_MAX_BYTES_TEXT + 1]; char Txt[Cns_MAX_BYTES_TEXT + 1];
@ -1804,8 +1803,9 @@ void Exa_RecFormExam (void)
/***** Reset exams context *****/ /***** Reset exams context *****/
Exa_ResetExams (&Exams); Exa_ResetExams (&Exams);
/***** Reset exam *****/ /***** Reset exam and set *****/
Exa_ResetExam (&Exam); Exa_ResetExam (&Exam);
ExaSet_ResetSet (&Set);
/***** Get parameters *****/ /***** Get parameters *****/
Exa_GetParams (&Exams); Exa_GetParams (&Exams);
@ -1820,30 +1820,17 @@ void Exa_RecFormExam (void)
{ {
/***** Create a new exam or update an existing one *****/ /***** Create a new exam or update an existing one *****/
if (ItsANewExam) if (ItsANewExam)
{
Exa_CreateExam (&Exam,Txt); // Add new exam to database Exa_CreateExam (&Exam,Txt); // Add new exam to database
ItsANewExam = false;
}
else else
Exa_UpdateExam (&Exam,Txt); // Update exam data in database Exa_UpdateExam (&Exam,Txt); // Update exam data in database
/***** Put form to edit the exam created or updated *****/
Exa_PutFormEditionExam (&Exams,&Exam,Txt,
false); // No new exam
/***** Show questions of the exam ready to be edited ******/
Exa_ListExamQuestions (&Exams,&Exam);
} }
else
{
/***** Put form to create/edit the exam *****/
Exa_PutFormEditionExam (&Exams,&Exam,Txt,ItsANewExam);
/***** Show exams or questions *****/ /***** Put form to create/edit an exam and show sets *****/
if (ItsANewExam) Exa_PutFormsOneExam (&Exams,&Exam,&Set,
/* Show exams again */ ItsANewExam); // It's not a new exam
Exa_ListAllExams (&Exams);
else
/* Show questions of the exam ready to be edited */
Exa_ListExamQuestions (&Exams,&Exam);
}
} }
static void Exa_ReceiveExamFieldsFromForm (struct Exa_Exam *Exam, static void Exa_ReceiveExamFieldsFromForm (struct Exa_Exam *Exam,