Changeset 1269

Timestamp:

11 Jan 2007, 17:06:34 (18 years ago)

Author:

joachim

Message:

new acco_hall_view with csv-download

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/acco_hall_view.pt (modified) (3 diffs)
• waeup_accommodation/getAccoHallInfo.py (modified) (3 diffs)
• waeup_accommodation/hall_allocation_list.py (added)
• waeup_student/getFormattedStudentEntry.py (added)

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getAccoHallInfo;"
-            >
+<metal:html tal:define="info context/getAccoHallInfo">
   <metal:body use-macro="here/waeup_content_master/macros/master">
     <metal:block fill-slot="header">
@@ -32 +31 @@
       </table>
       <br />
-      <table tal:condition="info/reserved"
+      <div>
+        <a href="download" 
+           tal:attributes="href string:hall_allocation_list">
+          <strong>Download bedlist as csv </strong></a>
+      </div>
+      <br />
+      <table tal:condition="python:info['reserved']"
              tal:define="reserved info/reserved">
         <tr>
-          <th width="200px">Student</th>
+          <th width="50px">Student-Id</th>
+          <th width="150px">Name</th>
           <th>Bed</th>
         </tr>
@@ -43 +49 @@
                tal:content="bt/student"></a>
           </td>
+          <td tal:content="bt/name" />
           <td tal:content="bt/bed" />
         </tr>

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallInfo.py

@@ -10 +10 @@
 # $Id$
 """
-return Info about the Faculties
+return Info about a Accommodation Hall
 """
+
+def cmp_bed(a,b):
+    if a['bed'] > b['bed']:
+        return 1
+    return -1
+
 request = context.REQUEST
+#from Products.zdb import set_trace;set_trace()
 
 wf = context.portal_workflow
@@ -30 +37 @@
 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,
@@ -39 +48 @@
 info['bed_types'] = bt_list
 res_list = []
-students_rpath = context.portal_catalog(meta_type = "StudentsFolder")[-1].relative_path
-students_url = "%s/%s" % (context.portal_url(),students_rpath)
-if reserved > 1:
+students_url = "%s/campus/students" % (context.portal_url())
+if reserved:
     for st in reserved:
         if st:
             res = pa(hall=context.getId(),student=st)
-            if res:
-                res_list.append({'student': st,
-                                 'student_url': '%s/%s' % (students_url,st),
-                                 'bed': context.formatBed(res[0].bed) })
+            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)
+res_list.sort(cmp_bed)
 info['reserved'] = res_list