Changeset 2670 for WAeUP_SRP/base

Timestamp:

15 Nov 2007, 22:07:14 (17 years ago)

Author:

Henrik Bettermann

Message:

further modifications for session change

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (3 diffs)
• skins/waeup_epayment/dumpSCPayments.py (modified) (4 diffs)
• skins/waeup_layout/layout_clearance_edit.pt (modified) (1 diff)
• skins/waeup_layout/layout_waeup_edit.pt (modified) (1 diff)
• skins/waeup_student/application_view.pt (modified) (1 diff)
• skins/waeup_student/apply_admission.py (modified) (1 diff)
• skins/waeup_student/apply_admission_form.pt (modified) (1 diff)
• skins/waeup_student/clearance_edit.py (modified) (2 diffs)
• skins/waeup_student/getClearanceInfo.py (modified) (1 diff)

WAeUP_SRP/base/WAeUPTool.py

@@ -760 +760 @@
             sex = 'F'
         da['jamb_sex'] = sex
+        da['jamb_age'] = brain.jamb_age
         #da['app_ac_pin'] = brain.pin
-        #if brain.lga:
-        #    state_lga = brain.lga.split('_')
-        #    da['state_lga'] = state_lga[0]
-        #    da['jamb_lga'] = state_lga[-1]
-        da['state_lga'] = brain.jamb_lga
-        da['jamb_lga'] = brain.jamb_state
+        da['jamb_lga'] = brain.jamb_lga
+        da['jamb_state'] = brain.jamb_state
         da['jamb_score'] = brain.aggregate
         da['app_email'] = brain.email
@@ -781 +778 @@
         da['jamb_lastname'] = brain.lastname
         da['jamb_middlename'] = brain.middlenames   # different field names!
-        da['firstname'] = brain.firstname
+        da['jamb_firstname'] = brain.firstname
         da['screening_application_date'] = brain.application_date
         da['date_of_birth'] = brain.date_of_birth
@@ -818 +815 @@
         dc = {'Title': 'Clearance/Eligibility Record'}
         dc['lga'] = brain.lga
+        dc['birthday'] = brain.date_of_birth
         clearance.getContent().edit(mapping=dc)
         #self.portal_workflow.doActionFor(clearance,'close',dest_container=clearance)

WAeUP_SRP/base/skins/waeup_epayment/dumpSCPayments.py

@@ -25 +25 @@
 import logging
 import DateTime
-logger = logging.getLogger('Skins.dumpSCPayments.py')
+logger = logging.getLogger('Skins.dumpSCPayments')
 from Products.AdvancedQuery import Eq, Between, Le,In
 aq_pins = context.portal_pins.evalAdvancedQuery
@@ -44 +44 @@
 
 used_query = ~Eq('student','') & ~In('prefix_batch',('APP1','APP2','APP3','APP4','APP5',))
-              
+
 pins = aq_pins(used_query,sortSpecs=('student',))
 #set_trace()
@@ -82 +82 @@
                 #     break
             count += 1
-        student_id = d['student_id'] = pin.student 
+        student_id = d['student_id'] = pin.student
         costs = ["%8.2f" % cost_dict[pin.prefix_batch],]
         pins = [pin.pin,]
@@ -94 +94 @@
 logger.info('%s dumped sc payments to %s' % (member,csv_name))
 logger.info("finished for %d students total N %12.2f %12.2f Euros" % (count,sum_total,sum_total/170))
-    
-    
+
+

WAeUP_SRP/base/skins/waeup_layout/layout_clearance_edit.pt

@@ -40 +40 @@
               <label tal:content="widget/label_edit"
                      tal:attributes="for cell/widget_input_area_id|nothing;">label</label>:
-            </div>
+            
             <button type="button" class="tooltipControl"
                     tal:condition="widget/help"
                     tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
+            </div>        
             </td>
             <td valign="bottom">

WAeUP_SRP/base/skins/waeup_layout/layout_waeup_edit.pt

@@ -56 +56 @@
               tal:content="widget/label_edit"
               tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-          </div>
+          
           <button type="button" class="tooltipControl"
                   tal:condition="widget/help"
                   tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
+          </div>
           <div class="field">
             <div tal:replace="structure cell/widget_rendered"/>

WAeUP_SRP/base/skins/waeup_student/application_view.pt

@@ -7 +7 @@
       <span tal:condition="info">
             
-        <div style="text-align: right" tal:define="review_state info/review_state"
-             tal:condition="python:review_state not in ('created','application_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')">
-            <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-            Application Slip
-        </a>
-        
-          </div>
+
         <a href=""
            tal:attributes="href string:${here/academicsParent}">

WAeUP_SRP/base/skins/waeup_student/apply_admission.py

@@ -68 +68 @@
         if not object['passport']:
                 object['passport'] = ''
-        if object['status'] and ('submitted' in object['status'] or 'admitted' in object['status']):
+        if object['status'] and ('submitted' in object['status'] or 'admitted' in object['status'] or 'created' in object['status']):
             submitted = True
 

WAeUP_SRP/base/skins/waeup_student/apply_admission_form.pt

@@ -73 +73 @@
           <metal:block tal:condition="python:info['status'] == 'created'">
               <br />
-                <strong>You that you have been provisionally admitted into University of Benin. Your member record has been created. 
+                <strong>You have been provisionally admitted into University of Benin. Your member record has been created. 
                         Please purchase a second Application Scratch Card and proceed to 'Check Admission'.</strong>
               <br />  <br />  

WAeUP_SRP/base/skins/waeup_student/clearance_edit.py

@@ -74 +74 @@
     #from Products.zdb import set_trace
     #set_trace()
-    info['clear_doc'].edit(mapping = {'cleared_date': current,})
+    clear_doc.edit(mapping = {'cleared_date': current,})
     wftool.doActionFor(info['student'],'clear_and_validate')
+    
+    if info['per_review_state'] != 'opened':
+        wftool.doActionFor(info['per'],'open')
+    
+    per_doc = info['per'].getContent()
+    per_doc.edit(mapping = {'firstname': clear_doc.firstname, 'middlename': clear_doc.middlename, 'lastname': clear_doc.lastname,})
+    
+    
+    
     psm = "Clearance and eligibility record is validated and student is cleared!"
 elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
@@ -103 +112 @@
             req_found = [scan for scan in required_scans if scan in files]
             birth_found = "age_dec" in files or "birth_certificate" in files
-            if not req_found or not birth_found:
-                logger.info('%s requested clearance with documents missing' % (student_id))
-                psm = "You have not uploaded all necessary documents to request clearance!"
+            #if not req_found or not birth_found:
+            #    logger.info('%s requested clearance with documents missing' % (student_id))
+            #    psm = "You have not uploaded all necessary documents to request clearance!"
+            if not clear_doc.firstname or not clear_doc.lastname:
+                logger.info('%s requested clearance without confirming name' % (student_id))
+                psm = "Please fill the name fields! First and last name are required. "            
             else:
                 logger.info('%s requested clearance' % (student_id))
-                info['clear_doc'].edit(mapping = {'request_date': current,})
+                clear_doc.edit(mapping = {'request_date': current,})
                 wftool.doActionFor(info['clear'],'close')
                 wftool.doActionFor(info['student'],'request_clearance',dest_container=1)

WAeUP_SRP/base/skins/waeup_student/getClearanceInfo.py

@@ -53 +53 @@
 info['clear_doc'] = student.clearance.getContent()
 info['clear_review_state'] = wf.getInfoFor(student.clearance,'review_state',None)
+info['per'] = student.personal
+info['per_review_state'] = wf.getInfoFor(student.personal,'review_state',None)
 if info['review_state'] in ('clearance_requested', 'cleared_and_validated',):
     info['penalty'] = info['penalty'] and\