Changeset 3085 for WAeUP_SRP/uniben

Timestamp:

1 Feb 2008, 18:22:23 (17 years ago)

Author:

Henrik Bettermann

Message:

prepare hostel allocation in Benin

File:

• WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py (modified) (4 diffs)

WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py

@@ -50 +50 @@
                         'BARTTHR',
                         )
-pti_certificates = ('BENGIEP',
-                    'BENGGCPP',
-                    'BENGEEP',
-                    'BENGGEP',
-                    'BENGPEP',
-                    'BENGMEP',
-                    )
+#pti_certificates = ('BENGIEP',
+#                    'BENGGCPP',
+#                    'BENGEEP',
+#                    'BENGGEP',
+#                    'BENGPEP',
+#                    'BENGMEP',
+#                    )
+
+
+new_states = ('cleared_and_validated',
+              'school_fee_paid',
+              'courses_registered',
+              'courses_validated',
+              )
+
 info['error'] = None
 info['matric_no']=student_record.matric_no
@@ -74 +82 @@
 
 booking_allowed = False
-if review_state in ('cleared_and_validated','returning','school_fee_paid','courses_registered', 'courses_validated',) and student_record.session == session[0]:
+
+new = student_record.entry_session == session[0]
+arrived = student_record.session == session[0]
+
+if new and arrived and student_record.review_state in new_states:
     booking_allowed = True
-    if student_record.matric_no:
-        res = context.results_import(matric_no = student_record.matric_no)
-        if res:
-            booking_allowed = info['verdict'] in ("A",
-                                                 "B",)
-
-#booking_allowed = False
-
+elif arrived:
+    dummy,on_probation = divmod(int(student_record.level),100)
+    if not on_probation:
+        booking_allowed = True
+elif int(student_record.session) == int(session[0]) - 1:
+    if student_record.verdict in ('A','B',):
+        booking_allowed = True
+    
 info['booking_allowed'] = booking_allowed
 if not booking_allowed:
@@ -102 +114 @@
 
 d = {}
-if review_state == "cleared_and_validated":
+if new:
     bt = 'fr'
-elif int(student_record.level) < 100:
-    bt = 'pr'
 elif int(student_record.level) < int(student_record.end_level):
     bt = 're'
@@ -135 +145 @@
 elif student_record.course in ekehuan_certificates:
     bt += "_ekenhuan"
-elif student_record.course in pti_certificates:
-    bt += "_pti"
+#elif student_record.course in pti_certificates:
+#    bt += "_pti"