minor fixes

This commit is contained in:
2024-10-25 14:37:15 +02:00
parent d4fa6b8c6e
commit c161995ae7
2 changed files with 21 additions and 9 deletions

View File

@@ -77,6 +77,7 @@ networks:
# TODO # TODO
- Creare un export dei pc in csv con Nome Cognome Codice fiscale cespite seriale data di consegna
- Default value of association "Pagamento effettuato" - Default value of association "Pagamento effettuato"
- import of storage, computers, courses. - import of storage, computers, courses.
- Tables Sorting with filters - Tables Sorting with filters

View File

@@ -51,25 +51,28 @@ def assignment_computer(request):
except Http404: except Http404:
form = AssignmentComputerForm() form = AssignmentComputerForm()
success = False
err = True err = True
err_str = "Uno o più dei valori inseriti non é stato trovato" err_str = "Uno o più dei valori inseriti non é stato trovato"
return render(request, "gestionale/assignment/assignment_computer.html", { 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: else:
form = AssignmentComputerForm() form = AssignmentComputerForm()
success = False
err = True err = True
err_str = "L'inserimento è incompleto o errato!" err_str = "L'inserimento è incompleto o errato!"
return render(request, "gestionale/assignment/assignment_computer.html", { 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") return redirect("assignment_computer")
else: else:
form = AssignmentComputerForm() form = AssignmentComputerForm()
success = True
err = False err = False
err_str = "" err_str = ""
return render(request, "gestionale/assignment/assignment_computer.html", { 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) @user_passes_test(lambda u: u.is_superuser or u.is_staff)
@@ -100,25 +103,28 @@ def assignment_accessory(request):
except Http404: except Http404:
form = AssignmentAccessoryForm() form = AssignmentAccessoryForm()
success = False
err = True err = True
err_str = "Uno o più dei valori inseriti non é stato trovato" err_str = "Uno o più dei valori inseriti non é stato trovato"
return render(request, "gestionale/assignment/assignment_accessory.html", { 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: else:
form = AssignmentAccessoryForm() form = AssignmentAccessoryForm()
success = False
err = True err = True
err_str = "L'inserimento è incompleto o errato!" err_str = "L'inserimento è incompleto o errato!"
return render(request, "gestionale/assignment/assignment_accessory.html", { 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") return redirect("assignment_accessory")
else: else:
form = AssignmentAccessoryForm() form = AssignmentAccessoryForm()
success = True
err = False err = False
err_str = "" err_str = ""
return render(request, "gestionale/assignment/assignment_accessory.html", { 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) @user_passes_test(lambda u: u.is_superuser or u.is_staff)
@@ -143,21 +149,26 @@ def assignment_cespite(request):
record.save() record.save()
except Http404: except Http404:
form = CespiteForm() form = CespiteForm()
success = False
err = True err = True
err_str = "Uno o più dei valori inseriti non é stato trovato" err_str = "Uno o più dei valori inseriti non é stato trovato"
return render(request, "gestionale/assignment/cespite.html", { 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") return redirect("assignment_cespite")
else: else:
form = CespiteForm() form = CespiteForm()
success = False
err = True err = True
err_str = "L'inserimento é incompleto o errato!" err_str = "L'inserimento é incompleto o errato!"
return render(request, "gestionale/assignment/cespite.html", { 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: else:
form = CespiteForm() form = CespiteForm()
success = True
err = False
err_str = ""
return render(request, "gestionale/assignment/cespite.html", { return render(request, "gestionale/assignment/cespite.html", {
"form": form}) "form": form , "err": err, "err_str": err_str, "success": success })