Nastro/GestionaleITSPy
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed alert bug in assignment and order of computers in bundle

Browse Source
This commit is contained in:
Nastro_
2024-10-28 10:31:20 +01:00
parent a24f5d1026
commit 1d93d3d8f4
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
GestionaleITS/gestionale/views/views_assignment.py
View File

@@ -23,14 +23,15 @@ def assignment(request):
@user_passes_test(lambda u: u.is_superuser or u.is_staff) @user_passes_test(lambda u: u.is_superuser or u.is_staff)
def assignment_computer(request): def assignment_computer(request):
success_ = None
if request.method == "POST": if request.method == "POST":
form = AssignmentComputerForm(request.POST) form = AssignmentComputerForm(request.POST)
if form.is_valid(): if form.is_valid():
form = form.cleaned_data form = form.cleaned_data
try: try:
course = get_object_or_404(Course, course_code=form["course_code"]) course = get_object_or_404(Course, course_code=form["course_code"])
student = get_object_or_404(Student, codice_fiscale=form["codice_fiscale"], course_id=course) student = get_object_or_404(Student, codice_fiscale=form["codice_fiscale"].upper(), course_id=course)
computer = get_object_or_404(Computer, serial=form["serial"]) computer = get_object_or_404(Computer, serial=form["serial"].upper())
record = Record() record = Record()
computer_copy = copy.deepcopy(computer) computer_copy = copy.deepcopy(computer)
record.prev_product_detail = computer_copy record.prev_product_detail = computer_copy
@@ -51,39 +52,39 @@ def assignment_computer(request):
except Http404: except Http404:
form = AssignmentComputerForm() form = AssignmentComputerForm()
success = False 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, "success": success "err": err, "err_str": err_str, "form": form, "success": success_
}) })
else: else:
form = AssignmentComputerForm() form = AssignmentComputerForm()
success = False 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, "success": success "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, "success": success "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)
def assignment_accessory(request): def assignment_accessory(request):
success_ = None
if request.method == "POST": if request.method == "POST":
form = AssignmentAccessoryForm(request.POST) form = AssignmentAccessoryForm(request.POST)
if form.is_valid(): if form.is_valid():
form = form.cleaned_data form = form.cleaned_data
try: try:
course = get_object_or_404(Course, course_code=form["course_code"]) course = get_object_or_404(Course, course_code=form["course_code"])
student = get_object_or_404(Student, codice_fiscale=form["codice_fiscale"], course_id=course) student = get_object_or_404(Student, codice_fiscale=form["codice_fiscale"].upper, course_id=course)
accessory = get_object_or_404(Accessory, id=form["id"]) accessory = get_object_or_404(Accessory, id=form["id"])
record = Record() record = Record()
accessory_copy = copy.deepcopy(accessory) accessory_copy = copy.deepcopy(accessory)
@@ -103,39 +104,39 @@ def assignment_accessory(request):
except Http404: except Http404:
form = AssignmentAccessoryForm() form = AssignmentAccessoryForm()
success = False 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, "success": success "err": err, "err_str": err_str, "form": form, "success": success_
}) })
else: else:
form = AssignmentAccessoryForm() form = AssignmentAccessoryForm()
success = False 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, "success": success "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, "success": success "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)
def assignment_cespite(request): def assignment_cespite(request):
success_ = None
if request.method == "POST": if request.method == "POST":
form = CespiteForm(request.POST) form = CespiteForm(request.POST)
if form.is_valid(): if form.is_valid():
form = form.cleaned_data form = form.cleaned_data
try: try:
record = Record() record = Record()
computer = get_object_or_404(Computer, serial=form["serial"]) computer = get_object_or_404(Computer, serial=form["serial"].upper())
computer_copy = copy.deepcopy(computer) computer_copy = copy.deepcopy(computer)
computer.cespite = form["cespite"] computer.cespite = form["cespite"]
computer.save() computer.save()
@@ -149,26 +150,25 @@ def assignment_cespite(request):
record.save() record.save()
except Http404: except Http404:
form = CespiteForm() form = CespiteForm()
success = False 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, "success": success "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 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 , "success": success }) "form": form, "err": err, "err_str": err_str , "success": success_ })
else: else:
form = CespiteForm() form = CespiteForm()
success = True
err = False err = False
err_str = "" err_str = ""
return render(request, "gestionale/assignment/cespite.html", { return render(request, "gestionale/assignment/cespite.html", {
"form": form , "err": err, "err_str": err_str, "success": success }) "form": form , "err": err, "err_str": err_str, "success": success_ })

10
GestionaleITS/gestionale/views/views_details.py
View File

@@ -18,9 +18,9 @@ def details_bundle(request, id):
computers = None computers = None
accessories = None accessories = None
if bundle.product_type == "Computer": if bundle.product_type == "Computer":
computers = Computer.objects.filter(id_bundle_id=id) computers = Computer.objects.filter(id_bundle_id=id).order_by("id")
if bundle.product_type == "Accessory": if bundle.product_type == "Accessory":
accessories = Accessory.objects.filter(id_bundle_id=id) accessories = Accessory.objects.filter(id_bundle_id=id).order_by("id")
if request.method == "GET": if request.method == "GET":
return render(request, "gestionale/details/detailsbundle.html", { return render(request, "gestionale/details/detailsbundle.html", {
"bundle": bundle, "computers": computers, "accessories": accessories, "bundle_type": bundle_type, "bundle": bundle, "computers": computers, "accessories": accessories, "bundle_type": bundle_type,
@@ -32,7 +32,7 @@ def details_bundle(request, id):
@user_passes_test(lambda u: u.is_superuser or u.is_staff) @user_passes_test(lambda u: u.is_superuser or u.is_staff)
def details_course(request, id): def details_course(request, id):
course = get_object_or_404(Course, id=id) course = get_object_or_404(Course, id=id)
students = Student.objects.filter(course_id= id) students = Student.objects.filter(course_id=id).order_by("id")
if request.method == "GET": if request.method == "GET":
return render(request, "gestionale/details/detailscourse.html", { return render(request, "gestionale/details/detailscourse.html", {
"course": course, "students": students "course": course, "students": students
@@ -43,8 +43,8 @@ def details_course(request, id):
@user_passes_test(lambda u: u.is_superuser or u.is_staff) @user_passes_test(lambda u: u.is_superuser or u.is_staff)
def details_student(request, id): def details_student(request, id):
student = get_object_or_404(Student, id=id) student = get_object_or_404(Student, id=id)
computers = Computer.objects.filter(id_student_id=id) computers = Computer.objects.filter(id_student_id=id).order_by("id")
accessories = Accessory.objects.filter(id_student_id=id) accessories = Accessory.objects.filter(id_student_id=id).order_by("id")
if request.method == "GET": if request.method == "GET":
return render(request, "gestionale/details/detailsstudent.html", { return render(request, "gestionale/details/detailsstudent.html", {
"student": student, "computers": computers, "accessories": accessories "student": student, "computers": computers, "accessories": accessories