Changeset 3131 for WAeUP_SRP/uniben/waeup_custom

Timestamp:

8 Feb 2008, 19:56:14 (17 years ago)

Author:

joachim

Message:

should fix the int-traceback, untestet

File:

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

WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py

@@ -86 +86 @@
 arrived = student_record.session == session[0]
 previous = int(student_record.session) == int(session[0]) - 1
-
-if student_record.review_state == 'deactivated':
+level = None
+end_level = None
+try:
+    level = int(student_record.level)
+except ValueError:
+    logger.info('%s has invalid level %s' % (member_id,student_record.level))
+try:
+    end_level = int(student_record.end_level)
+except ValueError:
+    logger.info('%s has invalid end_level %s' % (member_id,student_record.end_level))
+    
+if level is None or end_level is None or student_record.review_state == 'deactivated':
     pass
 elif arrived:
@@ -93 +103 @@
         booking_allowed = student_record.review_state in new_states
     else:
-        booking_allowed = not (int(student_record.level) % 100)
+        booking_allowed = not (level % 100)
 elif previous:
     booking_allowed = student_record.verdict in ('A','B',)
@@ -121 +131 @@
 if new:
     bt = 'fr'
-elif int(student_record.level) + delta < int(student_record.end_level):
+elif level + delta < end_level:
     bt = 're'
 else:
@@ -146 +156 @@
 if student_record.sex:
     d['sex'] = 'female'
-if student_record.faculty in ('MED','DEN') and int(student_record.level) > 400:
+if student_record.faculty in ('MED','DEN') and level > 400:
     bt += "_med"
 elif student_record.course in ekehuan_certificates: