Changeset 17627 for main/waeup.aaue/trunk/src/waeup/aaue/applicants

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/applicants

Files:

• interfaces.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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'),