Skip to content

Commit cd2e187

Browse files
authored
Merge pull request #1858 from vikrantwiz02/prod/acad-react
Refactor student_list_requests to retrieve academic year and semester
2 parents ef8ccb8 + 33ab8e7 commit cd2e187

File tree

1 file changed

+8
-1
lines changed
  • FusionIIIT/applications/academic_procedures/api

1 file changed

+8
-1
lines changed

FusionIIIT/applications/academic_procedures/api/views.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2933,7 +2933,14 @@ def student_list_requests(request):
29332933
current_user = request.user
29342934
user_details = current_user.extrainfo
29352935
student = Student.objects.get(id=user_details)
2936-
academic_year, semester_type = generate_current_session(datetime.datetime.now().year, student.curr_semester_no)
2936+
current_reg = course_registration.objects.filter(student_id=student, semester_id__semester_no=student.curr_semester_no).first()
2937+
2938+
if current_reg:
2939+
academic_year = current_reg.session
2940+
semester_type = current_reg.semester_type
2941+
else:
2942+
academic_year, semester_type = generate_current_session(datetime.datetime.now().year, student.curr_semester_no)
2943+
29372944
qs = CourseReplacementRequest.objects.filter(student=student, academic_year=academic_year, semester_type = semester_type).order_by('-created_at')
29382945
out = []
29392946
for r in qs:

0 commit comments

Comments
 (0)