Changeset 1301 for WAeUP_SRP/trunk

Timestamp:

15 Jan 2007, 12:00:30 (18 years ago)

Author:

joachim

Message:

set total correct for reserved beds (in custom)

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• getAccoFolderInfo.py (modified) (1 diff)
• getAccoHallInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoFolderInfo.py

@@ -37 +37 @@
 bt_list = []
 bt_names =  context.getBedTypeNames()
-reserved = pa.uniqueValuesFor('student')
+res = pa.uniqueValuesFor('student')
+reserved = [st for st in res if st]
 sum_total = 0
-sum_free = 0
+sum_occupied = 0
+#from Products.zdb import set_trace;set_trace()
 for bt in bed_types:
     total = len(pa(bed_type=bt))
     sum_total += total
-    free = len(pa.searchResults({'bed_type': bt,'student':reserved}))
-    sum_free += free
+    occupied = len(pa.searchResults({'bed_type': bt,'student':reserved}))
+    sum_occupied += occupied
     bt_list.append({'name': bt_names[bt],
                     'total': total,
-                    'reserved': free,
-                    'full': free == total,
+                    'reserved': occupied,
+                    'full': occupied == total,
                     })
 bt_list.append({'name': "All Categories",
                 'total': sum_total,
-                'reserved': sum_free,
+                'reserved': sum_occupied,
                 })
 info['bed_types'] = bt_list

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallInfo.py

@@ -33 +33 @@
 bt_list = []
 bt_names =  context.getBedTypeNames()
-all_booked = pa.uniqueValuesFor('student')
+res = pa.uniqueValuesFor('student')
+all_booked = [st for st in res if st]
 booked_list = []
 #from Products.zdb import set_trace;set_trace()