Changeset 17345 for main

Timestamp:

10 Mar 2023, 09:13:25 (22 months ago)

Author:

Henrik Bettermann

Message:

Add carryover score field.

Location:

main/kofacustom.edocons/trunk/src/kofacustom/edocons

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/studylevelpage.pt (added)
• students/interfaces.py (modified) (1 diff)

main/kofacustom.edocons/trunk/src/kofacustom/edocons/interswitch/browser.py

@@ -164 +164 @@
         xmldict['institution_bank_id'] = '31'
         if self.context.__parent__.__parent__.prefix.startswith('tsc'):
-            provider_amt = 2000.0
             midwife_amt = 0.0
             xmldict['institution_acct'] = '1000907711'
@@ -195 +194 @@
 </item_details>
 </payment_item_detail>""" % xmldict
+        elif not provider_amt and midwife_amt:
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">
+<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+<item_detail item_id="2" item_name="Nursing and Midwifery Committee" item_amt="%(midwife_amt)d" bank_id="8" acct_num="2004854377" />
+</item_details>
+</payment_item_detail>""" % xmldict
         else:
             xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">
 <item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
-<item_detail item_id="2" item_name="Nursing and Midwifery Committee" item_amt="%(midwife_amt)d" bank_id="8" acct_num="2004854377" />
 </item_details>
 </payment_item_detail>""" % xmldict

main/kofacustom.edocons/trunk/src/kofacustom/edocons/students/browser.py

@@ -30 +30 @@
     StudyLevelEditFormPage, StudyLevelDisplayFormPage,
     StudentBasePDFFormPage, ExportPDFCourseRegistrationSlip,
-    CourseTicketDisplayFormPage, StudentTriggerTransitionFormPage,
+    CourseTicketDisplayFormPage,
+    CourseTicketManageFormPage,
+    StudyLevelDisplayFormPage,
+    StudentTriggerTransitionFormPage,
     ExportPDFAdmissionSlip, StartClearancePage, PaymentsManageFormPage,
     BalancePaymentAddFormPage, msave, emit_lock_message)
@@ -48 +51 @@
 from kofacustom.edocons.students.interfaces import (
     ICustomStudentOnlinePayment, ICustomStudentStudyCourse,
-    ICustomStudentStudyLevel)
+    ICustomStudentStudyLevel, ICustomCourseTicket)
 from kofacustom.edocons.interfaces import MessageFactory as _
+
+def translated_values(view):
+    """Translate course ticket attribute values to be displayed on
+    studylevel pages.
+    """
+    lang = view.request.cookies.get('kofa.language')
+    for value in view.context.values():
+        # We have to unghostify (according to Tres Seaver) the __dict__
+        # by activating the object, otherwise value_dict will be empty
+        # when calling the first time.
+        value._p_activate()
+        value_dict = dict([i for i in value.__dict__.items()])
+        value_dict['url'] = view.url(value)
+        value_dict['removable_by_student'] = value.removable_by_student
+        value_dict['mandatory'] = translate(str(value.mandatory), 'zope',
+            target_language=lang)
+        value_dict['carry_over'] = translate(str(value.carry_over), 'zope',
+            target_language=lang)
+        value_dict['outstanding'] = translate(str(value.outstanding), 'zope',
+            target_language=lang)
+        value_dict['automatic'] = translate(str(value.automatic), 'zope',
+            target_language=lang)
+        value_dict['grade'] = value.grade
+        value_dict['weight'] = value.weight
+        value_dict['course_category'] = value.course_category
+        value_dict['total_score'] = value.total_score
+        semester_dict = getUtility(IKofaUtils).SEMESTER_DICT
+        value_dict['semester'] = semester_dict[
+            value.semester].replace('mester', 'm.')
+        # ECNS specific
+        value_dict['carryover_score'] = value.carryover_score
+        yield value_dict
 
 class CustomStartClearancePage(StartClearancePage):
@@ -118 +153 @@
 class CustomBedTicketAddPage(NigeriaBedTicketAddPage):
     with_ac = False
+
+class CustomStudyLevelDisplayFormPage(StudyLevelDisplayFormPage):
+    """ Page to display student study levels
+    """
+    @property
+    def translated_values(self):
+        return translated_values(self)
+
+        
+class CustomCourseTicketDisplayFormPage(CourseTicketDisplayFormPage):
+    """ Page to display course tickets
+    """
+    form_fields = grok.AutoFields(ICustomCourseTicket).omit('course_category',
+        'ticket_session')
+
+    @property
+    def form_fields(self):
+        if not self.context.carry_over:
+            return grok.AutoFields(ICustomCourseTicket).omit('carryover_score')
+        return grok.AutoFields(ICustomCourseTicket)
+
+class CustomCourseTicketManageFormPage(CourseTicketManageFormPage):
+    """ Page to manage course tickets
+    """
+    form_fields = grok.AutoFields(ICustomCourseTicket)

main/kofacustom.edocons/trunk/src/kofacustom/edocons/students/interfaces.py

@@ -92 +92 @@
     """
 
+    carryover_score = schema.Int(
+        title = _(u'Carry-over Score'),
+        default = None,
+        required = False,
+        missing_value = None,
+        max = 100,
+        )
+
+ICustomCourseTicket['carryover_score'].order = ICustomCourseTicket['carry_over'].order
+
 class ICustomStudentUpdateByRegNo(INigeriaStudentUpdateByRegNo):
     """Representation of a student. Skip regular reg_number validation.