Merge pull request #1862 from vikrantwiz02/prod/acad-react

Added old_course_registration field to CourseAddRequest model and update related logic

Author: vikrantwiz02

FusionIIIT/applications/academic_procedures/api/views.py

@@ -288,6 +288,10 @@ def add_course(request):
         current_year = datetime.datetime.now().year
         session, semester_type = generate_current_session(current_year, student.curr_semester_no)
 
+        old_course_reg = course_registration.objects.filter(
+            student_id=student,
+            course_id=course
+        ).order_by('-working_year', '-semester_id__semester_no').first()
 
         existing_request = CourseAddRequest.objects.filter(
             student=student,
@@ -310,6 +314,7 @@ def add_course(request):
                 course_slot=slot,
                 academic_year=session,
                 semester_type=semester_type,
+                old_course_registration=old_course_reg,
                 status='Pending'
             )
         except Exception as create_error:
@@ -1264,6 +1269,10 @@ def verify_course(request):
     year = today.year
     semflag = 1 if today.month >= 7 else 2
     yearr = f"{year}-{year+1}"
+    if today.month >= 7:
+        current_semester_type = "Odd Semester"
+    else:
+        current_semester_type = "Even Semester"
 
     return Response({
         "details": details,
@@ -1272,6 +1281,10 @@ def verify_course(request):
         "semester_list": semester_list,
         "courseslot_list": courseslot_list,
         "date": {"year": yearr, "semflag": semflag},
+        "current_semester": {
+            "semester_no": student.curr_semester_no,
+            "semester_type": current_semester_type
+        }
     })
 
 
@@ -3335,7 +3348,7 @@ def student_registrations_for_drop(request):
     eligibility_resp = get_add_drop_replace_registration_eligibility(timezone.now().date(), student.curr_semester_no, datetime.datetime.now().year)
     if isinstance(eligibility_resp, JsonResponse):
         return eligibility_resp
-    regs = course_registration.objects.filter(student_id=student, semester_id__semester_no = student.curr_semester_no )
+    regs = course_registration.objects.filter(student_id=student, semester_id__semester_no = student.curr_semester_no ).order_by('course_slot_id__name')
     out = []
     for reg in regs:
         out.append({
@@ -3883,6 +3896,13 @@ def approve_add_requests(request):
                         registration_type=registration_type
                     )
                     reg.save()
+
+                    if add_request.old_course_registration:
+                        course_replacement.objects.create(
+                            old_course_registration=add_request.old_course_registration,
+                            new_course_registration=reg
+                        )
+                        logger.info(f"Created course_replacement for request {req_id}: {add_request.old_course_registration.id} -> {reg.id}")
 
                     add_request.status = "Approved"
                     add_request.processed_at = timezone.now()

FusionIIIT/applications/academic_procedures/migrations/0018_auto_20260106_1355.py

@@ -0,0 +1,44 @@
+# Generated by Django 3.1.5 on 2026-01-06 13:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('academic_procedures', '0017_courseaddrequest'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='courseaddrequest',
+            name='old_course_registration',
+            field=models.ForeignKey(blank=True, help_text='Reference to the previous course registration being replaced (for backlog/improvement)', null=True, on_delete=django.db.models.deletion.SET_NULL, to='academic_procedures.course_registration'),
+        ),
+        migrations.AlterField(
+            model_name='assistantshipclaim',
+            name='year',
+            field=models.IntegerField(choices=[(2026, 2026), (2025, 2025)]),
+        ),
+        migrations.AlterField(
+            model_name='course_registration',
+            name='working_year',
+            field=models.IntegerField(blank=True, choices=[(2026, 2026), (2025, 2025)], null=True),
+        ),
+        migrations.AlterField(
+            model_name='finalregistrations',
+            name='batch',
+            field=models.IntegerField(default=2026),
+        ),
+        migrations.AlterField(
+            model_name='messdue',
+            name='year',
+            field=models.IntegerField(choices=[(2026, 2026), (2025, 2025)]),
+        ),
+        migrations.AlterField(
+            model_name='register',
+            name='year',
+            field=models.IntegerField(default=2026),
+        ),
+    ]

FusionIIIT/applications/academic_procedures/models.py

@@ -935,6 +935,13 @@ class CourseAddRequest(models.Model):
         related_name='add_course_reqs',
         on_delete=models.CASCADE,
     )
+    old_course_registration = models.ForeignKey(
+        course_registration,
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        help_text="Reference to the previous course registration being replaced (for backlog/improvement)"
+    )
     status = models.CharField(
         max_length=20,
         choices=STATUS_CHOICES,