Changeset 3408

Timestamp:

2 Apr 2008, 16:07:32 (17 years ago)

Author:

Henrik Bettermann

Message:

enable bed change for reserved beds

Location:

WAeUP_SRP/base

Files:

• WAeUPTables.py (modified) (1 diff)
• skins/waeup_accommodation/change_bed.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTables.py

@@ -497 +497 @@
         elif len(records) > 1:
             logger.info('%s found more than one (reserved) bed' % (student_id))
-            return -3,'more than one bed'            
+            return -3,'more than one bed'
         query = Eq('bed_type',bed_type) & Eq('student',NOT_OCCUPIED)
         records = self.evalAdvancedQuery(query,sortSpecs=('sort_id','bed'))
         if len(records) == 0:
-            logger.info('No bed %s available for %s' % (bed_type,student_id))
+            logger.info('no bed %s available for %s' % (bed_type,student_id))
             return -2,"no bed"
         rec = records[0]

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -46 +46 @@
             #break
         elif res[0].bed_type.endswith("reserved"):
-             logger.info('found reserved bed %s' % res[0].bed)
-             pass        
-        else:    
+             logger.info("found reserved bed %s which won't be released" % res[0].bed)
+             pass
+        else:
             allocated_bed = res[0]
             if allocated_bed.bed_type == status:
@@ -74 +74 @@
             acco_doc = info['acco_doc']
             acco_doc.edit(mapping=d)
+        if code > 0:
+            psm = 'Bed changed!'
             logger.info('Bed %s allocated to %s' % (bed,student_id))
-            psm='Bed changed!'
-            break
-        logger.info('Bed change for %s failed, code = %s' % (student_id,code))
-        psm='Bed change failed!'
+        elif code == -1:
+            psm = 'A reserved bed has been allocated.'
+        elif code == -2:
+            psm = 'No bed %s for %s available!' % (status,student_id)
+        else:
+            psm = 'Bed change failed!'
         break
     return redirect("%s/%s/%s/waeup_document_view?portal_status_message=%s" % (students.absolute_url(),student_id,info['acco_id'],psm))