Changeset 17627 for main

Timestamp:

29 Oct 2023, 21:05:12 (14 months ago)

Author:

Henrik Bettermann

Message:

Implement cutoff mark for application.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• applicants/interfaces.py (modified) (1 diff)
• applicants/utils.py (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -555 +555 @@
     @invariant
     def course_choice(applicant):
+
+        if applicant.course1:
+            if  applicant.jamb_score is None:
+                raise Invalid(_("Total JAMB score not set."))
+            if applicant.course1.custom_float_1 and applicant.course1.custom_float_1 > applicant.jamb_score:
+                raise Invalid(_("You do not meet the minimum cutoff mark for course %s. Cutoff score for this course is %s. Please consider selecting an alternative choice." % (
+                    applicant.course1.code, applicant.course1.custom_float_1)))
+
+        if applicant.course2:
+            if  applicant.jamb_score is None:
+                raise Invalid(_("Total JAMB score not set."))
+            if applicant.course2.custom_float_1 and applicant.course2.custom_float_1 > applicant.jamb_score:
+                raise Invalid(_("You do not meet the minimum cutoff mark for course %s. Cutoff score for this course is %s. Please consider selecting an alternative choice." % (
+                    applicant.course2.code, applicant.course2.custom_float_1)))
+
+        if applicant.course3:
+            if  applicant.jamb_score is None:
+                raise Invalid(_("Total JAMB score not set."))
+            if applicant.course3.custom_float_1 and applicant.course3.custom_float_1 > applicant.jamb_score:
+                raise Invalid(_("You do not meet the minimum cutoff mark for course %s. Cutoff score for this course is %s. Please consider selecting an alternative choice." % (
+                    applicant.course3.code, applicant.course3.custom_float_1)))
+
         if applicant.course1 == applicant.course2:
             raise Invalid(_("2nd choice course must differ from 1st choice course."))

main/waeup.aaue/trunk/src/waeup/aaue/applicants/utils.py

@@ -53 +53 @@
     SEPARATORS_DICT = {
         'form.applicant_id': _(u'Base Data'),
-        #'form.course1': _(u'Programmes/Courses Desired'),
+        'form.course1': _(u'JAMB Course: '),
         'form.fst_sit_fname': _(u'1st Sitting'),
         'form.scd_sit_fname': _(u'2nd Sitting'),

main/waeup.aaue/trunk/src/waeup/aaue/browser/pages.py

@@ -21 +21 @@
     SessionConfigurationManageFormPage,
     ConfigurationContainerManageFormPage,
-    DatacenterPage, ExportCSVPage)
+    DatacenterPage, ExportCSVPage,
+    CertificatePage, CertificateManageFormPage)
 from waeup.kofa.browser.reports import ReportsContainerPage
 from waeup.kofa.interfaces import IConfigurationContainer
+from waeup.kofa.university.interfaces import ICertificate
 from waeup.aaue.interfaces import (
     ICustomSessionConfiguration,
     ICustomSessionConfigurationAdd)
+
+class CustomCertificatePage(CertificatePage):
+    """Index page for certificates.
+    """
+    form_fields = grok.AutoFields(ICertificate).omit(
+        'custom_float_2',
+        'school_fee_1',
+        'school_fee_2',
+        'school_fee_3',
+        'school_fee_4',
+        'custom_textline_1',
+        'custom_textline_2',
+        )
+
+class CustomCertificateManageFormPage(CertificateManageFormPage):
+    """Manage the properties of a `Certificate` instance.
+    """
+    form_fields = grok.AutoFields(ICertificate).omit(
+        'ratio',
+        'custom_float_2',
+        'school_fee_1',
+        'school_fee_2',
+        'school_fee_3',
+        'school_fee_4',
+        'custom_textline_1',
+        'custom_textline_2',
+        'code')
 
 class CustomConfigurationContainerManageFormPage(

main/waeup.aaue/trunk/src/waeup/aaue/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -125 +125 @@
 msgstr "<b>Units: ${a}</b>"
 
-#: school_fee_1
-msgid "Initial School Fee"
-msgstr "School Fees 1 (not used)"
-
-#: school_fee_2
-msgid "Returning School Fee"
-msgstr "School Fees 2 (not used)"
-
-#: school_fee_3
-msgid "Foreigner Initial School Fee"
-msgstr "School Fees 3 (not used)"
-
-#: school_fee_4
-msgid "Foreigner Returning School Fee"
-msgstr "School Fees 4 (not used)"
-
 msgid "Registration Number"
 msgstr "(JAMB) Registration Number"
@@ -206 +190 @@
 msgstr "Result Sheet"
 
+#: school_fee_1
+msgid "Initial School Fee"
+msgstr "School Fees 1 (not used)"
+
+#: school_fee_2
+msgid "Returning School Fee"
+msgstr "School Fees 2 (not used)"
+
+#: school_fee_3
+msgid "Foreigner Initial School Fee"
+msgstr "School Fees 3 (not used)"
+
+#: school_fee_4
+msgid "Foreigner Returning School Fee"
+msgstr "School Fees 4 (not used)"
+
 #: waeup/kofa/university/interfaces.py:311
 msgid "Custom Float 1 (not used)"
-msgstr "Cumulative Units Taken"
-
-#: waeup/kofa/university/interfaces.py:316
-msgid "Custom Float 2 (not used)"
-msgstr "Cumulative Units Passed"
+msgstr "Cutoff JAMB Score"