Merge 5177edb into 0aa112e

Dashboard/templates/Dashboard/tutor_info.html

@@ -93,10 +93,14 @@ <h2 class="fw-bold mb-0 fs-2 text-center w-100">Your Tutor Profile</h2>
                 {{ tutor_form.salary_max }}
               </div>
             </div>
+            <div id="timeslot-error-message" class="alert alert-danger" style="display: none;">
+              Minimum Hourly Rate must be less than Maximum Hourly Rate
+            </div>
             <div class="mb-3">
               {{ tutor_transcript_form.transcript.label_tag }}
               {% if tutor_form.instance.transcript %}
-              <p> <a href="{% url 'Dashboard:download_transcript' tutor_form.instance.id %}" download>{{tutor_form.instance.transcript.name|cut:'transcripts/' }}</a></p>
+              <p> <a href="{% url 'Dashboard:download_transcript' tutor_form.instance.id %}"
+                  download>{{tutor_form.instance.transcript.name|cut:'transcripts/' }}</a></p>
               {% endif %}
               {{ tutor_transcript_form.transcript }}
 
@@ -152,10 +156,29 @@ <h5 class="modal-title" id="imagePreviewModalLabel">Image Preview</h5>
       $("#id_availabilities").val(JSON.stringify(availabilities));
 
     }
-
     prepopulateAvailabilities();
   });
 
+  $(document).ready(function () {
+  console.log("Script loaded successfully");
+  $('form').submit(function (event) {
+    var minSalary = parseFloat($('#id_salary_min').val());
+    var maxSalary = parseFloat($('#id_salary_max').val());
+
+    if (minSalary >= maxSalary) {
+      event.preventDefault();
+      const errorMessageDiv = document.getElementById('timeslot-error-message');
+      errorMessageDiv.style.display = 'block';
+    }
+  });
+
+  $('#id_salary_min, #id_salary_max').change(function () {
+    const errorMessageDiv = document.getElementById('timeslot-error-message');
+    errorMessageDiv.style.display = 'none';
+  });
+});
+
+
 
   function addAvailability() {
 
@@ -213,12 +236,12 @@ <h5 class="modal-title" id="imagePreviewModalLabel">Image Preview</h5>
   function displayError(message) {
     var errorDiv = $("#availability-error");
     errorDiv.text(message);
-    errorDiv.show(); 
+    errorDiv.show();
   }
 
   function clearError() {
     var errorDiv = $("#availability-error");
-    errorDiv.hide(); 
+    errorDiv.hide();
   }
 
 

Dashboard/views.py

@@ -468,17 +468,22 @@ def Requests(request):
 
 
 def AcceptRequest(request, session_id):
-    session = TutoringSession.objects.get(pk=session_id)
-
-    if session.status == "Pending":
-        session.status = "Accepted"
-        session.save()
-    else:
-        # If status is not 'Pending', raise an error message
-        messages.error(
-            request, "This request has been cancelled and cannot be accepted."
+    accepted_session = TutoringSession.objects.get(pk=session_id)
+    accepted_session.status = "Accepted"
+    accepted_session.save()
+    overlapping_sessions = (
+        TutoringSession.objects.filter(
+            tutor_id=accepted_session.tutor_id,
+            date=accepted_session.date,
+            status="Pending",
         )
-
+        .exclude(pk=session_id)
+        .exclude(
+            Q(start_time__gte=accepted_session.end_time)
+            | Q(end_time__lte=accepted_session.start_time)
+        )
+    )
+    overlapping_sessions.update(status="Declined")
     return redirect("Dashboard:requests")
 
 

TutorFilter/forms.py

@@ -4,6 +4,8 @@
 from Dashboard.choices import EXPERTISE_CHOICES
 from django.utils import timezone
 from datetime import timedelta
+from django.core.validators import MinValueValidator
+from django.core.exceptions import ValidationError
 
 
 class TutorFilterForm(forms.Form):
@@ -176,9 +178,13 @@ class TutoringSessionRequestForm(forms.ModelForm):
         choices=[], widget=forms.Select(attrs={"class": "form-select"})
     )
 
+    offering_rate = forms.DecimalField(
+        validators=[MinValueValidator(0.01)],
+        widget=forms.NumberInput(attrs={"class": "form-control", "min": "0.01"}),
+    )
+
     def __init__(self, *args, tutor_user=None, **kwargs):
         super().__init__(*args, **kwargs)
-
         available_subject_choices = []
         if tutor_user:
             tutor_profile = ProfileT.objects.filter(user=tutor_user).first()

TutorFilter/tests.py

@@ -310,7 +310,7 @@ def test_request_tutoring_session_post_valid(self):
         data = {
             "tutoring_mode": "remote",
             "subject": "math",
-            "date": "2024-04-01",
+            "date": "2025-04-01",
             "offering_rate": 50,
             "message": "Looking forward to the session!",
             "selected_timeslots": json.dumps([{"start": "09:00", "end": "09:30"}]),