Changeset 3814

Timestamp:

12 Dec 2008, 15:23:38 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket Uniben #592

Location:

WAeUP_SRP/trunk

Files:

• profiles/ois/layouts/student_clearance.xml (modified) (1 diff)
• profiles/uniben/layouts/student_clearance.xml (modified) (1 diff)
• profiles/uniben/layouts/student_clearance_fe.xml (modified) (1 diff)
• skins/waeup_layout/layout_clearance_view.pt (modified) (1 diff)
• skins/waeup_student/clearance_edit.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/ois/layouts/student_clearance.xml

@@ -840 +840 @@
   <property name="render_format">radio</property>
  </widget>
+ 
+
+ <widget name="clearance_officer" meta_type="String Widget">
+  <property name="title">Clearance Officer</property>
+  <property name="fields">
+   <element value="clearance_officer"/>
+  </property>
+  <property name="label">Clearance Officer</property>
+  <property name="label_edit">Clearance Officer</property>
+  <property name="readonly_layout_modes">
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>  
+ 
+ 
  <table>
   <row>

WAeUP_SRP/trunk/profiles/uniben/layouts/student_clearance.xml

@@ -971 +971 @@
    <cell name="cleared_date"/>
   </row>  
-  <row>
-   <cell name="clearance_officer"/>
-  </row>
  </table>
 </object>

WAeUP_SRP/trunk/profiles/uniben/layouts/student_clearance_fe.xml

@@ -958 +958 @@
    <cell name="cleared_date"/>
   </row>  
-  <row>
-   <cell name="clearance_officer"/>
-  </row>  
  </table>
 </object>

WAeUP_SRP/trunk/skins/waeup_layout/layout_clearance_view.pt

@@ -44 +44 @@
       </span>
     </span>
+
+    <span  tal:define="mtool here/portal_membership;
+                       co_id context/clearance_officer|nothing;"
+           tal:condition="co_id">
+        <tr tal:define="co_member python:mtool.getMemberById(co_id);">
+          <td>Cleared By:</td>
+          <td><span tal:content="python:co_member.getProperty('fullname',None)" /></td>
+        </tr>
+    </span>
+ 
   </table>
 </metal:block>

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -80 +80 @@
     #from Products.zdb import set_trace
     #set_trace()
-    clear_doc.edit(mapping = {'cleared_date': current,})
+    clear_doc.edit(mapping = {'clearance_officer': member_id,
+                              'cleared_date': current,})
     wftool.doActionFor(info['student'],'clear_and_validate')
-
-
     if clear_doc.firstname and clear_doc.lastname:
         if info['per_review_state'] != 'opened':