Changeset 3047

Timestamp:

25 Jan 2008, 09:55:40 (17 years ago)

Author:

joachim

Message:

fix for #69 fceokene,

File:

• WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_accommodation/change_bed.py

@@ -33 +33 @@
     logger.info('%s requests bed change for %s' % (member_id,student_id))
     info = context.getAccommodationInfo(student_id)
+    if info['acco'] is None:
+        logger.info('No accommodation object for %s' % (student_id))
+        return redirect("%s/%s" % (students.absolute_url(),student_id))
     res = beds(student=student_id)
+    status = info['student_status']
     if len(res) == 0:
-        logger.info('No bed found for %s' % (student_id))
-        return redirect("%s/%s" % (students.absolute_url(),student_id))
-    allocated_bed = res[0]
-    status = info['student_status']
-    student = student_id
-    if allocated_bed.bed_type == status:
-        logger.info('Status %s of %s has not changed' % (status,student_id))
-        return redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))
-    logger.info('Bed status %s of %s has changed to %s' % (allocated_bed.bed_type,student_id,status))
-    beds.modifyRecord(bed=allocated_bed.bed,student=beds.not_occupied)
-    logger.info('Bed %s released' % (allocated_bed.bed))
+        logger.info('No bed allocated for %s' % (student_id))
+        #return redirect("%s/%s" % (students.absolute_url(),student_id))
+    else:
+        allocated_bed = res[0]
+        #student = student_id
+        if allocated_bed.bed_type == status:
+            logger.info('Status %s of %s has not changed' % (status,student_id))
+            return redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))
+        logger.info('Bed status %s of %s has changed to %s' % (allocated_bed.bed_type,student_id,status))
+        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:
-        #from Products.zdb import set_trace; set_trace()
         d = {}
         d['bed'] = bed
@@ -58 +61 @@
         acco_doc.edit(mapping=d)
         logger.info('Bed %s allocated to %s' % (bed,student_id))
-        return redirect("%s/%s/%s" % (students.absolute_url(),student,info['acco_id']))
-    student_obj = getattr(students,student_id)
-    acco_id = "accommodation_%s" % context.getSessionId()[0]
-    if acco_id in student_obj.objectIds():
-        acco_doc = getattr(student_obj, acco_id).getContent()
-        if acco_doc.bed == bed:
-            acco_doc.edit(mapping={'bed':"-- cancelled by officer due to failed bed change request --"})
+        return redirect("%s/%s/%s" % (students.absolute_url(),student_id,info['acco_id']))
+    # student_obj = getattr(students,student_id)
+    # acco_id = "accommodation_%s" % context.getSessionId()[0]
+    # if acco_id in student_obj.objectIds():
+    #     acco_doc = getattr(student_obj, acco_id).getContent()
+    #     if acco_doc.bed == bed:
+    #         acco_doc.edit(mapping={'bed':"-- cancelled by officer due to failed bed change request --"})
+    acco_doc = info['acco_doc']
+    if acco_doc.bed == bed:
+        acco_doc.edit(mapping={'bed':"-- cancelled by officer due to failed bed change request --"})
     logger.info('New bed allocation for %s failed, code = %s' % (student_id,code))
     logger.info('%s cancelled booking of bed %s by %s' % (member,bed,student_id))