From c8bbe190641cc5dd9cc07d04f59d79738f5e07e4 Mon Sep 17 00:00:00 2001 From: Anuj Patel Date: Wed, 17 Apr 2024 00:15:07 +0530 Subject: [PATCH 1/2] removed initials of url http://0.0.0.0:8000 while fetching in assign-batch,assign-caretaker,assign-warden --- FusionIIIT/applications/hostel_management/views.py | 3 ++- FusionIIIT/templates/hostelmanagement/assign_batch.html | 2 +- FusionIIIT/templates/hostelmanagement/assign_caretaker.html | 4 ++-- FusionIIIT/templates/hostelmanagement/assign_warden.html | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/FusionIIIT/applications/hostel_management/views.py b/FusionIIIT/applications/hostel_management/views.py index 36c6aff5e..dc9a653c7 100644 --- a/FusionIIIT/applications/hostel_management/views.py +++ b/FusionIIIT/applications/hostel_management/views.py @@ -1120,7 +1120,8 @@ def post(self, request, *args, **kwargs): hall_id = data.get('hall_id') hall = Hall.objects.get(hall_id=hall_id) - previous_batch = hall.assigned_batch # Get the previous batch + # previous_batch = hall.assigned_batch # Get the previous batch + previous_batch = hall.assigned_batch if hall.assigned_batch is not None else 1 # Get the previous batch hall.assigned_batch = data.get('batch') hall.save() diff --git a/FusionIIIT/templates/hostelmanagement/assign_batch.html b/FusionIIIT/templates/hostelmanagement/assign_batch.html index 26a56d4fc..7f29caedd 100644 --- a/FusionIIIT/templates/hostelmanagement/assign_batch.html +++ b/FusionIIIT/templates/hostelmanagement/assign_batch.html @@ -26,7 +26,7 @@

Assign Batch

var hall_id = document.getElementById('hall__id').value; var batch = document.getElementById('batch').value; // Perform AJAX request to assign batch - fetch('http://0.0.0.0:8000/hostelmanagement/assign-batch/', { + fetch('/hostelmanagement/assign-batch/', { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/FusionIIIT/templates/hostelmanagement/assign_caretaker.html b/FusionIIIT/templates/hostelmanagement/assign_caretaker.html index 398b4067e..516d5e18b 100644 --- a/FusionIIIT/templates/hostelmanagement/assign_caretaker.html +++ b/FusionIIIT/templates/hostelmanagement/assign_caretaker.html @@ -38,10 +38,10 @@

Assign Caretaker

var hall_id = document.getElementById('_hall__id').value; var caretaker_username = document.getElementById('caretaker_username').value; - console.log('~~~~~~~~~~~', hall_id); + // console.log('~~~~~~~~~~~', hall_id); // Perform AJAX request to assign caretaker - fetch('http://0.0.0.0:8000/hostelmanagement/assign-caretaker', { + fetch('/hostelmanagement/assign-caretaker', { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/FusionIIIT/templates/hostelmanagement/assign_warden.html b/FusionIIIT/templates/hostelmanagement/assign_warden.html index 5dabfe429..31f266527 100644 --- a/FusionIIIT/templates/hostelmanagement/assign_warden.html +++ b/FusionIIIT/templates/hostelmanagement/assign_warden.html @@ -39,7 +39,7 @@

Assign Warden

// Perform AJAX request to assign batch - fetch('http://0.0.0.0:8000/hostelmanagement/assign-warden', { + fetch('/hostelmanagement/assign-warden', { method: 'POST', headers: { 'Content-Type': 'application/json', From 43900a560f5818c0e252263343710c378bbfb410 Mon Sep 17 00:00:00 2001 From: Anuj Patel Date: Wed, 17 Apr 2024 00:29:37 +0530 Subject: [PATCH 2/2] previous batch by default value 0 --- FusionIIIT/applications/hostel_management/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FusionIIIT/applications/hostel_management/views.py b/FusionIIIT/applications/hostel_management/views.py index dc9a653c7..78f317135 100644 --- a/FusionIIIT/applications/hostel_management/views.py +++ b/FusionIIIT/applications/hostel_management/views.py @@ -1121,7 +1121,7 @@ def post(self, request, *args, **kwargs): hall = Hall.objects.get(hall_id=hall_id) # previous_batch = hall.assigned_batch # Get the previous batch - previous_batch = hall.assigned_batch if hall.assigned_batch is not None else 1 # Get the previous batch + previous_batch = hall.assigned_batch if hall.assigned_batch is not None else 0 # Get the previous batch hall.assigned_batch = data.get('batch') hall.save()