Merge pull request #1536 from FusionIIIT/latest_staging

Merging Latest Staging in RSPC-FINAL
FusionIIIT · Apr 23, 2024 · 070a535 · 070a535
2 parents 3f15cb3 + 308f901
commit 070a535
Show file tree

Hide file tree

Showing 409 changed files with 27,095 additions and 6,512 deletions.
diff --git a/FusionIIIT/Fusion/settings/common.py b/FusionIIIT/Fusion/settings/common.py
@@ -111,6 +111,7 @@
     'notification',
     'notifications',
     'applications.academic_procedures',
+    'applications.examination',
     'applications.academic_information',
     'applications.leave',
     'applications.library',
@@ -281,4 +282,4 @@
 
 
 CORS_ORIGIN_ALLOW_ALL = True
-ALLOW_PASS_RESET = True
+ALLOW_PASS_RESET = True
diff --git a/FusionIIIT/Fusion/urls.py b/FusionIIIT/Fusion/urls.py
@@ -60,4 +60,5 @@
     url(r'^income-expenditure/', include('applications.income_expenditure.urls')),
     url(r'^hr2/', include('applications.hr2.urls')),
     url(r'^recruitment/', include('applications.recruitment.urls')),
+    url(r'^examination/', include('applications.examination.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/FusionIIIT/applications/academic_information/admin.py b/FusionIIIT/applications/academic_information/admin.py
@@ -32,4 +32,3 @@ class Curriculum_InstructorAdmin(admin.ModelAdmin):
 admin.site.register(Holiday)
 admin.site.register(Curriculum,CurriculumAdmin)
 
-#Hello!
diff --git a/FusionIIIT/applications/academic_information/api/serializers.py b/FusionIIIT/applications/academic_information/api/serializers.py
@@ -18,7 +18,6 @@ class Meta:
 
 class CurriculumSerializer(serializers.ModelSerializer):
     course_id = CourseSerializer()
-
     class Meta:
         model = Curriculum
         fields = ('curriculum_id','course_code','course_id','credits','course_type',

diff --git a/FusionIIIT/applications/academic_information/api/urls.py b/FusionIIIT/applications/academic_information/api/urls.py
@@ -27,4 +27,4 @@
     # url(r'^grades',views.grades_api,name='grades-get-api'),
 
     # url(r'^spi',views.spi_api,name='spi-get-api')
-]
+]
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!
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ @@
         # url(r'^grades',views.grades_api,name='grades-get-api'),
         # url(r'^spi',views.spi_api,name='spi-get-api')
-    ]
+    ]