Skip to content

Revert "Replace course functionality added" #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Revert "Replace course functionality added" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion FusionIIIT/applications/academic_procedures/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
url(r'^final_registration/', views.final_registration, name='final_register'),
url(r'^addCourse/', views.add_courses, name='addCourse'),
url(r'^drop_course/', views.drop_course, name='drop_course'),
url(r'^replaceCourse/', views.replace_courses, name='replaceCourse'),
url(r'^branch-change/', views.approve_branch_change, name='branch_change'),
url(r'^brach-change-request/', views.branch_change_request,
name='branch_change_request'),
Expand Down
84 changes: 8 additions & 76 deletions FusionIIIT/applications/academic_procedures/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,16 +412,13 @@ def academic_procedures_student(request):
for final_registered_course in final_registered_courses:
final_registered_course_show.append({"course_code":final_registered_course.course_id.code,"course_name":final_registered_course.course_id.name,"course_credit":final_registered_course.course_id.credit})
add_courses_options = get_add_course_options(current_sem_branch_course, currently_registered_course, batch.year)
replace_courses_options = get_replace_course_options(currently_registered_course, batch.year)
drop_courses_options = get_drop_course_options(currently_registered_course)

except Exception as e:
final_registered_courses = None
final_registered_course_show = None
drop_courses_options = None
#drop_courses_options = None
add_courses_options = None
replace_courses_options = None


fee_payment_mode_list = dict(Constants.PaymentMode)

Expand Down Expand Up @@ -496,13 +493,13 @@ def academic_procedures_student(request):
attendence.append((i,pr,pr+ab))
cur_spi='Sem results not available' # To be fetched from db if result uploaded

# backlogCourseList = []
# backlogCourses = backlog_course.objects.select_related('course_id' , 'student_id' , 'semester_id' ).filter(student_id=obj)
# for i in backlogCourses:
# summer_course = "Yes" if i.is_summer_course else "No"
# course_details = i.course_id.course_details if i.course_id.course_details else "N/A"
backlogCourseList = []
backlogCourses = backlog_course.objects.select_related('course_id' , 'student_id' , 'semester_id' ).filter(student_id=obj)
for i in backlogCourses:
summer_course = "Yes" if i.is_summer_course else "No"
course_details = i.course_id.course_details if i.course_id.course_details else "N/A"

# backlogCourseList.append([i.course_id.course_name, course_details , i.semester_id.semester_no , summer_course])
backlogCourseList.append([i.course_id.course_name, course_details , i.semester_id.semester_no , summer_course])

Mess_bill = Monthly_bill.objects.filter(student_id = obj)
Mess_pay = Payments.objects.filter(student_id = obj)
Expand All @@ -514,8 +511,6 @@ def academic_procedures_student(request):
objb = BranchChange()
objb.branches=request.POST['branches']
objb.save()
# print(currently_registered_courses)
# print(replace_courses_options)

return render(
request, '../templates/academic_procedures/academic.html',
Expand Down Expand Up @@ -553,7 +548,6 @@ def academic_procedures_student(request):
# 'change_branch': change_branch,
# 'add_course': add_course,
'add_courses_options': add_courses_options,
'replace_courses_options' : replace_courses_options,
'drop_courses_options' : drop_courses_options,
# 'pre_register': pre_register,
'pre_registration_timestamp': pre_registration_timestamp,
Expand All @@ -578,7 +572,7 @@ def academic_procedures_student(request):
'hos_d':hos_d,
'tot_d':tot_d,
'attendence':attendence,
# 'backlogCourseList' : backlogCourseList,
'backlogCourseList' : backlogCourseList,
'BranchChangeForm': BranchChangeForm(),
'BranchFlag':branchchange_flag,
'assistantship_flag' : student_status,
Expand Down Expand Up @@ -1686,52 +1680,7 @@ def drop_course(request):
else:
return HttpResponseRedirect('/academic-procedures/main')

def replace_courses(request):
"""
This function is used to replace elective courses which have been registered
@param:
request - contains metadata about the requested page
@variables:
current_user - contains current logged in user
sem_id - contains current semester id
count - no of courses to be replaced
course_id - contains course id for a particular course
course_slot_id - contains course slot id for a particular course
choice - contains choice of a particular course
slot - contains slot of a particular course
"""

if request.method == 'POST' :
try:
current_user = get_object_or_404(User, username=request.POST.get('user'))
current_user = ExtraInfo.objects.all().filter(user=current_user).first()
current_user = Student.objects.all().filter(id=current_user.id).first()

# sem_id = Semester.objects.get(id = request.POST.get('semester'))
count = request.POST.get('ct')
count = int(count)

for i in range(1, count+1):
choice = "choice["+str(i)+"]"
slot = "slot["+str(i)+"]"
try :

course_id = Courses.objects.get(id = request.POST.get(choice))
courseslot_id = CourseSlot.objects.get(id = request.POST.get(slot))

registered_course = course_registration.objects.filter(student_id=current_user, course_slot_id = courseslot_id).first()

if registered_course:
registered_course.course_id = course_id
registered_course.save()
except Exception as e:
continue
return HttpResponseRedirect('/academic-procedures/main')
except Exception as e:
return HttpResponseRedirect('/academic-procedures/main')
else :
return HttpResponseRedirect('/academic-procedures/main')



def add_thesis(request):
Expand Down Expand Up @@ -1861,24 +1810,7 @@ def get_drop_course_options(current_register):
courses.append(item[1])
return courses

def get_replace_course_options( current_register, batch):
replace_options = []

for registered_course in current_register:
courseslot_id = registered_course[0]
course_id = registered_course[1]

courseslot = courseslot_id
coursename = course_id.name
lis = []

if 'Elective' in courseslot.type:
for course in courseslot.courses.all():
if course != course_id:
lis.append(course)
replace_options.append((courseslot, coursename, lis))

return replace_options



Expand Down
6 changes: 0 additions & 6 deletions FusionIIIT/templates/academic_procedures/academic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,6 @@
<a class="item" data-tab="miscellaneous_6" >
Backlogs
</a>
<a class="item" data-tab="miscellaneous_7" >
Replace courses
</a>
</div>
<div class="ui active tab segment " data-tab="miscellaneous_2" >
<div class="ui pointing secondary menu">
Expand Down Expand Up @@ -246,9 +243,6 @@
<div class="ui tab segment" data-tab="miscellaneous_6" >
{% include 'academic_procedures/backlog.html' %}
</div>
<div class="ui tab segment" data-tab="miscellaneous_7" >
{% include 'academic_procedures/replace.html' %}
</div>

</div>

Expand Down
128 changes: 0 additions & 128 deletions FusionIIIT/templates/academic_procedures/replace.html
View file
Open in desktop

This file was deleted.