Changeset 770 for WAeUP_SRP/trunk/skins

Timestamp:

29 Oct 2006, 05:24:04 (18 years ago)

Author:

Henrik Bettermann

Message:

passport_entry_view renamed
layouts modified
and more

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (1 diff)
• waeup_default/layout_waeup_lib.pt (modified) (1 diff)
• waeup_default/portlet_waeup_status_display.pt (modified) (1 diff)
• waeup_pins/batch_view.pt (modified) (1 diff)
• waeup_pins/getBatchInfo.py (modified) (1 diff)
• waeup_student/application_edit.pt (added)
• waeup_student/application_view.pt (modified) (1 diff)
• waeup_student/clearance_edit.pt (modified) (1 diff)
• waeup_student/getStudentInfo.py (modified) (3 diffs)
• waeup_student/layout_application_view.pt (modified) (1 diff)
• waeup_student/layout_application_view_info.pt (modified) (1 diff)
• waeup_student/layout_application_view_slip.pt (modified) (1 diff)
• waeup_student/passport_entry_view.pt (deleted)
• waeup_student/pume_view.pt (added)
• waeup_student/student_edit.py (modified) (3 diffs)
• waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -87 +87 @@
     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'])
 

WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_lib.pt

@@ -50 +50 @@
               <tal:block condition="not: widget/label">
               <td>
-                <div valign="top" width=30%> no label </div>
+                <div valign="top"> no label </div>
               </td>
               </tal:block>              

WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

@@ -6 +6 @@
                                         'admission_applied',
                                         'cleared_and_validated',
+                                        'admitted',
+                                        'clearance_pin_entered',
                                         'category_A',
                                         'category_B',

WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

@@ -22 +22 @@
               />
         <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>

WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py

@@ -29 +29 @@
 
 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)

WAeUP_SRP/trunk/skins/waeup_student/application_view.pt

@@ -9 +9 @@
             
         <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')">

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.pt

@@ -16 +16 @@
   <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>

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -68 +68 @@
 else:
     info['clear'] = None
-    
+
 res = context.portal_catalog(container_path=student_path,
                              portal_type='StudentPume')
@@ -77 +77 @@
     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 +109 @@
         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)

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view.pt

@@ -8 +8 @@
                                  'app_ac_pin',
                                  'app_ac_date',
+                                 'app_email',
+                                 'app_mobile',
                                  'jamb_lastname',
                                  'jamb_sex',

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt

@@ -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')"
               >
   

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt

@@ -8 +8 @@
                                  'app_ac_pin',
                                  'app_ac_date',
+                                 'app_email',
+                                 'app_mobile',
                                  'jamb_lastname',
                                  'jamb_sex',

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -41 +41 @@
                                     layout_mode = 'edit',
                                     use_session=True)
-        action = "/passport_entry_view"
+        action = "/application_edit"
         if is_valid:
             if app_doc.passport is not None:
@@ -58 +58 @@
                                     layout_mode = 'edit',
                                     use_session=True)
-        action = "/passport_entry_view"
+        action = "/application_edit"
         if is_valid:
             args = {}
@@ -82 +82 @@
             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"

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -33 +33 @@
         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())