Changeset 3425

Timestamp:

7 Apr 2008, 07:24:40 (17 years ago)

Author:

Henrik Bettermann

Message:

fix traceback

Location:

WAeUP_SRP

Files:

• base/skins/waeup_accommodation/change_bed.py (modified) (1 diff)
• uniben/waeup_custom/getAccommodationInfo.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -96 +96 @@
     if sbt is None:
         continue
-    elif r.bed_type == sbt:
+    elif r.bed_type == sbt or r.bed_type.endswith('reserved'):
         #list.append("Student %s bed_type %s ok" % (r.student,r.bed_type))
         continue

WAeUP_SRP/uniben/waeup_custom/getAccommodationInfo.py

@@ -85 +85 @@
 new = student_record.entry_session == session[0]
 arrived = student_record.session == session[0]
-previous = int(student_record.session) == int(session[0]) - 1
+
 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))
+except:
+    logger.info('%s has invalid level %s' % (student_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))
-    
+except:
+    logger.info('%s has invalid end_level %s' % (student_id,student_record.end_level))
+try:
+    previous = int(student_record.session) == int(session[0]) - 1    
+except:
+    logger.info('%s has invalid session %s' % (student_id,student_record.session))
+
 if level is None or end_level is None or student_record.review_state == 'deactivated':
     pass