From e12627364bcd5fa7c27be910d43c43ed6f697e7e Mon Sep 17 00:00:00 2001 From: acanas Date: Mon, 13 Apr 2020 12:04:49 +0200 Subject: [PATCH] Version19.180.2 --- swad_changelog.h | 3 ++- swad_syllabus.c | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e0a034d1..7fd62bf3 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.180.1 (2020-04-12)" +#define Log_PLATFORM_VERSION "SWAD 19.180.2 (2020-04-13)" #define CSS_FILE "swad19.146.css" #define JS_FILE "swad19.172.1.js" /* @@ -548,6 +548,7 @@ Funci // TODO: Oresti Baños: cambiar ojos por candados en descriptores para prohibir/permitir y dejar los ojos para poder elegir descriptores // TODO: Integrar pull requests con traducciones del alemán del usuario eruedin en GitHub + Version 19.180.2: Apr 13, 2020 Fixed bugs in syllabus. (285613 lines) Version 19.180.1: Apr 12, 2020 Changes in stats of clicks. (285599 lines) Version 19.180: Apr 12, 2020 Code refactoring in photo of degree. (285603 lines) Version 19.179: Apr 12, 2020 Code refactoring in indicators. (285582 lines) diff --git a/swad_syllabus.c b/swad_syllabus.c index 5799104b..538627a2 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -213,7 +213,7 @@ bool Syl_CheckSyllabus (struct Syl_Syllabus *Syllabus,long CrsCod) } /*****************************************************************************/ -/****************************** Edit a syllabus ******************************/ +/************** Load syllabus from file to memoruy and edit it ***************/ /*****************************************************************************/ // Return true if info available @@ -230,9 +230,22 @@ bool Syl_CheckAndEditSyllabus (struct Syl_Syllabus *Syllabus) /***** Load syllabus from XML file to memory *****/ Syl_LoadListItemsSyllabusIntoMemory (Syllabus,Gbl.Hierarchy.Crs.CrsCod); - if (Gbl.Action.Act == ActEditorSylLec || - Gbl.Action.Act == ActEditorSylPra) - Syllabus->EditionIsActive = true; + switch (Gbl.Action.Act) + { + case ActEditorSylLec: case ActEditorSylPra: + case ActDelItmSylLec: case ActDelItmSylPra: + case ActUp_IteSylLec: case ActUp_IteSylPra: + case ActDwnIteSylLec: case ActDwnIteSylPra: + case ActRgtIteSylLec: case ActRgtIteSylPra: + case ActLftIteSylLec: case ActLftIteSylPra: + case ActInsIteSylLec: case ActInsIteSylPra: + case ActModIteSylLec: case ActModIteSylPra: + Syllabus->EditionIsActive = true; + break; + default: + Syllabus->EditionIsActive = false; + break; + } if (Syllabus->EditionIsActive || Syl_LstItemsSyllabus.NumItems) { @@ -962,7 +975,7 @@ void Syl_RemoveItemSyllabus (void) /***** Show the updated syllabus to continue editing it *****/ Syl_FreeListItemsSyllabus (); - Syl_EditSyllabus (); + (void) Syl_CheckAndEditSyllabus (&Syllabus); } /*****************************************************************************/ @@ -1068,7 +1081,7 @@ static void Syl_ChangePlaceItemSyllabus (Syl_ChangePosItem_t UpOrDownPos) /***** Show the updated syllabus to continue editing it *****/ Syl_FreeListItemsSyllabus (); - Syl_EditSyllabus (); + (void) Syl_CheckAndEditSyllabus (&Syllabus); } /*****************************************************************************/ @@ -1237,7 +1250,7 @@ static void Syl_ChangeLevelItemSyllabus (Syl_ChangeLevelItem_t IncreaseOrDecreas /***** Show the updated syllabus to continue editing it *****/ Syl_FreeListItemsSyllabus (); - Syl_EditSyllabus (); + (void) Syl_CheckAndEditSyllabus (&Syllabus); } /*****************************************************************************/ @@ -1308,7 +1321,7 @@ void Syl_InsertItemSyllabus (void) /***** Show the updated syllabus to continue editing it *****/ Syl_FreeListItemsSyllabus (); - Syl_EditSyllabus (); + (void) Syl_CheckAndEditSyllabus (&Syllabus); } /*****************************************************************************/ @@ -1360,7 +1373,7 @@ void Syl_ModifyItemSyllabus (void) /***** Show the updated syllabus to continue editing it *****/ Syl_FreeListItemsSyllabus (); - Syl_EditSyllabus (); + (void) Syl_CheckAndEditSyllabus (&Syllabus); } /*****************************************************************************/