Skip to content
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dcca2fd
deleted sheet.xlsx in academic inforamtion
Anunaya07 Apr 6, 2023
01711f4
added flexibility in pregistration filter
Anunaya07 Apr 6, 2023
3a4627f
added time feature for pre registration
Anunaya07 Apr 6, 2023
09b6376
corrected allot courses
Anunaya07 Apr 7, 2023
7b0e036
Merge branch 'FusionIIIT:test' into test
Anunaya07 Apr 7, 2023
762098f
Merge branch 'test' of https://github.com/Anunaya07/Fusion into test
Anunaya07 Apr 7, 2023
14a82d8
added dummy data for timetables
Anunaya07 Apr 8, 2023
2e2fa29
Merge branch 'FusionIIIT:test' into test
Anunaya07 Apr 8, 2023
819ba53
Merge branch 'test' of https://github.com/Anunaya07/Fusion into test
Anunaya07 Apr 8, 2023
21c7593
Add files via upload
Anunaya07 Apr 8, 2023
faf3215
Merge branch 'FusionIIIT:test' into test
Anunaya07 Apr 9, 2023
394b7ef
deleted dummy data for time tables
Anunaya07 Apr 9, 2023
a99f2ea
Merge branch 'test' of https://github.com/Anunaya07/Fusion into test
Anunaya07 Apr 9, 2023
c813cef
deleted dummy timetable data and restore back to original form
Anunaya07 Apr 9, 2023
c5fbdeb
updated add_timetable to add new tt
Anunaya07 Apr 9, 2023
8c5a00c
Merge branch 'FusionIIIT:test' into test
Anunaya07 Apr 13, 2023
9c71287
corrected sem numbers for students for every batch@
Anunaya07 Apr 13, 2023
87f12cd
corrected student sem
Anunaya07 Apr 14, 2023
ab1f868
Merge branch 'FusionIIIT:test' into test
Anunaya07 Apr 14, 2023
35489c4
Update FusionIIIT/applications/academic_procedures/views.py
Anunaya07 Apr 14, 2023
8a05dbf
Update FusionIIIT/templates/globals/usercard.html
Anunaya07 Apr 14, 2023
36c0728
Update FusionIIIT/templates/globals/usercard.html
Anunaya07 Apr 14, 2023
2840ef9
corrected sem number to get currently registered courses
Anunaya07 Apr 16, 2023
5d4c891
Merge branch 'FusionIIIT:test' into test
Anunaya07 Apr 16, 2023
6793266
Merge branch 'test' of https://github.com/Anunaya07/Fusion into test
Anunaya07 Apr 16, 2023
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
2 changes: 1 addition & 1 deletion FusionIIIT/applications/academic_procedures/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ def academic_procedures_student(request):
current_sem_branch_course = get_sem_courses(curr_sem_id, batch)
next_sem_registration_courses = get_sem_courses(next_sem_id, batch)
final_registration_choice, unavailable_courses_nextsem = get_final_registration_choices(next_sem_registration_courses,batch.year)
currently_registered_course = get_currently_registered_course(obj,obj.curr_semester_no)
currently_registered_course = get_currently_registered_course(obj,user_sem)

current_credits = get_current_credits(currently_registered_course)

Expand Down