Changeset 3406

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

Files:

• Accommodation.py (modified) (1 diff)
• WAeUPTables.py (modified) (1 diff)
• WAeUPTool.py (modified) (1 diff)
• skins/waeup_accommodation/change_bed.py (modified) (2 diffs)
• skins/waeup_accommodation/reallocate_bed.py (deleted)
• skins/waeup_accommodation/reallocate_bed.py_not_used (added)
• skins/waeup_accommodation/release_bed.py (modified) (1 diff)
• skins/waeup_student/reserve_accommodation.py (modified) (1 diff)

WAeUP_SRP/base/Accommodation.py

@@ -203 +203 @@
                     psm = "Not a reserved bed"
                     break
-                if bed_brain.student:
+                if bed_brain.student and bed_brain.student != NOT_OCCUPIED:
                     psm = "Bed %s already reserved for %s" % (bid,bed_brain.student)
                     break

WAeUP_SRP/base/WAeUPTables.py

@@ -489 +489 @@
 
     def searchAndReserveBed(self, student_id,bed_type): ###(
-        #records = self.searchResults({'student' : student_id})
-        #import pdb;pdb.set_trace()
+        logger = logging.getLogger('WAeUPTables.AccommodationTable.searchAndReserveBed')
         records = self.evalAdvancedQuery(Eq('student',student_id))
-        if len(records) > 0:
-            return -1,"Student with Id %s already booked bed %s." % (student_id,records[0].bed)
-
-        #records = [r for r in self.searchResults({'bed_type' : bed_type}) if not r.student]
+        if len(records) == 1:
+            #return -1,"Student with Id %s already booked bed %s." % (student_id,records[0].bed)
+            logger.info('%s found (reserved) bed %s' % (student_id,records[0].bed))
+            return -1,records[0].bed
+        elif len(records) > 1:
+            logger.info('%s found more than one (reserved) bed' % (student_id))
+            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:
-            return -2,"No bed available"
+            logger.info('No bed %s available for %s' % (bed_type,student_id))
+            return -2,"no bed"
         rec = records[0]
         self.modifyRecord(bed=rec.bed,student=student_id)
-        s_logger = logging.getLogger('WAeUPTables.AccommodationTable.searchAndReserveBed')
-        s_logger.info('%s reserved bed %s' % (student_id,rec.bed))
+        logger.info('%s booked bed %s' % (student_id,rec.bed))
         return 1,rec.bed
     ###)

WAeUP_SRP/base/WAeUPTool.py

@@ -1175 +1175 @@
         """return Hall Info"""
         info = {}
-        hall,block,room,letter = bed.split('_')
+        bedsplit = bed.split('_')
+        if len(bedsplit) == 4:
+            hall,block,room,letter = bed.split('_')
+        else:
+            info['maintenance_code'] = 'None'
+            return info
         res = ZCatalog.searchResults(self.portal_catalog_real,portal_type="AccoHall",id=hall)
         if res and len(res) == 1:

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()))

WAeUP_SRP/base/skins/waeup_student/reserve_accommodation.py

@@ -108 +108 @@
                 break
             if code == -1:
-                return context.accommodation_edit_form(rendered = res,
-                                        psm = "%s" % bed,
-                                        mode = mode,
-                                        ds = ds,
-                                        )
+                break
+                #return context.accommodation_edit_form(rendered = res,
+                #                        psm = "%s" % bed,
+                #                        mode = mode,
+                #                        ds = ds,
+                #                        )
             elif code == -2:
                 return context.accommodation_edit_form(rendered = res,