Changeset 3089 for WAeUP_SRP/uniben/waeup_custom

Timestamp:

2 Feb 2008, 14:38:10 (17 years ago)

Author:

Henrik Bettermann

Message:

use new, previous and arrived

File:

• WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py (modified) (1 diff)

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]
-
-# 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]:
+new = student_record.entry_session == session[0]
+arrived = student_record.session == session[0]
+previous = int(student_record.session) == int(session[0]) - 1
+if arrived:
+    if new:
         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:
+elif previous:
     booking_allowed = student_record.verdict in ('A','B',)
-    
+
 info['booking_allowed'] = booking_allowed
 if not booking_allowed:
     info['acco'] = None
-#    return info
 
 acco_id = 'accommodation_' + session[0]