Changeset 1305 for WAeUP_SRP/trunk

Timestamp:

15 Jan 2007, 23:12:55 (18 years ago)

Author:

Henrik Bettermann

Message:

fully booked information simplified

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (1 diff)
• skins/waeup_student/reserve_accommodation.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -139 +139 @@
         #import pdb;pdb.set_trace()
         if len(records) == 0:
-            return -1,"No bed of this type available. This category is probably fully booked."
+            return -2
         rec = records[0]
         self.modifyRecord(bed=rec.bed,student=student_id)

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -79 +79 @@
         code,bed = pa.searchAndReserveBed(s_id,"%s" % (info['student_status']))
         #code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
-        if code < 0:
+        if code == -1:
             return context.accommodation_pin_edit_form(rendered = res,
-                                 psm = "%s bed type=%s" % (bed,info['student_status']),
+                                 psm = "%s" % bed,
                                  mode = mode,
                                  ds = ds,
                                  )
+        elif code == -2
+            return context.accommodation_pin_edit_form(rendered = res,
+                                 psm = "No bed available. Your category is already fully booked.",
+                                 mode = mode,
+                                 ds = ds,
+                                 )        
         student.invokeFactory('StudentAccommodation',acco_id)
         acco = getattr(student,acco_id)