Merge pull request #1639 from Lone24wolf/ac-7-examination

Redirection Bugs Fixed

FusionIIIT/applications/examination/views.py

@@ -1035,7 +1035,7 @@ def updateEntergradesDean(request):
 
     if not course_present:
         context = {"message": "THIS COURSE IS NOT SUBMITTED BY THE INSTRUCTOR"}
-        return render(request, "../templates/examination/message.html", context)
+        return render(request, "../templates/examination/messageDean.html", context)
 
     context = {"registrations": course_present}
 
@@ -1182,23 +1182,29 @@ def validateDeanSubmit(request):
         csv_file = request.FILES["csv_file"]
 
         if not csv_file.name.endswith(".csv"):
-            return JsonResponse(
-                {"error": "Invalid file format. Please upload a CSV file."}, status=400
-            )
+            message = "Please Submit a csv file "
+            context = {
+                 "message":message,
+                }
+            return render(request, "../templates/examination/messageDean.html", context)
 
         course_id = request.POST.get("course")
         academic_year = request.POST.get("year")
         # semester = request.POST.get('semester')
         print(academic_year)
         if academic_year is None or not academic_year.isdigit():
-            return JsonResponse(
-                {"error": "Academic year must be a valid number."}, status=400
-            )
+            message = "Academic Year must be a number"
+            context = {
+                 "message":message,
+                }
+            return render(request, "../templates/examination/messageDean.html", context)
 
         if not course_id or not academic_year:
-            return JsonResponse(
-                {"error": "Course ID and Academic Year are required."}, status=400
-            )
+            message = "Course and Academic year are required"
+            context = {
+                 "message":message,
+                }
+            return render(request, "../templates/examination/messageDean.html", context)
 
         # courses_info = Courses.objects.get(id=course_id)
 
@@ -1218,12 +1224,12 @@ def validateDeanSubmit(request):
 
             required_columns = ["roll_no", "name", "grade", "remarks"]
             if not all(column in reader.fieldnames for column in required_columns):
-                return JsonResponse(
-                    {
-                        "error": "CSV file must contain the following columns: roll_no, name, grade, remarks."
-                    },
-                    status=400,
-                )
+                message = "CSV file must contain the following columns: roll_no, name, grade, remarks."
+                context = {
+                 "message":message,
+                }
+                return render(request, "../templates/examination/messageDean.html", context)
+                   
             semester = students.first().semester_id_id
             mismatch=[]
             for row in reader:
@@ -1259,7 +1265,7 @@ def validateDeanSubmit(request):
                 context = {
                  "message":message,
                 }
-                return render(request, "../templates/examination/message.html", context)
+                return render(request, "../templates/examination/messageDean.html", context)
             context = {
                  "mismatch": mismatch,
                 }
@@ -1271,4 +1277,4 @@ def validateDeanSubmit(request):
             context = {
                 "message": error_message,
             }
-            return render(request, "../templates/examination/message.html", context)
+            return render(request, "../templates/examination/messageDean.html", context)

FusionIIIT/templates/examination/message.html

@@ -36,17 +36,12 @@
 
 </style>
 <div class="ui medium fluid vertical pointing menu" style="max-width: 320px;">
-  <a class="active item" href="{% url 'examination:submitGrades' %}"></B>Submit</B>
+  <a class="item" href="{% url 'examination:submitGrades' %}">Submit
     <i class="right floated chevron right icon"></i>
   </a>
   <a class="item" href="{% url 'examination:updateGrades' %}">Verify
     <i class="right floated chevron right icon"></i>
   </a>
-  {% comment %} <a class="item" href="{% url 'examination:authenticate' %}">Authenticate Course
-    <i class="right floated chevron right icon"></i>
-  </a> {% endcomment %}
-
-
   <a class="item" href="{% url 'examination:announcement' %}">Announcement
     <i class="right floated chevron right icon"></i>
   </a>

FusionIIIT/templates/examination/messageDean.html

@@ -0,0 +1,63 @@
+{% extends 'examination/base.html' %}
+
+{% block sidetabmenu %}
+<style>
+  /* Your existing CSS styles */
+
+  .sortable-icon {
+      margin-left: 5px;
+      font-size: 1.2em;
+      color: blue;
+  }
+
+  .sortable-icon + .sortable-icon {
+      margin-left: 2px;
+  }
+  /* Your existing CSS styles */
+
+  .sortable-icon {
+      margin-left: 5px;
+      font-size: 1.2em;
+      color: blue;
+      display: inline-block;
+  }
+
+  th {
+      white-space: nowrap; /* Prevent line breaks */
+  }
+
+  th:first-child .sortable-icon {
+      margin-left: 0; /* Remove left margin for the first icon */
+  }
+
+  .sortable-icon + .sortable-icon {
+      margin-left: 2px;
+  }
+
+</style>
+<div class="ui medium fluid vertical pointing menu" style="max-width: 320px;">
+
+  <a class="active item" href="{% url 'examination:verifyGradesDean' %}">Verify
+    <i class="right floated chevron right icon"></i>
+  </a>
+  <a class="item" href="{% url 'examination:validateDean' %}"> Validate
+    <i class="right floated chevron right icon"></i>
+  </a>
+
+
+
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="ui segment">
+  <div class="ui message">
+    <div class="header">
+      {{message}}
+    </div>
+
+    <p>Please check back later or contact support for assistance.</p>
+  </div>
+</div>
+
+{% endblock %}

FusionIIIT/templates/examination/validation.html

@@ -8,7 +8,7 @@
   {% comment %} <a class="item" href="{% url 'examination:authenticate' %}">Authenticate Course
     <i class="right floated chevron right icon"></i>
   </a> {% endcomment %}
-  <a class="item" href="{% url 'examination:validateDean' %}"> Validate
+  <a class="item" href="{% url 'examination:validateDean' %}"><B> Validate</B>
     <i class="right floated chevron right icon"></i>
   </a>
 </div>

FusionIIIT/templates/examination/validationSubmit.html

@@ -44,7 +44,7 @@
     <i class="right floated chevron right icon"></i>
   </a> {% endcomment %}
 
-  <a class="item" href="{% url 'examination:validateDean' %}"> Validate
+  <a class="item" href="{% url 'examination:validateDean' %}"><B> Validate</B>
     <i class="right floated chevron right icon"></i>
   </a>
 </div>