Skip to content

Commit d062f66

Browse files
authored
Merge pull request FusionIIIT#1 from sudeep423/master
Change UI for pre
2 parents 3b9faed + 7d42e5d commit d062f66

File tree

3 files changed

+486
-435
lines changed

3 files changed

+486
-435
lines changed

FusionIIIT/applications/academic_procedures/views.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ def academic_procedures(request):
6060
user_details = ExtraInfo.objects.select_related('user','department').get(user = request.user)
6161
des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first()
6262

63-
6463
if str(des.designation) == "student":
6564
obj = Student.objects.select_related('id','id__user','id__department').get(id = user_details.id)
6665
return HttpResponseRedirect('/academic-procedures/stu/')
@@ -264,6 +263,7 @@ def academic_procedures_student(request):
264263
}
265264
cur_cpi=details['cpi']
266265

266+
267267
try:
268268
pre_registered_course = InitialRegistration.objects.all().filter(student_id = user_details.id,semester_id = next_sem_id)
269269
pre_registered_course_show = pre_registered_course
@@ -1118,20 +1118,22 @@ def pre_registration(request):
11181118
current_user = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first()
11191119
current_user = Student.objects.all().filter(id=current_user.id).first()
11201120

1121-
11221121
sem_id = Semester.objects.get(id = request.POST.get('semester'))
11231122
count = request.POST.get('ct')
11241123
count = int(count)
11251124
reg_curr=[]
11261125
for i in range(1, count+1):
11271126
i = str(i)
11281127
choice = "choice["+i+"]"
1129-
course_id = Courses.objects.get(id = request.POST.get(choice))
1130-
p = InitialRegistration(
1131-
course_id = course_id,
1132-
semester_id = sem_id,
1133-
student_id = current_user
1134-
)
1128+
try:
1129+
course_id = Courses.objects.get(id = request.POST.get(choice))
1130+
p = InitialRegistration(
1131+
course_id = course_id,
1132+
semester_id = sem_id,
1133+
student_id = current_user
1134+
)
1135+
except Exception as e:
1136+
return HttpResponseRedirect('/academic-procedures/main')
11351137
reg_curr.append(p)
11361138
InitialRegistration.objects.bulk_create(reg_curr)
11371139
try:

0 commit comments

Comments
 (0)