Changeset 1297 for WAeUP_SRP/trunk/skins

Timestamp:

15 Jan 2007, 09:57:20 (18 years ago)

Author:

joachim

Message:

correct Hall Statistic

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• acco_folder_view.pt (modified) (1 diff)
• getAccoFolderInfo.py (modified) (1 diff)
• getAccoHallInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_view.pt

@@ -35 +35 @@
           <td tal:content="bt/total" />
           <td tal:content="bt/reserved" />
+          <td tal:condition="bt/full|nothing">
+          <strong>Fully booked</strong>
+        </td>
         </tr>
       </table>

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoFolderInfo.py

@@ -48 +48 @@
                     'total': total,
                     'reserved': free,
+                    'full': free == total,
                     })
 bt_list.append({'name': "Total",

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallInfo.py

@@ -19 +19 @@
 
 request = context.REQUEST
-#from Products.zdb import set_trace;set_trace()
 
 wf = context.portal_workflow
@@ -34 +33 @@
 bt_list = []
 bt_names =  context.getBedTypeNames()
-reserved = pa.uniqueValuesFor('student')
+all_booked = pa.uniqueValuesFor('student')
+booked_list = []
+#from Products.zdb import set_trace;set_trace()
 for bt in bed_types:
     total = len(pa(bed_type=bt,hall=context.getId()))
     if total <= 1:
         continue
-    free = len(pa.searchResults({'bed_type': bt,
-                                 'student':reserved,
-                                 'hall': context.getId()}))
+    booked = pa.searchResults({'bed_type': bt,
+                                 'student':all_booked,
+                                 'hall': context.getId()})
     bt_list.append({'name': bt_names[bt],
                     'total': total,
-                    'reserved': free,
+                    'reserved': len(booked),
                     })
+    booked_list.extend(booked)
 info['bed_types'] = bt_list
 res_list = []
 students_url = "%s/campus/students" % (context.portal_url())
-if reserved:
-    for st in reserved:
-        if st:
-            res = pa(hall=context.getId(),student=st)
-            if not res:
-                continue
-            d = {}
-            d['student'] = st
-            d['student_url'] ='%s/%s' % (students_url,st)
-            bed = context.formatBed(res[0].bed).split('/')
-            d['bed'] = " / ".join(bed[1:])
-            erg = context.students_catalog(id = st)
-            if erg:
-                sd = context.getFormattedStudentEntry(erg[0])
-                d.update(sd)
-            res_list.append(d)
+for sbrain in booked_list:
+    d = {}
+    st = sbrain.student
+    if not st:
+        continue
+    d['student'] = st
+    d['student_url'] ='%s/%s' % (students_url,st)
+    bed = context.formatBed(sbrain.bed).split('/')
+    d['bed'] = " / ".join(bed[1:])
+    erg = context.students_catalog(id = st)
+    if erg:
+        sd = context.getFormattedStudentEntry(erg[0])
+        d.update(sd)
+    res_list.append(d)
 res_list.sort(cmp_bed)
 info['reserved'] = res_list