Changeset 3087

Timestamp:

2 Feb 2008, 11:04:55 (17 years ago)

Author:

joachim

Message:

simplyfied logic for booking_allowed,
added test_getAccommodationInfo more testcases must be added

Location:

WAeUP_SRP

Files:

• base/skins/waeup_utilities/test_getAccommodationInfo.py (added)
• uniben/waeup_custom/getAccommodationInfo.py (modified) (2 diffs)

WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py

@@ -83 +83 @@
 booking_allowed = False
 
-new = student_record.entry_session == session[0]
-arrived = 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
-elif arrived:
-    dummy,on_probation = divmod(int(student_record.level),100)
-    if not on_probation:
-        booking_allowed = True
+# if new and arrived and student_record.review_state in new_states:
+#     booking_allowed = True
+# 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
+if student_record.session == session[0]:
+    if student_record.entry_session == session[0]:
+        booking_allowed = student_record.review_state in new_states
+    else:
+        booking_allowed = not (int(student_record.level) % 100)
 elif int(student_record.session) == int(session[0]) - 1:
-    if student_record.verdict in ('A','B',):
-        booking_allowed = True
+    booking_allowed = student_record.verdict in ('A','B',)
     
 info['booking_allowed'] = booking_allowed
@@ -147 +154 @@
 #elif student_record.course in pti_certificates:
 #    bt += "_pti"
-
-
 info['sex']=d['sex']
-
-
 d['bt'] = bt
 student_status = "%(sex)s_%(bt)s" % d