From c161995ae7bc85007596008c249019a7c13b3e28 Mon Sep 17 00:00:00 2001 From: Nastro_ Date: Fri, 25 Oct 2024 14:37:15 +0200 Subject: [PATCH] minor fixes --- GestionaleITS/Readme.md | 1 + .../gestionale/views/views_assignment.py | 29 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/GestionaleITS/Readme.md b/GestionaleITS/Readme.md index d4b69a9..d414fc5 100644 --- a/GestionaleITS/Readme.md +++ b/GestionaleITS/Readme.md @@ -77,6 +77,7 @@ networks: # TODO +- Creare un export dei pc in csv con Nome Cognome Codice fiscale cespite seriale data di consegna - Default value of association "Pagamento effettuato" - import of storage, computers, courses. - Tables Sorting with filters diff --git a/GestionaleITS/gestionale/views/views_assignment.py b/GestionaleITS/gestionale/views/views_assignment.py index ff72aac..b0c0aa2 100644 --- a/GestionaleITS/gestionale/views/views_assignment.py +++ b/GestionaleITS/gestionale/views/views_assignment.py @@ -51,25 +51,28 @@ def assignment_computer(request): except Http404: form = AssignmentComputerForm() + success = False err = True err_str = "Uno o più dei valori inseriti non é stato trovato" return render(request, "gestionale/assignment/assignment_computer.html", { - "err": err, "err_str": err_str, "form": form + "err": err, "err_str": err_str, "form": form, "success": success }) else: form = AssignmentComputerForm() + success = False err = True err_str = "L'inserimento è incompleto o errato!" return render(request, "gestionale/assignment/assignment_computer.html", { - "err": err, "err_str": err_str, "form": form + "err": err, "err_str": err_str, "form": form, "success": success }) return redirect("assignment_computer") else: form = AssignmentComputerForm() + success = True err = False err_str = "" return render(request, "gestionale/assignment/assignment_computer.html", { - "form": form, "err": err, "err_str": err_str + "form": form, "err": err, "err_str": err_str, "success": success }) @user_passes_test(lambda u: u.is_superuser or u.is_staff) @@ -100,25 +103,28 @@ def assignment_accessory(request): except Http404: form = AssignmentAccessoryForm() + success = False err = True err_str = "Uno o più dei valori inseriti non é stato trovato" return render(request, "gestionale/assignment/assignment_accessory.html", { - "err": err, "err_str": err_str, "form": form + "err": err, "err_str": err_str, "form": form, "success": success }) else: form = AssignmentAccessoryForm() + success = False err = True err_str = "L'inserimento è incompleto o errato!" return render(request, "gestionale/assignment/assignment_accessory.html", { - "err": err, "err_str": err_str, "form": form + "err": err, "err_str": err_str, "form": form, "success": success }) return redirect("assignment_accessory") else: form = AssignmentAccessoryForm() + success = True err = False err_str = "" return render(request, "gestionale/assignment/assignment_accessory.html", { - "form": form, "err": err, "err_str": err_str + "form": form, "err": err, "err_str": err_str, "success": success }) @user_passes_test(lambda u: u.is_superuser or u.is_staff) @@ -143,21 +149,26 @@ def assignment_cespite(request): record.save() except Http404: form = CespiteForm() + success = False err = True err_str = "Uno o più dei valori inseriti non é stato trovato" return render(request, "gestionale/assignment/cespite.html", { - "err": err, "err_str": err_str, "form": form + "err": err, "err_str": err_str, "form": form, "success": success }) return redirect("assignment_cespite") else: form = CespiteForm() + success = False err = True err_str = "L'inserimento é incompleto o errato!" return render(request, "gestionale/assignment/cespite.html", { - "form": form, "err": err, "err_str": err_str}) + "form": form, "err": err, "err_str": err_str , "success": success }) else: form = CespiteForm() + success = True + err = False + err_str = "" return render(request, "gestionale/assignment/cespite.html", { - "form": form}) + "form": form , "err": err, "err_str": err_str, "success": success })