Changeset 5621

Timestamp:

28 Dec 2010, 08:53:23 (14 years ago)

Author:

Henrik Bettermann

Message:

Further improvements for new accommodation booking.

Location:

WAeUP_SRP/trunk/skins/waeup_accommodation

Files:

• accommodations.pt (modified) (2 diffs)
• getAccommodationRecords.py (modified) (1 diff)
• getAccommodationStatus.py (modified) (1 diff)
• pay_accommodation.py (modified) (2 diffs)
• pay_accommodation_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/accommodations.pt

@@ -36 +36 @@
                 tal:content="python:context.getFormattedBed(row['bed'])" />
 
-            <td tal:condition="not:row/paid">
-              <a 
-                 tal:attributes="href string:${row/url}/pay_accommodation?session=${row/session}">
+            <td>
+              <a tal:condition="row/current_unpaid"
+                 tal:attributes="href string:${row/url}/pay_accommodation">
                  [pay maintenance fee]
-              </a> 
+              </a> &nbsp;
             </td>
 
@@ -50 +50 @@
               </a> 
             </td>
-            <td tal:condition="row/cancellation_allowed">
-              <a href=""
+            <td>
+              <a tal:condition="row/cancellation_allowed" href=""
                  tal:attributes="href string:${row/url}/cancel_allocation?session=${row/session}">
                  [cancel booking]
-              </a> 
+              </a> &nbsp;
             </td>            
-            <td tal:condition="row/relocation_allowed">
-              <a href="" 
+            <td>
+              <a  tal:condition="row/relocation_allowed" href="" 
                  tal:attributes="href string:${row/url}/relocate?session=${row/session}">
                  [relocate]
-              </a> 
+              </a> &nbsp;
             </td>             
           </tr>

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationRecords.py

@@ -51 +51 @@
 for ar in accommodation_records:
     row = {}
+    row['sort_param'] = ar.session[-2:]  # in 2006 we used the session attribute was 2006 and not 06
     row['session'] = ar.session
     row['bed'] = ar.bed
     row['reservation_status'] = ar.reservation_status
     row['paid'] = ar.reservation_status == 'maintenance_fee_paid'
+    row['current_unpaid'] = not row['paid'] and ar.session == portal_session
     row['url'] = student_path
     row['cancellation_allowed'] = info['is_so'] and ar.session == portal_session
     row['relocation_allowed'] = info['is_so'] and ar.session == portal_session
     accommodations.append(row)
+
+accommodations.sort(cmp=lambda x,y: cmp(x['sort_param'],y['sort_param']))
 
 info['accommodations'] = accommodations

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationStatus.py

@@ -173 +173 @@
 info['acco_res_sc_pin'] = accommodation_record.acco_res_sc_pin
 info['acco_maint_fee'] = accommodation_record.acco_maint_fee
+info['acco_maint_code'] = accommodation_record.acco_maint_code
 info['student_status'] = accommodation_record.student_status
 info['bed'] = accommodation_record.bed

WAeUP_SRP/trunk/skins/waeup_accommodation/pay_accommodation.py

@@ -54 +54 @@
 if psm == 'invalid':
     member_id = str(context.portal_membership.getAuthenticatedMember())
-    #logger.info('%s, %s' % (member_id,info['error'] ))
     logger.info('%s entered invalid data' % (member_id))
     psm = "Please correct your input."
@@ -77 +76 @@
 data['reservation_status'] = 'maintenance_fee_paid'
 
-#set_trace()
 context.accommodation_catalog.modifyRecord(**data)
+
+logger.info('%s paid accommodation in session %s' % (student_id,session))
 
 return context.REQUEST.RESPONSE.redirect("%s/accommodations" % student.absolute_url())

WAeUP_SRP/trunk/skins/waeup_accommodation/pay_accommodation_form.pt

@@ -22 +22 @@
         <ul tal:condition="not: maintenance_online">
              <li>Buy a Hostel Maintenance Scratch Card 
-               (Code: <span tal:replace="python: 'acco_maint_code'" />) for 
-               <span tal:replace="python: 'acco_maint_fee'" /> Nairas</li> 
+               (Code: <span tal:replace="info/acco_maint_code" />) for 
+               <span tal:replace="info/acco_maint_fee" /> Nairas</li> 
              <li>Enter the PIN above and press 'Submit'.</li>
              <li>Print your Hostel Maintenance Receipt.</li>