Changeset 2845 for WAeUP_SRP/base/Accommodation.py

Timestamp:

3 Dec 2007, 21:14:20 (17 years ago)

Author:

joachim

Message:

add sort_id, additional fields in payment

File:

• WAeUP_SRP/base/Accommodation.py (modified) (4 diffs)

WAeUP_SRP/base/Accommodation.py

@@ -10 +10 @@
 from Products.CPSDocument.CPSDocument import CPSDocument
 from Products.CPSCore.CPSBase import CPSBaseBTreeFolder as BaseBTreeFolder
-from Products.WAeUP_SRP.WAeUPTables import AccommodationTable
+from Products.WAeUP_SRP.WAeUPTables import AccommodationTable,NOT_OCCUPIED
 import logging
 import csv,re,os
@@ -18 +18 @@
 p_home = Globals.package_home(globals())
 i_home = Globals.INSTANCE_HOME
+
 
 class AccoFolder(CPSDocument): ###(
@@ -47 +48 @@
         for hall in halls:
             #import pdb;pdb.set_trace()
-            h = hall.getContent()
+            hall_doc = hall.getContent()
             hall_gen = {}
             hall_gen['name'] = hall.Title
             count = 0
-            reserved = [(r.split('/')[0],int(r.split('/')[1])) for r in re.split(',|\.| ',h.reserved_rooms)
+            reserved = [(r.split('/')[0],int(r.split('/')[1])) for r in re.split(',|\.| ',hall_doc.reserved_rooms)
                                      if r]
-            #for block in range(1,int(h.nr_of_blocks)+1):
-            # for block in 'ABCDEFGHIJ'[:int(h.nr_of_blocks)]:
-            if set(h.blocks_for_female).intersection(set(h.blocks_for_male)):
+            #for block in range(1,int(hall_doc.nr_of_blocks)+1):
+            # for block in 'ABCDEFGHIJ'[:int(hall_doc.nr_of_blocks)]:
+            if set(hall_doc.blocks_for_female).intersection(set(hall_doc.blocks_for_male)):
                 return self.accommodation.acco_folder_view(beds_generated=beds_generated)
-            for block in h.blocks_for_female + h.blocks_for_male:
+            for block in hall_doc.blocks_for_female + hall_doc.blocks_for_male:
                 sex = 'male'
-                if block in h.blocks_for_female:
+                if block in hall_doc.blocks_for_female:
                     sex = 'female'
-                for floor in range(1,int(h.nr_of_floors)+1):
-                    for room in range(1,int(h.rooms_per_floor)+1):
-                        for bed in 'ABCDEFGH'[:int(h.beds_per_room)]:
+                for floor in range(1,int(hall_doc.nr_of_floors)+1):
+                    for room in range(1,int(hall_doc.rooms_per_floor)+1):
+                        for bed in 'ABCDEFGH'[:int(hall_doc.beds_per_room)]:
                             room_nr = floor*100 + room
                             bt = 're'
                             if (block,room_nr) in reserved:
                                 bt = "reserved"
-                            elif h.special_handling and not h.special_handling.startswith("no"):
-                                bt = h.special_handling
-                            elif bed in h.beds_for_fresh:
+                            elif hall_doc.special_handling and not hall_doc.special_handling.startswith("no"):
+                                bt = hall_doc.special_handling
+                            elif bed in hall_doc.beds_for_fresh:
                                 bt = 'fr'
-                            elif bed in h.beds_for_pre:
+                            elif bed in hall_doc.beds_for_pre:
                                 bt = 'pr'
-                            elif bed in h.beds_for_final:
+                            elif bed in hall_doc.beds_for_final:
                                 bt = 'fi'
-                            if h.special_handling.startswith("no_"):
-                                bt += "_" + h.special_handling[3:]
+                            if hall_doc.special_handling.startswith("no_"):
+                                bt += "_" + hall_doc.special_handling[3:]
                             bt = "%(sex)s_%(bt)s" % vars()
                             uid = '%s_%s_%d_%s' % (hall.getId(),block,room_nr,bed)
+                            d = {}
+                            d['bed'] = uid
+                            d['bed_type'] = bt
+                            d['sort_id'] = getattr(hall_doc,'sort_id')
+                            d['hall'] = hall.getId()
+                            d['student'] = NOT_OCCUPIED
                             try:
-                                freelist.addRecord(bed = uid, bed_type = bt,hall = hall.getId())
+                                #freelist.addRecord(bed = uid, bed_type = bt,hall = hall.getId())
+                                freelist.addRecord(**d)
                                 count +=1
                                 generated.append('"%(uid)s","%(bt)s"' % vars())
                             except ValueError:
                                 #freelist.modifyRecord(bed = uid, bed_type = bt,hall =hall.getId())
+                                #freelist.modifyRecord(**d)
                                 pass
             hall_gen['count']= count
@@ -239 +248 @@
 ###)
 
+###)
+
 class AccoHall(CPSDocument): ###(
     """
-    WAeUP AccoHall containing Departments
+    WAeUP AccoHall
     """
     meta_type = 'AccoHall'