From 9f6e10af0ce08b3b7d676849117186dd05886abd Mon Sep 17 00:00:00 2001 From: acanas Date: Sat, 6 May 2023 12:04:33 +0200 Subject: [PATCH] Version 22.107.4: May 06, 2023 Changes in edition of exam. --- swad_changelog.h | 3 ++- swad_exam.c | 19 +++++++------------ swad_rubric.c | 6 ++++-- swad_rubric.h | 2 -- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 87ad37c18..5131eff88 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.107.3 (2023-05-06)" +#define Log_PLATFORM_VERSION "SWAD 22.107.4 (2023-05-06)" #define CSS_FILE "swad22.107.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.4: May 06, 2023 Changes in edition of exam. (338040 lines) Version 22.107.3: May 06, 2023 Changes in edition of exam. (338045 lines) Version 22.107.2: May 05, 2023 Removed unused action in exam sets. (338044 lines) Version 22.107.1: May 05, 2023 Changes in list of users to follow. (338105 lines) diff --git a/swad_exam.c b/swad_exam.c index b4fc7261a..55cfc75f4 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1298,21 +1298,16 @@ void Exa_PutFormsOneExam (struct Exa_Exams *Exams, /***** Put form to create/edit an exam *****/ Exa_PutFormEditionExam (Exams,Txt,ExistingNewExam); - /***** Show other lists *****/ - switch (ExistingNewExam) - { - case Exa_EXISTING_EXAM: - /* Show list of sets */ - ExaSet_ListExamSets (Exams,Set); - break; - case Exa_NEW_EXAM: - /* Show exams again */ - Exa_ListAllExams (Exams); - break; - } + /***** Show list of sets inside box *****/ + if (ExistingNewExam == Exa_EXISTING_EXAM) + ExaSet_ListExamSets (Exams,Set); /***** End box ****/ Box_BoxEnd (); + + /***** Show exams again outside box *****/ + if (ExistingNewExam == Exa_NEW_EXAM) + Exa_ListAllExams (Exams); } /*****************************************************************************/ diff --git a/swad_rubric.c b/swad_rubric.c index 4ff499740..1356b9b73 100644 --- a/swad_rubric.c +++ b/swad_rubric.c @@ -70,6 +70,8 @@ static void Rub_WriteAuthor (const struct Rub_Rubric *Rubric); static void Rub_RemoveRubricFromAllTables (long RubCod); +static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, + Rub_ExistingNewRubric_t ExistingNewRubric); static void Rub_ReceiveRubricFieldsFromForm (struct Rub_Rubric *Rubric); static bool Rub_CheckRubricFieldsReceivedFromForm (const struct Rub_Rubric *Rubric); @@ -840,8 +842,8 @@ void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics, /******************** Put a form to create/edit a rubric *********************/ /*****************************************************************************/ -void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, - Rub_ExistingNewRubric_t ExistingNewRubric) +static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, + Rub_ExistingNewRubric_t ExistingNewRubric) { extern const char *Hlp_ASSESSMENT_Rubrics_new_rubric; extern const char *Hlp_ASSESSMENT_Rubrics_edit_rubric; diff --git a/swad_rubric.h b/swad_rubric.h index 3bf14515f..f74d4baaa 100644 --- a/swad_rubric.h +++ b/swad_rubric.h @@ -73,8 +73,6 @@ void Rub_RemoveCrsRubrics (long CrsCod); void Rub_ReqCreatOrEditRubric (void); void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics, Rub_ExistingNewRubric_t ExistingNewRubric); -void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, - Rub_ExistingNewRubric_t ExistingNewRubric); void Rub_ReceiveFormRubric (void);