Index: WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_1.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_1.pt	(revision 3804)
+++ WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_1.pt	(revision 3804)
@@ -0,0 +1,65 @@
+<metal:body use-macro="here/slip_template/macros/master">
+<metal:main fill-slot="main"    tal:define="info context/getStudyLevelInfo;"    > 
+<span tal:condition="not: info"> 
+    <span tal:content="here/illegal_view" />
+</span> 
+<span tal:condition="info" tal:omit-tag=""> 
+    <span tal:omit-tag=""   tal:define="is_so info/is_so;   
+                                       is_ca info/is_ca;   
+                                       show_check_boxes 
+                                       info/show_check_boxes;   
+                                       is_student info/is_student;   
+                                       validated info/validated;   ">  
+        <h3> <span tal:content="info/session" /> Term One Academic Report (<span tal:content="info/level_str" />)
+            </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')"       />
+        <br /> 
+        <span tal:condition="not:info/data_missing" tal:omit-tag="">
+            <table class="contentListing" id="folder_content" width="100%">
+                <span tal:define="sem python:('1','Term One','normal1')">
+                    <tr tal:condition="python:info[sem[2]]">
+                        <th />
+                        <th align='center'>ATL</th>  
+                        <th align='center'>CA 1 <br />Marks</th>
+                        <th align='center'>CA 2 <br />Marks</th>    
+                        <th align='center'>Exam <br />Marks</th>              
+                        <th align='center'>Overall <br />Marks</th>
+                        <th align='center'>Grade</th>
+                        <th tal:condition="is_so" align='center'>
+                        </th>
+                    </tr>
+                    <tr tal:repeat="row python:info[sem[2]]"       
+                        tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 
+                        <td tal:content="row/title"></td> 
+                        <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
+                        <td align="center" tal:content="row/ca1"></td> 
+                        <td align="center" tal:content="row/ca2"></td> 
+                        <td align="center" tal:content="row/exam"></td> 
+                        <td align="center" tal:content="row/score_calc"></td>
+                        <td align="center" tal:content="row/grade"></td>
+                    </tr>
+                    <tr><td>&nbsp;</td>
+                    </tr>
+                </span>
+            </table>
+        </span>
+
+        <span tal:condition="python:False">      <br /><br />
+            <table width=100%>
+                <tr > 
+                    <td width=50%>Date:</td><td>Date:</td>
+                </tr>
+            </table>    <br /><br /><br /><br />
+            <table width=100%>
+                <tr > 
+                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black"> Student</td> 
+                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Course Adviser</td>
+                </tr>
+            </table>
+        </span>
+    </span>
+</span>
+</metal:main>
+</metal:body>
Index: WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_2.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_2.pt	(revision 3804)
+++ WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_2.pt	(revision 3804)
@@ -0,0 +1,65 @@
+<metal:body use-macro="here/slip_template/macros/master">
+<metal:main fill-slot="main"    tal:define="info context/getStudyLevelInfo;"    > 
+<span tal:condition="not: info"> 
+    <span tal:content="here/illegal_view" />
+</span> 
+<span tal:condition="info" tal:omit-tag=""> 
+    <span tal:omit-tag=""   tal:define="is_so info/is_so;   
+                                       is_ca info/is_ca;   
+                                       show_check_boxes 
+                                       info/show_check_boxes;   
+                                       is_student info/is_student;   
+                                       validated info/validated;   ">  
+        <h3> <span tal:content="info/session" /> Term Two Academic Report (<span tal:content="info/level_str" />)
+            </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')"       />
+        <br /> 
+        <span tal:condition="not:info/data_missing" tal:omit-tag="">
+            <table class="contentListing" id="folder_content" width="100%">
+                <span tal:define="sem python:('2','Term Two','normal2')">
+                    <tr tal:condition="python:info[sem[2]]">
+                        <th />
+                        <th align='center'>ATL</th>  
+                        <th align='center'>CA 1 <br />Marks</th>
+                        <th align='center'>CA 2 <br />Marks</th>    
+                        <th align='center'>Exam <br />Marks</th>              
+                        <th align='center'>Overall <br />Marks</th>
+                        <th align='center'>Grade</th>
+                        <th tal:condition="is_so" align='center'>
+                        </th>
+                    </tr>
+                    <tr tal:repeat="row python:info[sem[2]]"       
+                        tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 
+                        <td tal:content="row/title"></td> 
+                        <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
+                        <td align="center" tal:content="row/ca1"></td> 
+                        <td align="center" tal:content="row/ca2"></td> 
+                        <td align="center" tal:content="row/exam"></td> 
+                        <td align="center" tal:content="row/score_calc"></td>
+                        <td align="center" tal:content="row/grade"></td>
+                    </tr>
+                    <tr><td>&nbsp;</td>
+                    </tr>
+                </span>
+            </table>
+        </span>
+
+        <span tal:condition="python:False">      <br /><br />
+            <table width=100%>
+                <tr > 
+                    <td width=50%>Date:</td><td>Date:</td>
+                </tr>
+            </table>    <br /><br /><br /><br />
+            <table width=100%>
+                <tr > 
+                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black"> Student</td> 
+                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Course Adviser</td>
+                </tr>
+            </table>
+        </span>
+    </span>
+</span>
+</metal:main>
+</metal:body>
Index: WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_3.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_3.pt	(revision 3804)
+++ WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip_3.pt	(revision 3804)
@@ -0,0 +1,65 @@
+<metal:body use-macro="here/slip_template/macros/master">
+<metal:main fill-slot="main"    tal:define="info context/getStudyLevelInfo;"    > 
+<span tal:condition="not: info"> 
+    <span tal:content="here/illegal_view" />
+</span> 
+<span tal:condition="info" tal:omit-tag=""> 
+    <span tal:omit-tag=""   tal:define="is_so info/is_so;   
+                                       is_ca info/is_ca;   
+                                       show_check_boxes 
+                                       info/show_check_boxes;   
+                                       is_student info/is_student;   
+                                       validated info/validated;   ">  
+        <h3> <span tal:content="info/session" /> Term Three Academic Report (<span tal:content="info/level_str" />)
+            </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')"       />
+        <br /> 
+        <span tal:condition="not:info/data_missing" tal:omit-tag="">
+            <table class="contentListing" id="folder_content" width="100%">
+                <span tal:define="sem python:('3','Term Three','normal3')">
+                    <tr tal:condition="python:info[sem[2]]">
+                        <th />
+                        <th align='center'>ATL</th>  
+                        <th align='center'>CA 1 <br />Marks</th>
+                        <th align='center'>CA 2 <br />Marks</th>    
+                        <th align='center'>Exam <br />Marks</th>              
+                        <th align='center'>Overall <br />Marks</th>
+                        <th align='center'>Grade</th>
+                        <th tal:condition="is_so" align='center'>
+                        </th>
+                    </tr>
+                    <tr tal:repeat="row python:info[sem[2]]"       
+                        tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 
+                        <td tal:content="row/title"></td> 
+                        <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
+                        <td align="center" tal:content="row/ca1"></td> 
+                        <td align="center" tal:content="row/ca2"></td> 
+                        <td align="center" tal:content="row/exam"></td> 
+                        <td align="center" tal:content="row/score_calc"></td>
+                        <td align="center" tal:content="row/grade"></td>
+                    </tr>
+                    <tr><td>&nbsp;</td>
+                    </tr>
+                </span>
+            </table>
+        </span>
+
+        <span tal:condition="python:False">      <br /><br />
+            <table width=100%>
+                <tr > 
+                    <td width=50%>Date:</td><td>Date:</td>
+                </tr>
+            </table>    <br /><br /><br /><br />
+            <table width=100%>
+                <tr > 
+                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black"> Student</td> 
+                    <td width=50% style="border-top-style:solid; border-top-width:1px; border-top-color:black">Course Adviser</td>
+                </tr>
+            </table>
+        </span>
+    </span>
+</span>
+</metal:main>
+</metal:body>
Index: WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt	(revision 3791)
+++ WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt	(revision 3804)
@@ -25,10 +25,18 @@
     <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>
Index: WAeUP_SRP/trunk/skins/waeup_ois/getPastoralReportInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/getPastoralReportInfo.py	(revision 3791)
+++ WAeUP_SRP/trunk/skins/waeup_ois/getPastoralReportInfo.py	(revision 3804)
@@ -46,6 +46,6 @@
 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
Index: WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_slip.pt	(revision 3791)
+++ WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_slip.pt	(revision 3804)
@@ -3,4 +3,5 @@
               tal:define="info context/getPastoralReportInfo;
               s_name context/getStudentNameInContext;
+              info_base context/getStudentBaseInfo;
               ">
     <span tal:condition="not: info">
@@ -11,7 +12,68 @@
             </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,11 +83,13 @@
             <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>
Index: WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_view.pt	(revision 3791)
+++ WAeUP_SRP/trunk/skins/waeup_ois/pastoral_report_view.pt	(revision 3804)
@@ -56,4 +56,8 @@
           <td><span tal:content="info/term" /></td>
         </tr>          
+        <tr>
+          <th>House Staff:</th> 
+          <td><span tal:content="info/doc/house_staff" /></td>
+        </tr>                
       </table>           
       
