Changeset 3007

Timestamp:

11 Jan 2008, 07:02:36 (17 years ago)

Author:

Henrik Bettermann

Message:

fix bed statistics

Location:

WAeUP_SRP/base/skins/waeup_accommodation

Files:

• getBedStatistics.py (modified) (2 diffs)
• statistics_bed_view.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_accommodation/getBedStatistics.py

@@ -15 +15 @@
 bt_names =  context.getBedTypeNames()
 res = pa.uniqueValuesFor('student')
-reserved = [st for st in res if st]
+occupied_types = [st for st in res if st and st != 'not_occupied']
 sum_total = 0
 sum_occupied = 0
@@ -23 +23 @@
     total = len(pa(bed_type=bt))
     sum_total += total
-    occupied = len(pa.searchResults({'bed_type': bt,'student':reserved}))
+    occupied = len(pa.searchResults({'bed_type': bt,'student':occupied_types}))
     sum_occupied += occupied
     bt_list.append({'name': bt_names[bt],
                     'total': total,
-                    'reserved': occupied,
+                    'occupied': occupied,
                     'full': occupied == total,
                     })
 bt_list.append({'name': "All Categories",
                 'total': sum_total,
-                'reserved': sum_occupied,
+                'occupied': sum_occupied,
                 })
 info['bed_types'] = bt_list
-reserved = pa.uniqueValuesFor('student')
-res_list = []
-if reserved > 1:
-    for st in reserved:
-        if st:
-            res = pa(student=st)
-            res_list.append({'student': st, 'bed': res[0].bed })
-info['reserved'] = res_list
+
+#reserved = pa.uniqueValuesFor('student')
+#res_list = []
+#if reserved > 1:
+#    for st in reserved:
+#        if st:
+#            res = pa(student=st)
+#            res_list.append({'student': st, 'bed': res[0].bed })
+#info['reserved'] = res_list
+                  
 return info

WAeUP_SRP/base/skins/waeup_accommodation/statistics_bed_view.pt

@@ -18 +18 @@
           <td tal:content="bt/name" />
           <td tal:content="bt/total" />
-          <td tal:content="bt/reserved" />
+          <td tal:content="bt/occupied" />
           <td tal:condition="bt/full|nothing">
           <strong>Fully booked</strong>