diff --git a/FusionIIIT/applications/academic_procedures/migrations/0004_course_registration_registration_type.py b/FusionIIIT/applications/academic_procedures/migrations/0004_course_registration_registration_type.py new file mode 100644 index 000000000..1731e55f7 --- /dev/null +++ b/FusionIIIT/applications/academic_procedures/migrations/0004_course_registration_registration_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-12-01 16:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('academic_procedures', '0003_finalregistration_registration_type'), + ] + + operations = [ + migrations.AddField( + model_name='course_registration', + name='registration_type', + field=models.CharField(choices=[('Audit', 'Audit'), ('Improvement', 'Improvement'), ('Backlog', 'Backlog'), ('Regular', 'Regular')], default='Regular', max_length=20), + ), + ] diff --git a/FusionIIIT/applications/academic_procedures/models.py b/FusionIIIT/applications/academic_procedures/models.py index 6f33e293f..d0a909512 100644 --- a/FusionIIIT/applications/academic_procedures/models.py +++ b/FusionIIIT/applications/academic_procedures/models.py @@ -705,6 +705,17 @@ class course_registration(models.Model): semester_id = models.ForeignKey(Semester, on_delete=models.CASCADE) course_id = models.ForeignKey(Courses, on_delete=models.CASCADE) course_slot_id = models.ForeignKey(CourseSlot, null=True, blank=True, on_delete=models.SET_NULL) + REGISTRATION_TYPE_CHOICES = [ + ('Audit', 'Audit'), + ('Improvement', 'Improvement'), + ('Backlog', 'Backlog'), + ('Regular', 'Regular'), + ] + registration_type = models.CharField( + max_length=20, + choices=REGISTRATION_TYPE_CHOICES, + default='Regular', + ) # grade = models.CharField(max_length=10) #course_registration_year = models.IntegerField() def __str__(self): diff --git a/FusionIIIT/applications/academic_procedures/views.py b/FusionIIIT/applications/academic_procedures/views.py index 6e3b9f4f8..347a4f1f0 100644 --- a/FusionIIIT/applications/academic_procedures/views.py +++ b/FusionIIIT/applications/academic_procedures/views.py @@ -408,6 +408,7 @@ def academic_procedures_student(request): 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) + current_courseregistrations = get_currently_registered_course(obj,obj.curr_semester_no, True) current_credits = get_current_credits(currently_registered_course) @@ -562,6 +563,7 @@ def academic_procedures_student(request): {'details': details, # 'calendar': calendar, 'currently_registered': currently_registered_course, + 'current_courseregistrations': current_courseregistrations, 'pre_registered_course' : pre_registered_courses, 'pre_registered_course_show' : pre_registered_course_show, 'final_registered_course' : final_registered_courses, @@ -1048,14 +1050,15 @@ def verify_course(request): details = [] current_sem_courses = get_currently_registered_course( - roll_no, curr_sem_id) + roll_no, curr_sem_id, True) idd = obj2 for z in current_sem_courses: - z = z[1] + # print(z) + # z = z[1] print(z) - course_code = z.code - course_name = z.name + course_code = z.course_id.code + course_name = z.course_id.name # course_code, course_name = str(z).split(" - ") k = {} # reg_ig has course registration id appended with the the roll number @@ -1068,8 +1071,9 @@ def verify_course(request): for p in courseobj2: k['course_id'] = course_code k['course_name'] = course_name - k['sem'] = curr_sem_id.semester_no + k['sem'] = z.semester_id.semester_no k['credits'] = p.credit + k['registration_type'] = z.registration_type details.append(k) year = demo_date.year @@ -1111,8 +1115,9 @@ def acad_add_course(request): 'id', 'id__user', 'id__department').filter(id=roll_no).first() sem_id = request.POST['semester_id'] semester = Semester.objects.get(id=sem_id) + registration_type = request.POST["registration_type"] cr = course_registration( - course_id=course, student_id=student, semester_id=semester , working_year = datetime.datetime.now().year,) + course_id=course, student_id=student, semester_id=semester , working_year = datetime.datetime.now().year, registration_type=registration_type) cr.save() return HttpResponseRedirect('/academic-procedures/') @@ -2104,12 +2109,17 @@ def get_currently_registered_courses(id, user_sem): ans.append(course) return ans -def get_currently_registered_course(id, sem_id): - # obj = course_registration.objects.all().filter(student_id = id, semester_id=sem_id) - obj = course_registration.objects.all().filter(student_id = id) +def get_currently_registered_course(id, sem_id, courseregobj=False): + if (type(sem_id) == int): + obj = course_registration.objects.all().filter(student_id = id, semester_id__semester_no=sem_id) + else: + obj = course_registration.objects.all().filter(student_id = id) courses = [] for i in obj: - courses.append((i.course_slot_id,i.course_id)) + if (courseregobj): + courses.append(i) + else: + courses.append((i.course_slot_id,i.course_id)) return courses diff --git a/FusionIIIT/templates/academic_procedures/current_sem.html b/FusionIIIT/templates/academic_procedures/current_sem.html index e8a572b74..02a18f580 100755 --- a/FusionIIIT/templates/academic_procedures/current_sem.html +++ b/FusionIIIT/templates/academic_procedures/current_sem.html @@ -74,28 +74,32 @@
Course ID
Course Name
Credits
+
Registration Type
Semester
- {% for items in currently_registered %} + {% for items in current_courseregistrations %}
{{ forloop.counter }} .
- {{ items.1.code }} + {{ items.course_id.code }} - {{ items.1.name}} + {{ items.course_id.name}} -
{{ items.1.credit }}
+
{{ items.course_id.credit }}
+ + +
{{ items.registration_type }}
{{curr_sem.semester_no}}