Changeset 2913 for WAeUP_SRP

Timestamp:

10 Dec 2007, 21:50:04 (17 years ago)

Author:

Henrik Bettermann

Message:

calculate correct session_id and layout changes

Location:

WAeUP_SRP

Files:

• base/WAeUPTool.py (modified) (1 diff)
• base/skins/waeup_student/accommodation_view.pt (modified) (1 diff)
• fceokene/profiles/default/layouts/student_accommodation.xml (modified) (3 diffs)
• fceokene/profiles/default/layouts/student_accommodation_fe.xml (modified) (3 diffs)
• fceokene/waeup_custom/getAccommodationInfo.py (modified) (4 diffs)
• fceokene/waeup_custom/getSchoolFee.py (modified) (1 diff)
• fceokene/waeup_custom/layout_student_acco_view_slip.pt (modified) (1 diff)
• fceokene/waeup_custom/pay_interswitch.py (modified) (1 diff)

WAeUP_SRP/base/WAeUPTool.py

@@ -947 +947 @@
                 break
         if batch_doc is None:
-            info['maintenance_fee'] = None
+            info['maintenance_fee'] = ''
         else:
             info['maintenance_fee'] = batch_doc.cost

WAeUP_SRP/base/skins/waeup_student/accommodation_view.pt

@@ -26 +26 @@
               layout_id='student_accommodation_fe')" 
               />
-      <table>
-        <tr>
-          <td width="220px">Level:</td><td tal:content="info/level" />
-        </tr>
-      </table>
     </span>
   </metal:main>

WAeUP_SRP/fceokene/profiles/default/layouts/student_accommodation.xml

@@ -39 +39 @@
  </widget>
  <widget name="acco_maint_fee" meta_type="String Widget">
-  <property name="title">Maintenance Payment Fee</property>
+  <property name="title">Maintenance Fee</property>
   <property name="fields">
    <element value="acco_maint_fee"/>
   </property>
-  <property name="label">Maintenance Payment Fee</property>
-  <property name="label_edit">Maintenance Payment Fee</property>
+  <property name="label">Maintenance Fee</property>
+  <property name="label_edit">Maintenance Fee</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -54 +54 @@
  </widget>
  <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Access Code</property>
+  <property name="title">Hostel Maintenance PIN</property>
   <property name="fields">
    <element value="acco_maint_sc_pin"/>
   </property>
-  <property name="label">Access Code</property>
-  <property name="label_edit">Access Code</property>
+  <property name="label">Hostel Maintenance PIN</property>
+  <property name="label_edit">Hostel Maintenance PIN</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -180 +180 @@
   <row>
    <cell name="acco_maint_sc_pin"/>
-  </row>
+  </row>    
+  <row>
+   <cell name="acco_maint_pay_id"/>
+  </row>  
   <row>
    <cell name="acco_maint_date"/>
   </row>
+
  </table>
 </object>

WAeUP_SRP/fceokene/profiles/default/layouts/student_accommodation_fe.xml

@@ -21 +21 @@
   </property>
   <property name="view_format">%d/%m/%Y</property>
-  <property name="time_setting">False</property>  
+  <property name="time_setting">False</property>
   <property name="hidden_readonly_layout_modes"/>
  </widget>
@@ -38 +38 @@
   <property name="prefix">HOM</property>
  </widget>
+ <widget name="acco_maint_fee" meta_type="String Widget">
+  <property name="title">Maintenance Fee</property>
+  <property name="fields">
+   <element value="acco_maint_fee"/>
+  </property>
+  <property name="label">Maintenance Fee</property>
+  <property name="label_edit">Maintenance Fee</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+   <element value="edit"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget> 
  <widget name="acco_maint_pay_id" meta_type="String Widget">
   <property name="title">Online Payment Id</property>
@@ -131 +147 @@
    <cell name="acco_maint_date"/>
   </row>
+  <row>
+   <cell name="acco_maint_fee"/>
+  </row>  
  </table>
 </object>

WAeUP_SRP/fceokene/waeup_custom/getAccommodationInfo.py

@@ -52 +52 @@
 review_state = info['review_state'] = s_brain.review_state
 
-info['session'] = current_session = context.getSessionId()[0]
+
+info['session'] = session = context.getSessionId()
 
 students_object = context.portal_url.getPortalObject().campus.students
@@ -60 +61 @@
 
 booking_allowed = False
-if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and s_brain.session == current_session:
+if review_state in ('school_fee_paid','courses_registered', 'courses_validated',) and s_brain.session == session[0]:
     booking_allowed = True
 
@@ -72 +73 @@
     info['acco'] = None
     return info
-acco_id = 'accommodation_' + str(current_session)
+acco_id = 'accommodation_' + session[0]
 acco = getattr(student,acco_id,None)
 info['acco'] = acco
@@ -91 +92 @@
     bt = 'pr'
 else:
-    if s_brain.end_level and s_brain.end_level:
-        certlevel = int(certificate.end_level)
-    else:
-        info["error"] = '"no level information provided","%s"' % c_brain.getId
-        return info
-    if s_brain.end_level >= s_brain.end_level:
-        bt = "fi"
+    res = context.portal_catalog(portal_type = "Certificate", id = s_brain.course)
+    if res:
+        c_brain = res[0]
+        certificate = c_brain.getObject().getContent()
+        try:
+            certlevel = int(certificate.end_level)
+        except:
+            info["error"] = '"no end_level for","%s"' % c_brain.getId
+            return info
+        try:
+            studentlevel = int(s_brain.level)
+        except:
+            info["error"] = '"no level for","%s"' % s_brain.getId
+            return info
+        if studentlevel >= certlevel:
+            bt = "fi"
 d['sex'] = 'male'
 if s_brain.sex:

WAeUP_SRP/fceokene/waeup_custom/getSchoolFee.py

@@ -40 +40 @@
 next_info = context.getNextInfo(brain)
 next_session_str = next_info['next_session_str']
+d['next_session_id'] = next_info['next_session_id']
 d['description'] = "School Fee for Session %s" % next_session_str
 

WAeUP_SRP/fceokene/waeup_custom/layout_student_acco_view_slip.pt

@@ -8 +8 @@
                               'acco_res_date',
                                  'acco_maint_pay_id', 
+                                 'acco_maint_fee',
                                  'acco_maint_date',
                                  )"

WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py

@@ -61 +61 @@
 info['type'] = 'online'
 info['status'] = 'started'
-info['session_id'] = student_record.session
+info['session_id'] = fee_dict['next_session_id']
 info['item'] = student_record.course
 info['category'] = 'schoolfee'