Index: WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py	(revision 770)
@@ -87,5 +87,7 @@
     member.setProperties(last_login_time=current,login_time=current)
     if info['review_state'] == "application_pin_entered":
-        return response.redirect("%s/passport_entry_view" % student.absolute_url())
+        return response.redirect("%s/application_edit" % student.absolute_url())
+    elif info['review_state'] == "clearance_pin_entered":
+        return response.redirect("%s/clearance_edit" % student.absolute_url())        
     return response.redirect("%s/student_index" % info['url'])
 
Index: WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_lib.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_lib.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_lib.pt	(revision 770)
@@ -50,5 +50,5 @@
               <tal:block condition="not: widget/label">
               <td>
-                <div valign="top" width=30%> no label </div>
+                <div valign="top"> no label </div>
               </td>
               </tal:block>              
Index: WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 770)
@@ -6,4 +6,6 @@
                                         'admission_applied',
                                         'cleared_and_validated',
+                                        'admitted',
+                                        'clearance_pin_entered',
                                         'category_A',
                                         'category_B',
Index: WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt	(revision 770)
@@ -22,15 +22,17 @@
               />
         <br />
+        
         <h3>Unused</h3>
         <table>
           <tr tal:repeat="pin info/unused">
-            <td tal:content="pin/serial" />
+            <td width="50px"> <span tal:content="pin/serial" />: </td>
             <td tal:content="pin/pin" />
           </tr>
         </table>
+        
         <h3>Used</h3>
         <table>
           <tr tal:repeat="pin info/used">
-            <td tal:content="pin/serial" />
+            <td width="50px"> <span tal:content="pin/serial" />: </td>
             <td tal:content="pin/pin" />
             <td>
Index: WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py	(revision 770)
@@ -29,7 +29,8 @@
 
 for item in used:
-    if bd.prefix == "APP":
-        jno = item['student']
-        res = context.portal_catalog(SearchableText=jno,portal_type='StudentApplication')
+    sno = item['student']
+    if len(sno)==10: 
+    #if bd.prefix == "APP":
+        res = context.portal_catalog(SearchableText=sno,portal_type='StudentApplication')
         if len(res) > 0:
             item['student_url'] = "%s/%s" % (context.portal_url(),res[0].relative_path)
Index: WAeUP_SRP/trunk/skins/waeup_student/application_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/application_edit.pt	(revision 770)
+++ WAeUP_SRP/trunk/skins/waeup_student/application_edit.pt	(revision 770)
@@ -0,0 +1,26 @@
+<metal:html tal:define="info context/getStudentInfo;
+            rendered_main python:info['app_doc'].renderEdit(
+                                                        request=request,
+                                                        layout_mode='edit',
+                                                        proxy=info['app'],
+                                                        no_form = True,
+                                                        schema_id = 'student_application',
+                                                        layout_id='student_application_fe',
+            )">
+  <metal:body use-macro="here/main_template/macros/master">
+    <metal:main fill-slot="main">
+      <span tal:condition="not: info">
+        <metal:block use-macro="here/error_not_found/macros/not_found" />
+      </span>
+      <span tal:condition="python: context.portal_type != 'Student'"> 
+        <span tal:define="dummy python: request.RESPONSE.redirect('%s' % info['url'])" />
+      </span>
+      <span tal:condition="info"
+            tal:define="review_state info/review_state">
+        <h3>Upload or Change your Passport Picture!</h3>
+        <br />
+        <span tal:omit-tag="" tal:replace="structure rendered_main"/>
+      </span>
+    </metal:main>
+  </metal:body>
+</metal:html>
Index: WAeUP_SRP/trunk/skins/waeup_student/application_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/application_view.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/application_view.pt	(revision 770)
@@ -9,5 +9,5 @@
             
         <div style="text-align: right"
-             tal:condition="python:review_state=='admission_applied'">
+             tal:condition="python:review_state in ('admission_applied', 'clearance_pin_entered',)">
         <a href="" target="slip" tal:attributes="href string:application_slip"
             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')">
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.pt	(revision 770)
@@ -16,7 +16,5 @@
   <metal:block fill-slot="header">
     <h3>
-      <tal:block condition="python: edition and not metadata"
-        i18n:translate="">Edit <span id="page_title" i18n:name="title"
-        tal:content="here/title_or_id">Page Title</span></tal:block>
+      Edit your Clearance Data!
     </h3>
   </metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py	(revision 770)
@@ -68,5 +68,5 @@
 else:
     info['clear'] = None
-    
+
 res = context.portal_catalog(container_path=student_path,
                              portal_type='StudentPume')
@@ -77,17 +77,16 @@
     info['pume_review_state'] = wf.getInfoFor(pume,'review_state',None)
 else:
-    info['pume'] = None    
+    info['pume'] = None
 
 items = []
-s_edit_links = {'StudentApplication': 'student_edit',
+s_edit_links = {'StudentApplication': 'application_edit',
               'StudentAccommodation': '',
               'StudentClearance': 'clearance_edit',
               'StudentPersonal': '',
               }
-s_view_links = {'StudentApplication': None,
+s_view_links = {'StudentApplication': 'application_view',
               'StudentAccommodation': 'accommodation_view',
               'StudentClearance': 'clearance_view',
               'StudentPersonal': None,
-              'StudentApplication': 'application_view',
               'StudentStudyCourse': 'study_course_view',
               'StudentPume': 'pume_view',
@@ -110,5 +109,5 @@
         row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
     row['review_state'] = so.review_state
-    row['display'] = so.review_state in ('opened','closed',) or\
+    row['display'] = so.review_state in ('opened','closed','public',) or\
                      so.portal_type in ("StudentAccommodation","StudentStudyCourse")
     items.append(row)
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_application_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_application_view.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_application_view.pt	(revision 770)
@@ -8,4 +8,6 @@
                                  'app_ac_pin',
                                  'app_ac_date',
+                                 'app_email',
+                                 'app_mobile',
                                  'jamb_lastname',
                                  'jamb_sex',
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt	(revision 770)
@@ -5,5 +5,5 @@
               dm options/datastructure/getDataModel;
               widgets python:context.getRenderedWidgets(layout);
-              fields python:('jamb_lastname','jamb_sex',)"
+              fields python:('jamb_lastname','jamb_sex','app_email','app_mobile')"
               >
   
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt	(revision 770)
@@ -8,4 +8,6 @@
                                  'app_ac_pin',
                                  'app_ac_date',
+                                 'app_email',
+                                 'app_mobile',
                                  'jamb_lastname',
                                  'jamb_sex',
Index: WAeUP_SRP/trunk/skins/waeup_student/passport_entry_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/passport_entry_view.pt	(revision 769)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<metal:html tal:define="info context/getStudentInfo;
-            rendered_main python:info['app_doc'].renderEdit(
-                                                        request=request,
-                                                        layout_mode='edit',
-                                                        proxy=info['app'],
-                                                        no_form = True,
-                                                        schema_id = 'student_application',
-                                                        layout_id='student_application_fe',
-            )">
-  <metal:body use-macro="here/main_template/macros/master">
-    <metal:main fill-slot="main">
-      <span tal:condition="not: info">
-        <metal:block use-macro="here/error_not_found/macros/not_found" />
-      </span>
-      <span tal:condition="python: context.portal_type != 'Student'"> 
-        <span tal:define="dummy python: request.RESPONSE.redirect('%s' % info['url'])" />
-      </span>
-      <span tal:condition="info"
-            tal:define="review_state info/review_state">
-        <h3>Upload or Change your Passport Picture!</h3>
-        <br />
-        <span tal:omit-tag="" tal:replace="structure rendered_main"/>
-      </span>
-    </metal:main>
-  </metal:body>
-</metal:html>
Index: WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt	(revision 770)
+++ WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt	(revision 770)
@@ -0,0 +1,30 @@
+<metal:html tal:define="info context/getStudentInfo">
+  <metal:body use-macro="here/main_template/macros/master">
+    <metal:main fill-slot="main">
+      <span tal:condition="not: info">
+        <metal:block use-macro="here/error_not_found/macros/not_found" />
+      </span>
+      <span tal:condition="info"
+            tal:define="review_state info/review_state">
+            
+        <div style="text-align: right"
+             tal:condition="python:review_state=='admission_applied'">
+        <a href="" target="slip" tal:attributes="href string:application_slip"
+            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" />
+            Application Slip
+        </a>
+        
+        </div>
+
+        <h3>My PUME Results</h3>
+        <br />
+        <span tal:omit-tag=""
+              tal:content="structure python: info['pume_doc'].render(proxy=info['pume_doc'],
+              layout_mode='view', 
+              layout_id='student_pume')" 
+              />
+      </span>
+    </metal:main>
+  </metal:body>
+</metal:html>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_edit.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_edit.py	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/student_edit.py	(revision 770)
@@ -41,5 +41,5 @@
                                     layout_mode = 'edit',
                                     use_session=True)
-        action = "/passport_entry_view"
+        action = "/application_edit"
         if is_valid:
             if app_doc.passport is not None:
@@ -58,5 +58,5 @@
                                     layout_mode = 'edit',
                                     use_session=True)
-        action = "/passport_entry_view"
+        action = "/application_edit"
         if is_valid:
             args = {}
@@ -82,10 +82,9 @@
             app_doc = info['app_doc']
             dc = {}
-            dc['email'] = app_doc.appl_email
-            dc['mobil'] = app_doc.appl_mobile
+            dc['email'] = app_doc.app_email
             info['clear_doc'].edit(mapping = dc)
             wftool.doActionFor(app,'close',dest_container= app)
             psm = 'You successfully started the clearance process.'
-            action = "/clearance_view"
+            action = "/clearance_edit"
         else:
             action = "/clearance_view"
Index: WAeUP_SRP/trunk/skins/waeup_student/student_index.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_index.py	(revision 769)
+++ WAeUP_SRP/trunk/skins/waeup_student/student_index.py	(revision 770)
@@ -33,5 +33,5 @@
         return redirect("%s/application_view" % student.absolute_url())
     elif state in ('application_pin_entered','admitted'):
-        return redirect("%s/passport_entry_view" % student.absolute_url())
+        return redirect("%s/application_edit" % student.absolute_url())
     elif state == 'clearance_pin_entered':
         return redirect("%s/student_view" % info['clear'].absolute_url())
