Changeset 3804 for WAeUP_SRP/trunk/skins

Timestamp:

8 Dec 2008, 09:26:43 (16 years ago)

Author:

Henrik Bettermann

Message:

• Uniben: add Clearance Officer name to clearance form
• OIS: split academic reports, add house staff name to pastoral report, fix date

Location:

WAeUP_SRP/trunk/skins/waeup_ois

Files:

• academic_report_slip_1.pt (added)
• academic_report_slip_2.pt (added)
• academic_report_slip_3.pt (added)
• academic_report_view.pt (modified) (1 diff)
• getPastoralReportInfo.py (modified) (1 diff)
• pastoral_report_slip.pt (modified) (3 diffs)
• pastoral_report_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt

@@ -25 +25 @@
     <span tal:condition="python:True">  
     <div style="text-align: right" 
-         tal:condition="python:True">
-    <a href="" target="slip" tal:attributes="href string:academic_report_slip"
+         tal:condition="python:True"> 
+    <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" /> Academic Report Slip:
+    <a href="" target="slip" tal:attributes="href string:academic_report_slip_1"
         onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
-        <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-        Academic Report Slip
+        Term 1 /
     </a>
+    <a href="" target="slip" tal:attributes="href string:academic_report_slip_2"
+        onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
+        Term 2 /
+    </a>
+    <a href="" target="slip" tal:attributes="href string:academic_report_slip_3"
+        onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
+        Term 3
+    </a>      
     </div>
     </span>

WAeUP_SRP/trunk/skins/waeup_ois/getPastoralReportInfo.py

@@ -46 +46 @@
 students_object = context.portal_url.getPortalObject().campus.students
 student = getattr(students_object, student_id)
-info['app'] = student.application
-info['app_doc'] = student.application.getContent()
+#info['app'] = student.application
+#info['app_doc'] = student.application.getContent()
 
 return info

WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_slip.pt

@@ -3 +3 @@
               tal:define="info context/getPastoralReportInfo;
               s_name context/getStudentNameInContext;
+              info_base context/getStudentBaseInfo;
               ">
     <span tal:condition="not: info">
@@ -11 +12 @@
             </h3>
       <br />
-      <span tal:omit-tag="" tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],       
-                                                 layout_mode='view_info',       
-                                                 layout_id='student_application')"/>      
+
+
+      <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
+        <tr>
+          <td valign="top" width="180px"><span class="dlabel">Name</span>:
+          </td>
+          <td> 
+            <span tal:content="info_base/student/name" />
+          </td>      
+        </tr>
+        <tr>
+          <td valign="top" width="180px"><span class="dlabel">Sex</span>:
+          </td>
+          <td> 
+            <span tal:content="info_base/student/sex" />
+          </td>      
+        </tr>          
+        <tr valign="top">
+          <td><span class="dlabel">Online Student ID</span>:
+          </td>
+          <td> 
+            <span tal:content="info_base/id" />
+          </td>      
+        </tr>
+        <tr valign="top">
+          <td><span class="dlabel">Registration No</span>:
+          </td>
+          <td> 
+            <span tal:content="info_base/student/matric_no" />
+          </td>      
+        </tr>        
+
+        <tr valign="top">
+          <td><span class="dlabel">Email</span>:
+          </td>
+          <td> 
+            <span tal:content="info_base/student/email" />
+          </td>      
+        </tr>         
+        <tr valign="top">
+          <td><span class="dlabel">Phone</span>:
+          </td>
+          <td> 
+            <span tal:content="info_base/student/phone" />
+          </td>      
+        </tr>         
+        <tr valign="top">
+          <td><span class="dlabel">Current Session</span>:
+          </td>
+          <td> 
+            <span tal:content="python:context.portal_vocabularies.sessions.get(info_base['student']['session'])" />  
+          </td>      
+        </tr>           
+        <tr valign="top">
+          <td><span class="dlabel">Current Level</span>:
+          </td>
+          <td> 
+            <span tal:content="python:context.portal_vocabularies.student_levels.get(info_base['student']['level'])" />  
+          </td>      
+        </tr>             
+      </table>
+
+
+
       <br />
       <span tal:omit-tag=""  
@@ -21 +83 @@
             <table width=100%>
                 <tr > 
-                    <td width=50%>Date:</td><td></td>
+                    <td width="180px">Date:</td><td>12/12/2008</td>
                 </tr>
-            </table>    <br /><br /><br /><br />
+                <tr > 
+                    <td width="180px">Name of House Staff:</td><td><span tal:content="info/doc/house_staff" /></td>
+                </tr>                
+            </table>    <br /><br /><br />
             <table width=100%>
                 <tr > 
-                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Name of House Staff</td> 
-                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Signature</td>
+                    <td width=100% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Staff Signature</td>
                 </tr>
             </table>

WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_view.pt

@@ -56 +56 @@
           <td><span tal:content="info/term" /></td>
         </tr>          
+        <tr>
+          <th>House Staff:</th> 
+          <td><span tal:content="info/doc/house_staff" /></td>
+        </tr>                
       </table>