Changeset 627 for WAeUP_SRP/trunk/skins

Timestamp:

9 Oct 2006, 10:02:41 (18 years ago)

Author:

joachim

Message:

counting error corrected, cleartext bed_type names

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• acco_hall_view.pt (modified) (1 diff)
• getAccoHallsInfo.py (modified) (1 diff)
• getHallInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

@@ -11 +11 @@
       <h3 tal:content="here/title_or_id" />
       <div tal:condition="nothing" tal:content="info/container_path"/>
+      <table tal:condition="info/bed_types"
+             tal:define="bed_types info/bed_types">
+        <tr>
+          <th>Bed Type</th>
+          <th>Beds</th>
+        </tr>
+        <tr tal:repeat="bt bed_types">
+          <td tal:content="bt/name" />
+          <td tal:content="bt/count" />
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+      </table>
     </metal:block>
     <metal:main fill-slot="main">

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallsInfo.py

@@ -38 +38 @@
 bed_types = pa.uniqueValuesFor('bed_type')
 bt_list = []
+bt_names =  context.getBedTypeNames()
 for bt in bed_types:
     res = pa(bed_type=bt)
-    bt_list.append({'name': bt, 'count': len(res)})
+    bt_list.append({'name': bt_names[bt], 'count': len(res)})
 info['bed_types'] = bt_list
 reserved = pa.uniqueValuesFor('student')

WAeUP_SRP/trunk/skins/waeup_accommodation/getHallInfo.py

@@ -17 +17 @@
 path_info = request.get('PATH_INFO').split('/')
 mtool = context.portal_membership
-
+pa = context.portal_accommodation
 info = {}
 #dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
@@ -26 +26 @@
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
+bed_types = pa.uniqueValuesFor('bed_type')
+bt_list = []
+bt_names =  context.getBedTypeNames()
+for bt in bed_types:
+    res = pa(bed_type=bt,hall=context.getId())
+    bt_list.append({'name': bt_names[bt], 'count': len(res)})
+info['bed_types'] = bt_list
+
 return info