Changeset 1169 for WAeUP_SRP/trunk/skins

Timestamp:

1 Jan 2007, 16:38:46 (18 years ago)

Author:

joachim

Message:

display_session_results now asks for jamb_reg_no
set_access_data uses this information
permission mappings for new states in waeup_student_wf added
set_access_data is now called from a form

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• createReturningStudent.py (modified) (3 diffs)
• entry_results_anon_view.pt (modified) (2 diffs)
• session_results_anon_view.pt (modified) (1 diff)
• set_access_data.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/createReturningStudent.py

@@ -8 +8 @@
 ##title=
 ##
-# $Id: createStudentFT.py 1151 2006-12-29 22:05:53Z joachim $
-''' create the Studenbase folder'''
+# $Id: createReturningStudent.py 1151 2006-12-29 22:05:53Z joachim $
+''' create the Studentbase folder'''
 
 
@@ -30 +30 @@
     return "MatricNo %s not found in Returning Table" % matric_no
 student_brain = res[0]
-sid = context.waeup_tool.generateStudentId(student_brain.Firstname[0])
+sid = context.waeup_tool.generateStudentId('?')
 students_folder.invokeFactory('Student', sid)
 logger.info('"%s","Created Student","%s", "%s" ' % (member,sid,matric_no))
 student = getattr(students_folder,sid)
-wftool.doActionFor(student,'clear_and_validate')
+wftool.doActionFor(student,'return')
 student.manage_setLocalRoles(sid, ['Owner',])
+jamb_reg_no = student_brain.Entryregno,
 context.students_catalog.addRecord(id = sid,
                                    matric_no = matric_no,
-                                   jamb_reg_no = student_brain.Entryregno,
+                                   jamb_reg_no = jamb_reg_no,
                                    sex = student_brain.Sex == "F",
                                    name = "%s %s %s" % (student_brain.Firstname,
@@ -44 +45 @@
                                                         student_brain.Lastname)
                                 )
-return "Student MatricNo %s and %s created" % (matric_no,sid)
+return "Student MatricNo %s, StudentId %s Jamb %s created" % (matric_no,sid,jamb_reg_no)
 

WAeUP_SRP/trunk/skins/waeup_student/entry_results_anon_view.pt

@@ -1 @@
-<metal:html tal:define="pume options/pume">
+<metal:html tal:define="pume options/pume;
+                      result_type pume/result_type|string:PU">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
 
-        <span tal:condition="python:pume['result_type']!='DE'">        
+        <span tal:condition="python:result_type =='PU'">        
         <div style="text-align: right">
         <a href="" target="slip" tal:attributes="href string:entry_results_anon_slip?nr=${pume/jamb_reg_no}"
@@ -14 +15 @@
         </span>       
                      
-        <span tal:condition="python:pume['result_type']=='DE'">
+        <span tal:condition="python:result_type == 'DE'">
         <div style="text-align: right">
         <a href="" target="slip" tal:attributes="href string:entry_results_anon_slip?nr=${pume/jamb_reg_no}"

WAeUP_SRP/trunk/skins/waeup_student/session_results_anon_view.pt

@@ -59 +59 @@
       </table>
       <br />
-      <a href="" tal:attributes="href string:${context/absolute_url}/set_access_data?matric_no=${student/matric_no}">
-        Continue to Login! 
-      </a>
+      <form action="" method="post"
+            tal:attributes="action string:${context/portal_url}/set_access_data">
+        <input type="hidden" name="matric_no" tal:attributes="value student/matric_no" />
+        <input type="hidden" name="jamb_reg_no" tal:attributes="value student/Entryregno" />
+        <input type="submit" 
+               class="standalone" 
+               value="Continue to Login!"
+               name="submit" />
+      </form>
     </metal:main>
   </metal:body>

WAeUP_SRP/trunk/skins/waeup_student/set_access_data.py

@@ -42 +42 @@
 elif psm == 'valid':
     pass
-    jamb_reg_no = ds.get('jamb_reg_no')
-    r = context.returning_import(matric_no = matric_no)
-    if r and r[0].Entryregno != jamb_reg_no or not r:
-        psm = "Your Jamb Registration Nr is wrong"
-        return context.set_access_data_form(rendered = res,
-                                 psm = psm,
-                                 firstlayout = True,
-                                 lastlayout = True,
-                                 ds = ds,
-                                 )
+##    jamb_reg_no = ds.get('jamb_reg_no')
+##    r = context.returning_import(matric_no = matric_no)
+##    if r and r[0].Entryregno != jamb_reg_no or not r:
+##        psm = "Your Jamb Registration Nr is wrong"
+##        return context.set_access_data_form(rendered = res,
+##                                 psm = psm,
+##                                 firstlayout = True,
+##                                 lastlayout = True,
+##                                 ds = ds,
+##                                 )
 ## from Products.zdb import set_trace;set_trace()
 password = REQUEST.get('widget__password')
@@ -64 +64 @@
 args['returning'] = '1'
 args['email'] = email
+args['phone_nr'] = ds.get('phone_nr')
 from urllib import urlencode
 url = "%s/logged_in?%s" % (context.absolute_url(),urlencode(args))