Changeset 821

Timestamp:

9 Nov 2006, 21:37:29 (18 years ago)

Author:

joachim

Message:

make hostel allocation work

Location:

WAeUP_SRP/trunk

Files:

• University.py (modified) (2 diffs)
• skins/waeup_accommodation/formatBed.py (modified) (2 diffs)
• skins/waeup_student/accommodation_pin_form.pt (modified) (2 diffs)
• skins/waeup_student/reserve_accommodation.py (modified) (8 diffs)

WAeUP_SRP/trunk/University.py

@@ -1 +1 @@
 from Globals import InitializeClass,HTMLFile
 from AccessControl import ClassSecurityInfo
+from Products.ZCatalog.ZCatalog import ZCatalog
 
 from Products.CMFCore.utils import getToolByName
@@ -21 +22 @@
     security = ClassSecurityInfo()
         
-    security.declarePublic('waeup_url')
-    def waeup_url(self):
-        """ return the base_url"""
-        return "%s/sections/waeup" % self.portal_url
-        return self.REQUEST
-    
+    security.declarePublic('getHallTitle')
+    def getHallTitle(self,hall):
+        """get the Hall Title"""
+        res = ZCatalog.searchResults(self.portal_catalog,portal_type="AccoHall",id=hall)
+        if res and len(res) == 1:
+            return res[0].Title
+        return hall
+
 InitializeClass(University)
 

WAeUP_SRP/trunk/skins/waeup_accommodation/formatBed.py

@@ +1 @@
+## Script (Python) "students_indext"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
 ##parameters=bed=None,mode=None,datastructure=None
+##title=
 # $Id$
 """
@@ -10 +17 @@
     return ''
 hall,block,room,letter = bed.split('_')
-res = context.portal_catalog(portal_type="AccoHall",id=hall)
-if res and len(res) == 1:
-    hall_title = res[0].Title
+hall_title = context.restrictedTraverse("%s/campus/getHallTitle" % 
+                         (context.portal_url.getPortalPath()))(hall)
 return " %s / Block %s / Room %s / Bed %s" % (hall_title,block,room,letter)

WAeUP_SRP/trunk/skins/waeup_student/accommodation_pin_form.pt

@@ -2 +2 @@
                    portal_status_message options/psm;
                    data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
+                   mode options/mode;
                    edition python:1;"
                    >
@@ -14 +14 @@
     </metal:block>
       <metal:block fill-slot="main">
-        <h3>Book Your Accommodation! </h3>
+        <h3 tal:condition="python: mode == 'create'">Book Your Accommodation! </h3>
+        <h3 tal:condition="python: mode == 'edit'">Pay Your Accommodation Maintainance Fee! </h3>
         <br />
         <div tal:replace="structure rendered_main" />
           <p>Instructions :</p>
-          <ul>
+          <ul tal:condition="python: mode == 'create'">
             <li>Buy a Hostel Application Scratch Card.</li> 
+            <li>Enter the PIN above.</li>
+            <li>Print the Hostel Allocation Slip.</li>
+          </ul>
+          <ul tal:condition="python: mode == 'edit'">
+            <li>Buy a Hostel Maintainance Scratch Card.</li> 
             <li>Enter the PIN above.</li>
             <li>Print the Hostel Allocation Slip.</li>

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -11 +11 @@
 
 info = context.getStudentInfo()
-validate = REQUEST.has_key("cpsdocument_create_button") or\
-           REQUEST.has_key("cpsdocument_edit_button")
+validate = REQUEST.has_key("cpsdocument_create_button")
+#           REQUEST.has_key("cpsdocument_edit_button")
 
 lt = context.portal_layouts
@@ -22 +22 @@
 mode = 'create'
 if info.has_key('acco') and info['acco']:
+    validate = REQUEST.has_key("cpsdocument_edit_button")
     if info['acco_review_state'] == "maintenance_fee_payed":
         return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % info['acco'].absolute_url())
@@ -27 +28 @@
         mode = 'edit'
 d = {}
+button = "Bookaccommodation"
 if mode == 'edit':
     info = context.getStudentInfo()
     d['acco_res_date'] = info['acco_doc'].acco_res_date
     d['acco_res_sc_pin'] = info['acco_doc'].acco_res_sc_pin
+    d['student_status'] = info['acco_doc'].student_status
     d['bed'] = info['acco_doc'].bed
     d['session'] = info['acco_doc'].session
+    button = "Pay Maintainance Fee"
 res,psm,ds = lt.renderLayout(layout_id= 'student_accommodation_fe',
                       schema_id= 'student_accommodation',
@@ -40 +44 @@
                       layout_mode=mode,
                       formaction = "reserve_accommodation",
-                      button = "Book",
+                      button = button
                       )
 if psm == 'invalid':
@@ -46 +50 @@
                                  psm = "Please correct your input.",
                                  #psm = "%s, %s" % (psm,ds),
-                                 firstlayout = True,
-                                 lastlayout = True,
+                                 mode = mode,
                                  ds = ds,
                                  )
@@ -53 +56 @@
     return context.accommodation_pin_form(rendered = res,
                                  psm = None,
-                                 firstlayout = True,
-                                 lastlayout = True,
+                                 mode = mode,
                                  ds = ds,
                                  )
@@ -66 +68 @@
             return context.accommodation_pin_form(rendered = res,
                                  psm = bed,
-                                 firstlayout = True,
-                                 lastlayout = True,
+                                 mode = mode,
                                  ds = ds,
                                  )
@@ -86 +87 @@
 return context.REQUEST.RESPONSE.redirect("%s/accommodation_view" % student.absolute_url())
 
-##return context.accommodation_pin_form(rendered = res,
-##                                 psm = "successfully reserved bed %s" % bed,
-##                                 firstlayout = True,
-##                                 lastlayout = True,
-##                                 ds = ds,
-##                                 )