Skip to content

Commit

Permalink
added apis for AC2 module and created backlog model
Browse files Browse the repository at this point in the history
  • Loading branch information
Divyanshu-iiitdmj committed Feb 18, 2024
1 parent c2aab55 commit c2360b6
Show file tree
Hide file tree
Showing 8 changed files with 284 additions and 105 deletions.
1 change: 0 additions & 1 deletion FusionIIIT/applications/academic_information/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ class Curriculum_InstructorAdmin(admin.ModelAdmin):
admin.site.register(Holiday)
admin.site.register(Curriculum,CurriculumAdmin)

#Hello!
18 changes: 12 additions & 6 deletions FusionIIIT/applications/academic_procedures/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@
url(r'^stu/pre_registration' , views.student_pre_registration , name = 'pre_registration'),
url(r'^stu/final_registration' , views.student_final_registration , name = 'final_registration'),
url(r'^stu/view_registration' , views.student_view_registration , name = 'view_registration'),



url(r'^stu/view_offered_courses' , views.view_offered_courses , name = 'student_view_offered_courses'),
# url(r'^stu/add_course' , views.add_course , name ='add_course') ,
# url(r'^stu/dropCourse' , views.dropCourse , name = 'dropCourse'),
# url(r'^stu/replaceCourse' , views.replaceCourse , name = 'replaceCourse')



url(r'^acad/view_registrations' , views.acad_view_reigstrations , name='acad_view_registrations'),
url(r'^acad/get_course_list' , views.get_course_list , name = 'get_course_list' ),
url(r'^test/', views.test , name = 'test'),
url(r'^get_user_info' , views.get_user_info , name = 'get_user_info'),
url(r'^acad/configure_pre_registration' , views.configure_pre_registration_date , name = 'configure_pre_registration'),
url(r'^acad/configure_final_registration' , views.configure_final_registration_date , name = 'configure_final_registration'),



url(r'^fac/', views.academic_procedures_faculty, name='faculty_procedures'),
url(r'^fac/view_assigned_courses' , views.faculty_assigned_courses , name = 'faculty_assigned_courses'),
# url(r'^fac/get_roll_list' , views.fetch_roll_list , name = 'fetch_roll_list'),



url(r'^get_user_info' , views.get_user_info , name = 'get_user_info'),

# these urls were designed previously and are not working any more

# url(r'^fac/', views.academic_procedures_faculty, name='faculty_procedures'),
# url(r'^stu', views.academic_procedures_student, name='student_procedures'),
# url(r'^addThesis/', views.add_thesis, name='add_thesis'),
# url(r'^approve_thesis/(?P<id>[0-9]+)/', views.approve_thesis, name='approve_thesis')
Expand Down
303 changes: 212 additions & 91 deletions FusionIIIT/applications/academic_procedures/api/views.py

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 3.1.5 on 2024-02-18 12:17

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('academic_information', '0001_initial'),
('programme_curriculum', '0002_auto_20240217_1700'),
('academic_procedures', '0002_auto_20240217_1700'),
]

operations = [
migrations.CreateModel(
name='backlog_courses',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('is_summer_course', models.BooleanField(default=False)),
('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
),
]
18 changes: 14 additions & 4 deletions FusionIIIT/applications/academic_procedures/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -671,16 +671,12 @@ class course_registration(models.Model):
'''
Current Purpose : stores information regarding the process of registration of a student for a course
ATTRIBUTES
course_id(programme_curriculum.Course) - reference to the course details for which the registration is being done
semester_id(programme_curriculum.Semester) - reference to the semester for which the course registration is done
student_id(academic_information.Student) - reference to the student
course_slot_id(programme_curriculum.CourseSlot) - details about under which course slot the course is offered(Optional/Core other details)
'''


Expand All @@ -696,3 +692,17 @@ class Meta:
db_table = 'course_registration'


class backlog_courses(models.Model):
'''
Current Purpose : stores information regarding the backlog courses of a student
ATTRIBUTES
course_id(programme_curriculum.Course) - reference to the course details for which the registration is being done
semester_id(programme_curriculum.Semester) - reference to the semester for which the course registration is done
student_id(academic_information.Student) - reference to the student
is_summer_course(Boolean) - details about whether this course is available as summer_course or not
'''
student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
semester_id = models.ForeignKey(Semester, on_delete=models.CASCADE)
course_id = models.ForeignKey(Courses, on_delete=models.CASCADE)
is_summer_course = models.BooleanField(default= False)
3 changes: 1 addition & 2 deletions FusionIIIT/applications/academic_procedures/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
url(r'^update_phdform/$', views.update_phdform),
url(r'^update_dues/$', views.update_dues),
url(r'^dues_pdf/$', views.dues_pdf),
url(r'^acad_person/gen_course_list$',
views.gen_course_list, name='gen_course_list'),
url(r'^acad_person/gen_course_list$', views.gen_course_list, name='gen_course_list'),
url(r'^update_acad_assistantship/$', views.update_acad_assis),
url(r'^update_account_assistantship/$', views.update_account_assistantship),
url(r'^update_hod_assistantship/$', views.update_hod_assistantship),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-02-18 12:17

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('globals', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='extrainfo',
name='user_status',
field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
),
]
2 changes: 1 addition & 1 deletion FusionIIIT/templates/academic_procedures/addCourse.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<div class="ui vertical segment">
{% if adc_date_flag %}
{% if details.cpi >= 6.0 %}
{% if details.cpi >= 0.0 %}
{% if add_courses_options %}
<form id='add_course_form' action='/academic-procedures/addCourse/'> {% csrf_token %}
<input type="text" hidden="true" id="credit_count" value="{{current_credits}}">
Expand Down

0 comments on commit c2360b6

Please sign in to comment.