Changeset 966 for WAeUP_SRP/trunk/skins

Timestamp:

29 Nov 2006, 14:26:31 (18 years ago)

Author:

joachim

Message:

created new catalog pumeresults for pumeresult checking
modified pume_anon_view and pume_anon_slip to use it.

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• display_pume_result.py (modified) (1 diff)
• display_pume_result.py.org (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/display_pume_result.py)
• getStudentInfo.py (modified) (1 diff)
• pume_anon_slip.pt (modified) (1 diff)
• pume_anon_slip.pt.org (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/pume_anon_slip.pt)
• pume_anon_view.pt (modified) (2 diffs)
• pume_anon_view.pt.org (copied) (copied from WAeUP_SRP/trunk/skins/waeup_student/pume_anon_view.pt)
• search_students.py (modified) (2 diffs)
• search_students_form.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/display_pume_result.py

@@ -44 +44 @@
                                  )
 elif psm == 'valid':
-    url = "%s/campus/students/%s/pume/pume_anon_view" % (context.portal_url(),ds['s_id'])
-    return REQUEST.RESPONSE.redirect(url)
-
-
-return
-
-
+    return context.pume_anon_view(pume=ds['pume'])
+##    url = "%s/campus/students/%s/pume/pume_anon_view" % (context.portal_url(),ds['s_id'])
+##    return REQUEST.RESPONSE.redirect(url)

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -48 +48 @@
 info['app'] = student.application
 info['app_doc'] = student.application.getContent()
-info['per'] = student.personal
-info['per_doc'] = student.personal.getContent()
+info['per'] = getattr(student,'personal',None)
+info['sex'] = 'male'
+if info['per'] is not None:
+    info['per_doc'] = student.personal.getContent()
+    if info['per_doc'].sex:
+        info['sex'] = 'female'
+else:
+    if info['app_doc'].jamb_sex == "F":
+        info['sex'] = 'female'
 course = getattr(student,'study_course',None)
-#
 info['course'] = course
 if course:
     info['course_doc'] = student.study_course.getContent()
-info['sex'] = 'male'
-if info['per_doc'].sex:
-    info['sex'] = 'female'
 #
 acco = getattr(student,'accommodation_2006',None)

WAeUP_SRP/trunk/skins/waeup_student/pume_anon_slip.pt

@@ -1 @@
-<metal:html tal:define="app_doc python: context.aq_parent.application.getContent();
-                        pume_doc python: context.getContent()">
+<metal:html tal:define="pume python:context.portal_pumeresults(jamb_reg_no=request.get('nr'))[0]">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-      <h3>PUME Results of <span tal:content="app_doc/jamb_firstname" />
-                            <span tal:content="app_doc/jamb_lastname" /></h3>
-
-      <br />
-      <span tal:omit-tag=""
-            tal:content="structure python: app_doc.render(proxy=app_doc,
-            layout_mode='view_info', 
-            layout_id='student_application_fe')" 
-            />
-      <span tal:condition="python:1" tal:omit-tag=""
-            tal:content="structure python: pume_doc.render(proxy=pume_doc,
-            layout_mode='view_slip', 
-            layout_id='student_pume_fe')" 
-            />
+        <h3>PUME Results of <span tal:content="pume/name" /></h3>
+                            
+       <br />                            
+       <table>
+        <tr>
+          <th>JAMB Registration Nr</th><td tal:content="pume/jamb_reg_no"></td>
+        </tr>
+        <tr>
+          <th>Name</th><td tal:content="pume/name"></td>
+        </tr>
+        <tr>
+          <th>Score</th><td tal:content="pume/score"></td>
+        </tr>
+        <tr>
+          <th>Status</th><td tal:content="pume/status"></td>
+        </tr>
+        <tr>
+          <th>Course Requested</th><td tal:content="pume/course"></td>
+        </tr>
+      </table>
     </metal:main>
   </metal:body>

WAeUP_SRP/trunk/skins/waeup_student/pume_anon_view.pt

@@ -1 @@
-<metal:html tal:define="app_doc python: context.aq_parent.application.getContent();
-                        pume_doc python: context.getContent()">
+<metal:html tal:define="pume options/pume">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-
-            
         <div style="text-align: right">
-        <a href="" target="slip" tal:attributes="href string:pume_anon_slip"
+        <a href="" target="slip" tal:attributes="href string:pume_anon_slip?nr=${pume/jamb_reg_no}"
             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" />
@@ -13 +10 @@
         </div>
 
-        <h3>PUME Results of <span tal:content="app_doc/jamb_firstname" />
-                            <span tal:content="app_doc/jamb_lastname" /></h3>
+        <h3>PUME Results of <span tal:content="pume/name" /></h3>
                             
        <br />                            
-
-        <span tal:omit-tag=""
-              tal:content="structure python: app_doc.render(proxy=app_doc,
-              layout_mode='view_info', 
-              layout_id='student_application_fe')" 
-              />        
-        <span tal:omit-tag=""
-              tal:content="structure python: pume_doc.render(proxy=pume_doc,
-              layout_mode='view_slip', 
-              layout_id='student_pume_fe')" 
-              />
-
+       <table>
+        <tr>
+          <th>JAMB Registration Nr</th><td tal:content="pume/jamb_reg_no"></td>
+        </tr>
+        <tr>
+          <th>Name</th><td tal:content="pume/name"></td>
+        </tr>
+        <tr>
+          <th>Score</th><td tal:content="pume/score"></td>
+        </tr>
+        <tr>
+          <th>Status</th><td tal:content="pume/status"></td>
+        </tr>
+        <tr>
+          <th>Course Requested</th><td tal:content="pume/course"></td>
+        </tr>
+      </table>
     </metal:main>
   </metal:body>

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -54 +54 @@
         'search_string': ''
         }
-
+#from Products.zdb import set_trace
+#set_trace()
 rend,psm,ds = lt.renderLayout(layout_id= 'student_search',
                       schema_id= 'student_search',
@@ -70 +71 @@
                              allowed = True,
                              )
+#set_trace()
 what = ds.get('search_mode')
 state = ds.get('review_state')

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -58 +58 @@
                        tal:content="student/id"></a></td>    
                 <td>
-                  <span tal:replace="python: student['per_doc'].firstname" />
-                  <span tal:replace="python: student['per_doc'].middlename" />
-                  <span tal:replace="python: student['per_doc'].lastname" />
+                  <span tal:replace="student/name" />
                 </td>    
                 <td><span tal:replace="python: student['app_doc'].jamb_reg_no" /></td>    
@@ -69 +67 @@
                           onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')"
                           >[change state]</a></td>
-                       
-                       
-                       
-                       
                 <td tal:condition="not: options/co_view|nothing"><span tal:replace="student/review_state" /></td>   
               </tr>