Changeset 1162

Timestamp:

31 Dec 2006, 09:39:14 (18 years ago)

Author:

Henrik Bettermann

Message:

bugs fixed after testing (please check!)

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (1 diff)
• skins/waeup_default/waeup_document_view.pt (modified) (2 diffs)
• skins/waeup_student/accommodation_slip.pt (modified) (1 diff)
• skins/waeup_student/getClearanceInfo.py (modified) (1 diff)
• skins/waeup_student/getStudentName.py (modified) (1 diff)
• skins/waeup_student/layout_student_acco_view_slip.pt (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -139 +139 @@
         #import pdb;pdb.set_trace()
         if len(records) == 0:
-            return -1,"No bed of this type available"
+            return -1,"No bed of this type available!"
         rec = records[0]
         self.modifyRecord(bed=rec.bed,student=student_id)

WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt

@@ -1 +1 @@
 <metal:html tal:define="info context/getDocumentInfo;
-                        s_id context/getStudentId;
-                        s_name context/getStudentName
+                        s_name context/getStudentName;
                         is_so context/isSectionOfficer;"
             >
@@ -12 +11 @@
       </a>
       <h3> 
-         <span tal:condition="python:is_so and s_id">
+         <span tal:condition="python:is_so and s_name">
            <span tal:content="s_name" />:
          </span>

WAeUP_SRP/trunk/skins/waeup_student/accommodation_slip.pt

@@ -1 @@
-<metal:html tal:define="info context/getAccommodationInfo">
-  <span tal:condition="not: info">
-    <span tal:content="here/illegal_view" />
-  </span>
-<metal:block tal:condition="info"> 
+<metal:html tal:define="info_acco context/getAccommodationInfo;
+                        info_app  context/getApplicationInfo">
+
+<span tal:condition="not: info_acco">
+  <span tal:content="here/illegal_view" />
+</span>
+<metal:block tal:condition="info_acco"> 
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-      <span tal:condition="not: info">
-        <metal:block use-macro="here/error_not_found/macros/not_found" />
-      </span>
       <h3>Hostel Allocation Slip (and Maintenance Receipt)</h3>
       <br />
       <span tal:omit-tag=""
-            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
+            tal:content="structure python: info_app['app_doc'].render(proxy=info_app['app_doc'],
             layout_mode='view_info', 
             layout_id='student_application_fe')" 
             />
       <span tal:omit-tag=""
-            tal:content="structure python: info['acco_doc'].render(proxy=info['acco_doc'],
+            tal:content="structure python: info_acco['acco_doc'].render(proxy=info_acco['acco_doc'],
             layout_mode='view_slip', 
             layout_id='student_accommodation_fe')" 

WAeUP_SRP/trunk/skins/waeup_student/getClearanceInfo.py

@@ -53 +53 @@
 info['clear_doc'] = student.clearance.getContent()
 info['clear_review_state'] = wf.getInfoFor(student.clearance,'review_state',None)
-if info['clear_review_state'] in ('clearance_requested', 'cleared_and_validated',):
+if info['review_state'] in ('clearance_requested', 'cleared_and_validated',):
     info['penalty'] = info['penalty'] and\
                       info['clear_doc'].entry_date.greaterThan(DateTime('2006/12/30'))

WAeUP_SRP/trunk/skins/waeup_student/getStudentName.py

@@ -19 +19 @@
 #from Products.zdb import set_trace
 #set_trace()
-if context.isStaff():
-    return member.getProperty('fullname',None)
 if not context.isStudent():
     return None

WAeUP_SRP/trunk/skins/waeup_student/layout_student_acco_view_slip.pt

@@ -7 +7 @@
               fields python:('session',
                                  'bed',
-                                 'student_status',
                                  'acco_res_sc_pin',
                                  'acco_res_date',