Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions FusionIIIT/applications/examination/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ def post(self, request):
with transaction.atomic():
for index, row in enumerate(reader, start=1):
roll_no = row.get("roll_no")
grade = row.get("grade")
grade = (row.get("grade") or "").strip()
remarks = row.get("remarks", "")
semester = row.get("semester", None)

Expand Down Expand Up @@ -1023,6 +1023,7 @@ def post(self, request):
for student_id, semester_id, course_id, grade, remark in zip(
student_ids, semester_ids, course_ids, grades, remarks
):
grade = (grade or "").strip()
try:
grade_of_student = Student_grades.objects.get(
course_id=course_id, roll_no=student_id, semester=semester_id
Expand Down Expand Up @@ -1128,7 +1129,7 @@ def post(self, request):
"course_code": course.code,
"credit": course.credit,
"grade": reg.grade,
"points": Decimal(str(grade_conversion.get(reg.grade, 0) * 10)).quantize(Decimal('0.1'), rounding=ROUND_HALF_UP),
"points": Decimal(str(grade_conversion.get((reg.grade or "").strip(), 0) * 10)).quantize(Decimal('0.1'), rounding=ROUND_HALF_UP),
}

# Add complete student information like CheckResultView
Expand Down Expand Up @@ -1532,7 +1533,7 @@ def post(self, request):
if len(attempts) >= 1:
scored = sorted(
attempts,
key=lambda x: grade_conversion.get(x[1], -1),
key=lambda x: grade_conversion.get((x[1] or "").strip(), -1),
reverse=True
)
first_code, first_grade = scored[0]
Expand Down Expand Up @@ -2870,7 +2871,7 @@ def post(self, request):

for row in reader:
roll_no = row["roll_no"]
grade = row["grade"]
grade = (row["grade"] or "").strip()
remarks = row["remarks"]

try:
Expand All @@ -2885,7 +2886,7 @@ def post(self, request):
batch=batch
)

if student_grade.grade != grade:
if (student_grade.grade or "").strip() != grade:
mismatches.append({
"roll_no": roll_no,
"csv_grade": grade,
Expand Down Expand Up @@ -3029,7 +3030,7 @@ def post(self, request, *args, **kwargs):
"coursename": grade.course_id.name,
"credits": grade.course_id.credit,
"grade":grade.grade,
"points": Decimal(str(grade_conversion.get(grade.grade, 0) * 10)).quantize(Decimal('0.1'), rounding=ROUND_HALF_UP),
"points": Decimal(str(grade_conversion.get((grade.grade or "").strip(), 0) * 10)).quantize(Decimal('0.1'), rounding=ROUND_HALF_UP),
}
for grade in grades_info
],
Expand Down Expand Up @@ -3724,7 +3725,7 @@ def post(self, request):
"coursename": grade.course_id.name,
"credits": grade.course_id.credit,
"grade": grade.grade,
"points": Decimal(str(grade_conversion.get(grade.grade, 0) * 10)).quantize(Decimal('0.1'), rounding=ROUND_HALF_UP),
"points": Decimal(str(grade_conversion.get((grade.grade or "").strip(), 0) * 10)).quantize(Decimal('0.1'), rounding=ROUND_HALF_UP),
}
for grade in grades_info
]
Expand Down Expand Up @@ -4045,7 +4046,7 @@ def post(self, request):
"course_code": course.code,
"credit": course.credit,
"grade": reg.grade,
"points": Decimal(str(grade_conversion.get(reg.grade, 0) * 10)).quantize(
"points": Decimal(str(grade_conversion.get((reg.grade or "").strip(), 0) * 10)).quantize(
Decimal('0.1'), rounding=ROUND_HALF_UP),
"special_symbol": course_reg_map.get(course.id, ''),
}
Expand Down
4 changes: 0 additions & 4 deletions FusionIIIT/applications/examination/forms.py

This file was deleted.

66 changes: 2 additions & 64 deletions FusionIIIT/applications/examination/urls.py
Original file line number Diff line number Diff line change
@@ -1,69 +1,7 @@
from django.urls import include, path

from django.conf.urls import url
from django.urls import path, include
from . import views
from django.contrib import admin
from .views import update_authentication
from .views import DownloadExcelView, updateGrades
app_name = 'examination'

urlpatterns = [
url(r'^api/', include('applications.examination.api.urls')),
url(r'^$', views.exam, name='exam'),


url(r'submit/', views.submit, name='submit'),#old
# url(r'verify/', views.verify, name='verify'),#old
# url(r'publish/', views.publish, name='publish'),#old
# url(r'notReady_publish/', views.notReady_publish, name='notReady_publish'),#old
# url(r'timetable/', views.timetable, name='timetable'),#old
# entering and updataing grade
# path('entergrades/', views.entergrades, name='entergrades'),#old
# path('update_hidden_grades_multiple/', views.Updatehidden_gradesMultipleView.as_view(),
# name='update_hidden_grades_multiple'),#old
# path('verifygrades/', views.verifygrades, name='verifygrades'),#old
# path('update_hidden_grades_multiple/', views.Updatehidden_gradesMultipleView.as_view(),
# name='update_hidden_grades_multiple'),#old
# path('submit_hidden_grades_multiple/', views.Submithidden_gradesMultipleView.as_view(),
# name='submit_hidden_grades_multiple'),#old
path('download_excel/', DownloadExcelView.as_view(), name='download_excel'),#old

#new
url(r'submitGrades/', views.submitGrades.as_view(), name='submitGrades'),#new
# url(r'submitEntergrades/', views.submitEntergrades, name='submitEntergrades'),#new
# path('submitEntergradesStoring/', views.submitEntergradesStoring.as_view(),#new
# name='submitEntergradesStoring'),
#new
url(r'updateGrades/', views.updateGrades, name='updateGrades'),#new
path('updateEntergrades/', views.updateEntergrades, name='updateEntergrades'),#new
path('moderate_student_grades/', views.moderate_student_grades.as_view(),#new
name='moderate_student_grades'),
# authenticate new
# path('authenticate/', views.authenticate, name='authenticate'), #new
# path('authenticategrades/', views.authenticategrades,
# name='authenticategrades'),#new
# path('update_authentication/', update_authentication.as_view(),
# name='update_authentication'),#new
# generate transcript new
path('generate_transcript/', views.generate_transcript,
name='generate_transcript'), #new
path('generate_transcript_form/', views.generate_transcript_form,
name='generate_transcript_form'),#new
# Announcement
url(r'announcement/', views.announcement, name='announcement'),#new
path('upload_grades/',views.upload_grades,name='upload_grades'),
path('message/',views.show_message,name='message'),
path('submitGradesProf/',views.submitGradesProf,name='submitGradesProf'),
path('download_template/',views.download_template,name='download_template'),
path('verifyGradesDean/',views.verifyGradesDean,name='verifyGradesDean'),
path('updateEntergradesDean/',views.updateEntergradesDean,name='updateEnterGradesDean'),
path('upload_grades_prof/',views.upload_grades_prof,name='upload_grades_prof'),
path('validateDean/',views.validateDean,name='validateDean'),
path('validateDeanSubmit/',views.validateDeanSubmit,name='validateDeanSubmit'),
path('downloadGrades/',views.downloadGrades,name='downloadGrades'),
path('generate_pdf/',views.generate_pdf,name='generate_pdf'),
path('generate-result/',views.generate_result,name='generate_pdf'),
# path('get_courses/',views.get_courses,name='get_courses'),
# path('checkresult/',views.checkresult,name='checkresult'),
# path('grades_report/',views.grades_report,name='grades_report'),
path('api/', include('applications.examination.api.urls')),
]
Loading
Loading