From f38fc85f8daac491c515b649f3cc9c5f0dcd41e9 Mon Sep 17 00:00:00 2001 From: Jim Laney Date: Tue, 13 Jun 2023 13:18:14 -0700 Subject: [PATCH] rename logged_grade function --- course_grader/dao/gradesubmission.py | 26 +++++++++---------- .../test/dao/test_gradesubmission.py | 21 ++++++++------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/course_grader/dao/gradesubmission.py b/course_grader/dao/gradesubmission.py index 88422c45..b9fe5d78 100644 --- a/course_grader/dao/gradesubmission.py +++ b/course_grader/dao/gradesubmission.py @@ -12,6 +12,18 @@ logger = getLogger(__name__) +def format_logged_grade(item): + logged_grade = None + if not (item.is_auditor or item.date_withdrawn): + logged_grade = "X" if item.no_grade_now else str(item.grade) + if item.has_incomplete: + logged_grade = "I," + logged_grade + if item.has_writing_credit: + logged_grade += ",W" + + return logged_grade + + def submit_grades(model): graderoster = GradeRoster.from_xhtml( etree.fromstring(model.document.strip()), @@ -45,7 +57,7 @@ def submit_grades(model): graderoster.items[idx].grade_submitter_source = ( item.grade_submitter_source) - logged_grade = logged_grade(graderoster.items[idx]) + logged_grade = format_logged_grade(graderoster.items[idx]) if logged_grade is not None: logger.info(( "Grade submitted, Student: {student}, Section: " @@ -62,15 +74,3 @@ def submit_grades(model): logger.error("Error logging grade: {}".format(ex)) return graderoster - - -def logged_grade(item): - logged_grade = None - if not (item.is_auditor or item.date_withdrawn): - logged_grade = "X" if item.no_grade_now else str(item.grade) - if item.has_incomplete: - logged_grade = "I," + logged_grade - if item.has_writing_credit: - logged_grade += ",W" - - return logged_grade diff --git a/course_grader/test/dao/test_gradesubmission.py b/course_grader/test/dao/test_gradesubmission.py index e58bdbe7..89ec2a3d 100644 --- a/course_grader/test/dao/test_gradesubmission.py +++ b/course_grader/test/dao/test_gradesubmission.py @@ -8,27 +8,28 @@ class GradeSubmissionDAOFunctionsTest(TestCase): - def test_logged_grade(self): + def test_format_logged_grade(self): self.assertEquals( - logged_grade(GradeRosterItem()), 'None') + format_logged_grade(GradeRosterItem()), 'None') self.assertEquals( - logged_grade(GradeRosterItem(is_auditor=True)), None) + format_logged_grade(GradeRosterItem(is_auditor=True)), None) self.assertEquals( - logged_grade(GradeRosterItem(date_withdrawn='2013-05-31')), None) + format_logged_grade(GradeRosterItem( + date_withdrawn='2013-05-31')), None) self.assertEquals( - logged_grade(GradeRosterItem(no_grade_now=True)), 'X') + format_logged_grade(GradeRosterItem(no_grade_now=True)), 'X') self.assertEquals( - logged_grade(GradeRosterItem( + format_logged_grade(GradeRosterItem( no_grade_now=True, has_incomplete=True)), 'I,X') self.assertEquals( - logged_grade(GradeRosterItem(grade=3.9)), '3.9') + format_logged_grade(GradeRosterItem(grade=3.9)), '3.9') self.assertEquals( - logged_grade(GradeRosterItem( + format_logged_grade(GradeRosterItem( grade=3.9, has_incomplete=True)), 'I,3.9') self.assertEquals( - logged_grade(GradeRosterItem( + format_logged_grade(GradeRosterItem( grade=3.9, has_writing_credit=True)), '3.9,W') self.assertEquals( - logged_grade(GradeRosterItem( + format_logged_grade(GradeRosterItem( grade=3.9, has_incomplete=True, has_writing_credit=True)), 'I,3.9,W')