From 46d06747ee434cfaacf915d3d20827fbe4990e26 Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 7 Feb 2021 22:10:38 +0100 Subject: [PATCH] Version20.11.1 --- swad_assignment.c | 39 +++++++++++++++++++++------------------ swad_changelog.h | 4 ++-- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/swad_assignment.c b/swad_assignment.c index f999072d2..125cb5c8c 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -76,12 +76,14 @@ static void Asg_PutIconsListAssignments (void *Assignments); static void Asg_PutIconToCreateNewAsg (void *Assignments); static void Asg_PutButtonToCreateNewAsg (void *Assignments); static void Asg_ParamsWhichGroupsToShow (void *Assignments); -static void Asg_ShowOneAssignment (long AsgCod,bool PrintView); +static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments, + long AsgCod,bool PrintView); static void Asg_WriteAsgAuthor (struct Asg_Assignment *Asg); static void Asg_WriteAssignmentFolder (struct Asg_Assignment *Asg,bool PrintView); static Dat_StartEndTime_t Asg_GetParamAsgOrder (void); -static void Asg_PutFormsToRemEditOneAsg (const struct Asg_Assignment *Asg, +static void Asg_PutFormsToRemEditOneAsg (struct Asg_Assignments *Assignments, + const struct Asg_Assignment *Asg, const char *Anchor); static void Asg_PutParams (void *Assignments); static void Asg_GetListAssignments (struct Asg_Assignments *Assignments); @@ -185,7 +187,8 @@ static void Asg_ShowAllAssignments (struct Asg_Assignments *Assignments) for (NumAsg = Pagination.FirstItemVisible; NumAsg <= Pagination.LastItemVisible; NumAsg++) - Asg_ShowOneAssignment (Assignments->LstAsgCods[NumAsg - 1], + Asg_ShowOneAssignment (Assignments, + Assignments->LstAsgCods[NumAsg - 1], false); // Not print view /***** End table *****/ @@ -363,7 +366,8 @@ void Asg_PrintOneAssignment (void) true); // Print view /***** Write assignment *****/ - Asg_ShowOneAssignment (AsgCod, + Asg_ShowOneAssignment (&Assignments, + AsgCod, true); // Print view /***** End table *****/ @@ -374,7 +378,8 @@ void Asg_PrintOneAssignment (void) /*************************** Show one assignment *****************************/ /*****************************************************************************/ -static void Asg_ShowOneAssignment (long AsgCod,bool PrintView) +static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments, + long AsgCod,bool PrintView) { char *Anchor = NULL; static unsigned UniqueId = 0; @@ -399,7 +404,7 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView) else { HTM_TD_Begin ("rowspan=\"2\" class=\"CONTEXT_COL COLOR%u\"",Gbl.RowEvenOdd); - Asg_PutFormsToRemEditOneAsg (&Asg,Anchor); + Asg_PutFormsToRemEditOneAsg (Assignments,&Asg,Anchor); } HTM_TD_End (); @@ -595,15 +600,13 @@ static Dat_StartEndTime_t Asg_GetParamAsgOrder (void) /***************** Put a link (form) to edit one assignment ******************/ /*****************************************************************************/ -static void Asg_PutFormsToRemEditOneAsg (const struct Asg_Assignment *Asg, +static void Asg_PutFormsToRemEditOneAsg (struct Asg_Assignments *Assignments, + const struct Asg_Assignment *Asg, const char *Anchor) { - struct Asg_Assignments Assignments; - - /***** Reset assignments *****/ - Asg_ResetAssignments (&Assignments); - - Assignments.AsgCodToEdit = Asg->AsgCod; // Used as parameter in contextual links + /***** Set assigment to edit + (used as parameter in contextual links) *****/ + Assignments->AsgCodToEdit = Asg->AsgCod; switch (Gbl.Usrs.Me.Role.Logged) { @@ -611,26 +614,26 @@ static void Asg_PutFormsToRemEditOneAsg (const struct Asg_Assignment *Asg, case Rol_SYS_ADM: /***** Put form to remove assignment *****/ Ico_PutContextualIconToRemove (ActReqRemAsg,NULL, - Asg_PutParams,&Assignments); + Asg_PutParams,Assignments); /***** Put form to hide/show assignment *****/ if (Asg->Hidden) Ico_PutContextualIconToUnhide (ActShoAsg,Anchor, - Asg_PutParams,&Assignments); + Asg_PutParams,Assignments); else Ico_PutContextualIconToHide (ActHidAsg,Anchor, - Asg_PutParams,&Assignments); + Asg_PutParams,Assignments); /***** Put form to edit assignment *****/ Ico_PutContextualIconToEdit (ActEdiOneAsg,NULL, - Asg_PutParams,&Assignments); + Asg_PutParams,Assignments); /* falls through */ /* no break */ case Rol_STD: case Rol_NET: /***** Put form to print assignment *****/ Ico_PutContextualIconToPrint (ActPrnOneAsg, - Asg_PutParams,&Assignments); + Asg_PutParams,Assignments); break; default: break; diff --git a/swad_changelog.h b/swad_changelog.h index 88d457996..0e51b4be0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -553,7 +553,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.11 (2021-02-07)" +#define Log_PLATFORM_VERSION "SWAD 20.11.1 (2021-02-07)" #define CSS_FILE "swad20.8.css" #define JS_FILE "swad20.6.2.js" /* @@ -578,7 +578,6 @@ TODO: En los resultados de una partida, cuando la pregunta ha sido modificada, n Por ejemplo una pregunta podria haber sido bien contestada con 1 punto, y se muestra en esa pregunta modificada aparece 0 en rojo. TODO: Al pulsar en una notificación de un mensaje nos lleva a la página 1, aunque el mensaje esté en otra página. -TODO: Al pulsar en la acción 964 (ocultar o visualizar una actividad) en la página 1, nos lleva erróneamente a la página 2. TODO: Partidas en SWADroid: Hola Antonio: @@ -601,6 +600,7 @@ TODO: DNI de un estudiante sale err TODO: BUG: Cuando un tipo de grupo sólo tiene un grupo, inscribirse es voluntario, el estudiante sólo puede pertenecer a un grupo, y se inscribe en él, debería poder desapuntarse. Ahora no puede. + Version 20.11.1: Feb 07, 2021 Fixed bugs in assigments pagination. (304880 lines) Version 20.11: Feb 07, 2021 An editing teacher can access and modify all files in all projects in course. (304875 lines) Version 20.10.3: Feb 07, 2021 Fixed bug when a teacher changes a student's photo. Reported by Javier Fernández Baldomero. (304871 lines) Version 20.10.2: Feb 02, 2021 Pending password is deleted when used for the first time. (304870 lines)