Changeset 16509

Timestamp:

16 Jun 2021, 12:52:36 (3 years ago)

Author:

Henrik Bettermann

Message:

Allow different course gradings according to new course ticket attribute 'grading_sys'.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• batching.py (modified) (2 diffs)
• browser.py (modified) (3 diffs)
• interfaces.py (modified) (3 diffs)
• studylevel.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/students/batching.py

@@ -19 +19 @@
 """
 from kofacustom.nigeria.students.batching import NigeriaStudentProcessor
-from waeup.kofa.students.batching import StudentOnlinePaymentProcessor
+from waeup.kofa.students.batching import (
+    StudentOnlinePaymentProcessor, CourseTicketProcessor)
 from waeup.uniben.students.interfaces import (
     ICustomStudent,
     ICustomStudentUpdateByRegNo,
     ICustomStudentUpdateByMatricNo,
-    ICustomStudentOnlinePayment
+    ICustomStudentOnlinePayment,
+    ICustomCourseTicketImport
     )
 
@@ -38 +40 @@
     """
     iface = ICustomStudentOnlinePayment
+
+class CustomCourseTicketProcessor(CourseTicketProcessor):
+    """A batch processor for ICourseTicket objects.
+    """
+    iface = ICustomCourseTicketImport
+
+    @property
+    def available_fields(self):
+        fields = [
+            'student_id','reg_number','matric_number',
+            'mandatory', 'score', 'carry_over', 'automatic',
+            'outstanding', 'course_category', 'level_session',
+            'title', 'credits', 'passmark', 'semester', 'ticket_session',
+            'unlock_score', 'grading_sys'
+            ] + self.additional_fields
+        return sorted(fields)
+

main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py

@@ -32 +32 @@
     StudyLevelEditFormPage, StudyLevelDisplayFormPage,
     StudentBasePDFFormPage, ExportPDFCourseRegistrationSlip,
-    CourseTicketDisplayFormPage, StudentTriggerTransitionFormPage,
+    CourseTicketDisplayFormPage,
+    CourseTicketManageFormPage,
+    StudentTriggerTransitionFormPage,
     msave, emit_lock_message,
     StudentActivateView, StudentDeactivateView,
@@ -71 +73 @@
     ICustomStudentPersonal,
     ICustomStudentPersonalEdit,
-    IMedicalHistory)
+    IMedicalHistory,
+    ICustomCourseTicket)
 from waeup.uniben.interfaces import MessageFactory as _
 
@@ -658 +661 @@
     """ Page to display course tickets
     """
-    form_fields = grok.AutoFields(ICourseTicket).omit('score')
+    form_fields = grok.AutoFields(ICustomCourseTicket).omit('score')
+
+class CustomCourseTicketManageFormPage(CourseTicketManageFormPage):
+    """ Page to manage course tickets
+    """
+
+    form_fields = grok.AutoFields(ICustomCourseTicket).omit('course_category')
+    form_fields['title'].for_display = True
+    form_fields['fcode'].for_display = True
+    form_fields['dcode'].for_display = True
+    form_fields['semester'].for_display = True
+    form_fields['passmark'].for_display = True
+    form_fields['credits'].for_display = True
+    form_fields['mandatory'].for_display = False
+    form_fields['automatic'].for_display = True
+    form_fields['carry_over'].for_display = True
+    form_fields['ticket_session'].for_display = True
 
 class CustomStudentActivateView(StudentActivateView):

main/waeup.uniben/trunk/src/waeup/uniben/students/interfaces.py

@@ -18 +18 @@
 
 from zope import schema
-from waeup.kofa.interfaces import validate_email, IKofaObject
+from waeup.kofa.interfaces import (
+    validate_email, IKofaObject,
+    academic_sessions_vocab)
 from waeup.kofa.students.vocabularies import StudyLevelSource
+from kofacustom.nigeria.interfaces import GradingSystemSource
 from kofacustom.nigeria.students.interfaces import (
     INigeriaStudentBase, INigeriaUGStudentClearance, INigeriaPGStudentClearance,
@@ -30 +33 @@
 from waeup.uniben.interfaces import MessageFactory as _
 
+
 class ICustomStudentBase(INigeriaStudentBase):
     """Representation of student base data.
@@ -291 +295 @@
     """
 
+    grading_sys = schema.Choice(
+        title = _(u'Grading System'),
+        source = GradingSystemSource(),
+        required = True,
+        default = 'A',
+        )
+
+class ICustomCourseTicketImport(ICustomCourseTicket):
+    """An interface for importing course results and nothing more.
+    """
+
+    score = schema.Int(
+        title = _(u'Score'),
+        required = False,
+        readonly = False,
+        )
+
+    level_session = schema.Choice(
+        title = _(u'Level Session'),
+        source = academic_sessions_vocab,
+        required = False,
+        readonly = False,
+        )
+
+    grading_sys = schema.Choice(
+        title = _(u'Grading System'),
+        source = GradingSystemSource(),
+        required = False,
+        default = 'A',
+        )
+
 class ICustomStudentUpdateByRegNo(INigeriaStudentUpdateByRegNo):
     """Representation of a student. Skip regular reg_number validation.

main/waeup.uniben/trunk/src/waeup/uniben/students/studylevel.py

@@ -87 +87 @@
         return True
 
+    @property
+    def _getGradeWeightFromScore(self):
+        """Uniben Course Grading System
+        """
+        if getattr(self, 'grading_sys', 'A') == 'A':
+            if self.total_score is None:
+                return (None, None)
+            if self.total_score >= 70:
+                return ('A',5)
+            if self.total_score >= 60:
+                return ('B',4)
+            if self.total_score >= 50:
+                return ('C',3)
+            if self.total_score >= 45:
+                return ('D',2)
+            if self.total_score >= 40:
+                return ('E',1)
+            return ('F',0)
+        else:
+            if self.total_score is None:
+                return (None, None)
+            if self.total_score >= 70:
+                return ('A',5)
+            if self.total_score >= 60:
+                return ('B',4)
+            if self.total_score >= 50:
+                return ('C',3)
+            if self.total_score >= 45:
+                return ('D',2)
+            return ('F',0)
+
+
 CustomCourseTicket = attrs_to_fields(CustomCourseTicket)