Changeset 3406 for WAeUP_SRP/base/skins/waeup_accommodation

Timestamp:

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

Author:

Henrik Bettermann

Message:

WAeUPTool.py: fix traceback

Accommodation.py: enable import of reserved beds

release_bed.py: remove maintenance fee

reserve_accommodation.py: enable bed change for reserved beds. To be done: check for existing acco object before creating it in line 128

change_bed.py: enable bed change for reserved beds

Location:

WAeUP_SRP/base/skins/waeup_accommodation

Files:

• change_bed.py (modified) (2 diffs)
• reallocate_bed.py (deleted)
• reallocate_bed.py_not_used (added)
• release_bed.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -43 +43 @@
             psm = 'No bed allocated for %s' % (student_id)
             logger.info(psm)
-            break
-        allocated_bed = res[0]
-        if allocated_bed.bed_type == status:
-            logger.info('Status %s of %s has not changed.' % (status,student_id))
-            psm='Student status has not changed!'
-            break
-            #return redirect("%s/%s/%s/waeup_document_view?portal_status_message=%s" % (students.absolute_url(),student_id,info['acco_id'],psm))
-        logger.info('Bed status %s of %s has changed to %s.' % (allocated_bed.bed_type,student_id,status))
-        query = Eq('bed_type',status) & Eq('student',context.portal_accommodation.not_occupied)
-        records = context.portal_accommodation.evalAdvancedQuery(query)
-        if len(records) < 1:
-            psm='Bed change for %s failed, no free bed in category %s.' % (student_id,status)
-            logger.info(psm)
-            break
-        beds.modifyRecord(bed=allocated_bed.bed,student=beds.not_occupied)
-        logger.info('Bed %s released' % (allocated_bed.bed))
+            pass
+            #break
+        elif res[0].bed_type.endswith("reserved"):
+             logger.info('found reserved bed %s' % res[0].bed)
+             pass        
+        else:    
+            allocated_bed = res[0]
+            if allocated_bed.bed_type == status:
+                logger.info('Status %s of %s has not changed.' % (status,student_id))
+                psm='Student status has not changed!'
+                break
+                #return redirect("%s/%s/%s/waeup_document_view?portal_status_message=%s" % (students.absolute_url(),student_id,info['acco_id'],psm))
+            logger.info('Bed status %s of %s has changed to %s.' % (allocated_bed.bed_type,student_id,status))
+            query = Eq('bed_type',status) & Eq('student',context.portal_accommodation.not_occupied)
+            records = context.portal_accommodation.evalAdvancedQuery(query)
+            if len(records) < 1:
+                psm='Bed change for %s failed, no free bed in category %s.' % (student_id,status)
+                logger.info(psm)
+                break
+            beds.modifyRecord(bed=allocated_bed.bed,student=beds.not_occupied)
+            logger.info('Bed %s released' % (allocated_bed.bed))
         code,bed = beds.searchAndReserveBed(student_id,status)
-        if code > 0:
+        if code > -2:
             d = {}
             d['bed'] = bed
@@ -72 +77 @@
             psm='Bed changed!'
             break
-            #return redirect("%s/%s/%s/waeup_document_view?portal_status_message=%s" % (students.absolute_url(),student_id,info['acco_id'],psm))
-        #acco_doc = info['acco_doc']
-        #acco_doc.edit(mapping={'bed':"-- cancelled by officer due to failed bed change request --"})
         logger.info('Bed change for %s failed, code = %s' % (student_id,code))
-        #logger.info('%s cancelled booking of bed %s by %s' % (member,bed,student_id))
         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))
 

WAeUP_SRP/base/skins/waeup_accommodation/release_bed.py

@@ -44 +44 @@
     acco_cat.modifyRecord(bed=allocated_bed.bed,student=acco_cat.not_occupied)
     acco_doc = context.getContent()
-    acco_doc.edit(mapping={'bed':"-- cancelled by section officer --"})
+    acco_doc.edit(mapping={'bed':"-- cancelled by section officer --",'acco_maint_fee':""})
     logger.info('%s released bed of %s' % (member_id,student_id))
     return redirect("%s" % (context.absolute_url()))