From 02ea922ebe816dc6ccd14e2026c8effa23b21d22 Mon Sep 17 00:00:00 2001 From: acanas Date: Thu, 26 Nov 2020 00:28:21 +0100 Subject: [PATCH] Version20.7.3 --- swad_assignment.c | 22 +++++++++++++++++++++- swad_changelog.h | 3 ++- swad_group.c | 5 ++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/swad_assignment.c b/swad_assignment.c index 45b8bac6..f999072d 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1064,6 +1064,11 @@ void Asg_RemoveAssignment (void) /***** Reset assignments *****/ Asg_ResetAssignments (&Assignments); + /***** Get parameters *****/ + Assignments.SelectedOrder = Asg_GetParamAsgOrder (); + Gbl.Crs.Grps.WhichGrps = Grp_GetParamWhichGroups (); + Assignments.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); + /***** Get assignment code *****/ if ((Asg.AsgCod = Asg_GetParamAsgCod ()) == -1L) Lay_ShowErrorAndExit ("Code of assignment is missing."); @@ -1106,6 +1111,11 @@ void Asg_HideAssignment (void) /***** Reset assignments *****/ Asg_ResetAssignments (&Assignments); + /***** Get parameters *****/ + Assignments.SelectedOrder = Asg_GetParamAsgOrder (); + Gbl.Crs.Grps.WhichGrps = Grp_GetParamWhichGroups (); + Assignments.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); + /***** Get assignment code *****/ if ((Asg.AsgCod = Asg_GetParamAsgCod ()) == -1L) Lay_ShowErrorAndExit ("Code of assignment is missing."); @@ -1135,6 +1145,11 @@ void Asg_ShowAssignment (void) /***** Reset assignments *****/ Asg_ResetAssignments (&Assignments); + /***** Get parameters *****/ + Assignments.SelectedOrder = Asg_GetParamAsgOrder (); + Gbl.Crs.Grps.WhichGrps = Grp_GetParamWhichGroups (); + Assignments.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); + /***** Get assignment code *****/ if ((Asg.AsgCod = Asg_GetParamAsgCod ()) == -1L) Lay_ShowErrorAndExit ("Code of assignment is missing."); @@ -1417,6 +1432,11 @@ void Asg_ReceiveFormAssignment (void) /***** Reset assignments *****/ Asg_ResetAssignments (&Assignments); + /***** Get parameters *****/ + Assignments.SelectedOrder = Asg_GetParamAsgOrder (); + Grp_GetParamWhichGroups (); + Assignments.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); + /***** Get the code of the assignment *****/ NewAsg.AsgCod = Asg_GetParamAsgCod (); ItsANewAssignment = (NewAsg.AsgCod < 0); @@ -1541,7 +1561,7 @@ void Asg_ReceiveFormAssignment (void) Asg_UpdateNumUsrsNotifiedByEMailAboutAssignment (NewAsg.AsgCod,NumUsrsToBeNotifiedByEMail); /***** Show all assignments again *****/ - Asg_ShowAllAssignments (&Assignments); + Asg_ShowAllAssignments (&Assignments); } else // TODO: The form should be filled with partial data, now is always empty diff --git a/swad_changelog.h b/swad_changelog.h index 6afa6814..7f602f7c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -555,7 +555,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 20.7.1 (2020-11-25)" +#define Log_PLATFORM_VERSION "SWAD 20.7.3 (2020-11-26)" #define CSS_FILE "swad20.1.1.css" #define JS_FILE "swad20.6.2.js" /* @@ -602,6 +602,7 @@ Juan Miguel. TODO: Fix bug: un profesor editor no puede ver las carpetas de TFG (proyectos) de otros. Debería poder. TODO: DNI de un estudiante sale erróneamente como ******* en lugar de mostrarse al ver los accesos de un estudiante a la asignatura. + Version 20.7.3: Nov 26, 2020 Fixed bugs in pagination when editing assignments. (304706 lines) Version 20.7.2: Nov 25, 2020 Changes in edition of matches. (304690 lines) Version 20.7.1: Nov 25, 2020 New file extension .ipynb, suggested by Pedro A. García Sánchez. (304688 lines) Copy the following icon to icon public directory: diff --git a/swad_group.c b/swad_group.c index 736b5bb8..394a7f11 100644 --- a/swad_group.c +++ b/swad_group.c @@ -4984,9 +4984,8 @@ void Grp_PutParamAllGroups (void) void Grp_PutParamWhichGroups (void *WhichGrps) { if (WhichGrps) - if (*((Grp_WhichGroups_t *) WhichGrps) != Grp_WHICH_GROUPS_DEFAULT) - Par_PutHiddenParamUnsigned (NULL,"WhichGrps", - (unsigned) *((Grp_WhichGroups_t *) WhichGrps)); + Par_PutHiddenParamUnsigned (NULL,"WhichGrps", + (unsigned) *((Grp_WhichGroups_t *) WhichGrps)); } void Grp_PutParamWhichGrpsOnlyMyGrps (void)