Changeset 766 for WAeUP_SRP/trunk

Timestamp:

27 Oct 2006, 16:35:27 (18 years ago)

Author:

joachim

Message:

added request_clearance

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (3 diffs)
• profiles/default/actionicons.xml (modified) (1 diff)
• profiles/default/actions.xml (modified) (1 diff)
• profiles/default/layouts/student_application_fe.xml (modified) (1 diff)
• profiles/default/layouts/student_clearance_fe.xml (modified) (1 diff)
• profiles/default/workflows/waeup_student_wf/definition.xml (modified) (3 diffs)
• skins/waeup_custom/logged_in.py (modified) (1 diff)
• skins/waeup_student/clearance_pin_form.pt (added)
• skins/waeup_student/clearance_view.pt (added)
• skins/waeup_student/getStudentInfo.py (modified) (1 diff)
• skins/waeup_student/passport_entry_view.pt (modified) (1 diff)
• skins/waeup_student/request_clearance.py (added)
• skins/waeup_student/student_edit.py (modified) (3 diffs)
• skins/waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -310 +310 @@
             student = getattr(self,sid)
             student.manage_setLocalRoles(sid, ['Owner',])
+            student.invokeFactory('StudentClearance','clearance')
+            wftool.doActionFor(student.clearance,'open')
+            dp = {'Title': 'Clearance Data'}
+            student.clearance.manage_setLocalRoles(sid, ['Owner',])
             student.invokeFactory('StudentPume','pume')
             dp = {'Title': 'Pume Data'}
@@ -329 +333 @@
             app = student.application
             app.getContent().edit(mapping=da)
-            #wftool.doActionFor(app,'open',dest_container=app)
             app.manage_setLocalRoles(sid, ['Owner',])
             dp_fields = (
@@ -343 +346 @@
             pume.manage_setLocalRoles(sid, ['Owner',])
             student.getContent().createSubObjects()
+            wftool.doActionFor(student,'admit',dest_container=student)
             if len(no_import) > 1:
                 open("%s/import/%s_not_imported.csv" % (i_home,name),"w").write(

WAeUP_SRP/trunk/profiles/default/actionicons.xml

@@ -241 +241 @@
               title="Apply for PUME" priority="2"
               icon_expr="bell.png"/>
+ <action-icon category="student" action_id="request_clearance"
+              title="Apply for PUME" priority="3"
+              icon_expr="bell.png"/>
  <action-icon category="student" action_id="reserve_accommodation"
               title="Book Hostel" priority="3"

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -138 +138 @@
    <permission>View</permission>
   </action>
+  <action title="Request Clearance" action_id="request_clearance"
+     category="student" condition_expr="not:member"
+     url_expr="string:${portal_url}/request_clearance"
+     visible="True">
+   <permission>View</permission>
+  </action>
   <action title="Book Hostel" action_id="reserve_accommodation"
      category="student" condition_expr="member"

WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml

@@ -36 +36 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="prefix">APP</property>
+  <property name="prefix">CLR</property>
   <property name="reference">jamb_reg_no</property>
   </widget>

WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml

@@ -655 +655 @@
  <table>
   <row>
+   <cell name="clr_ac_pin"/>
+  </row>
+  <row>
+   <cell name="entry_date"/>
+  </row>
+  <row>
+   <cell name="entry_session"/>
+  </row>
+  <row>
+   <cell name="email"/>
+  </row>
+  <row>
+   <cell name="passport"/>
+  </row>
+  <row>
    <cell name="lga"/>
   </row>
   <row>
    <cell name="nationality"/>
+  </row>
+  <row>
+   <cell name="matric_no"/>
+  </row>
+  <row>
+   <cell name="birthday"/>
+  </row>
+  <row>
+   <cell name="birth_certificate"/>
   </row>
  </table>

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml

@@ -28 +28 @@
  </state>
  <state state_id="clearance_pin_entered" title="">
-  <exit-transition transition_id="request_clearence"/>
+  <exit-transition transition_id="request_clearance"/>
+  <permission-map name="Modify portal content"
+                  acquired="True">
+  </permission-map>
  </state>
  <state state_id="cleared_and_validated" title="">
   <exit-transition transition_id="create_content"/>
  </state>
- <state state_id="clearence_requested" title="">
+ <state state_id="clearance_requested" title="">
   <exit-transition transition_id="clear_and_validate"/>
   <exit-transition transition_id="reject_clearance"/>
+  <permission-map name="Modify portal content"
+                  acquired="True">
+  </permission-map>
  </state>
  <state state_id="deferred" title="">
@@ -50 +56 @@
  </state>
  <state state_id="student_created" title="">
+  <exit-transition transition_id="admit"/>
   <exit-transition transition_id="clear_and_validate"/>
   <exit-transition transition_id="create_content"/>
@@ -184 +191 @@
   </guard>
  </transition>
- <transition transition_id="request_clearence" title=""
-             new_state="clearence_requested" trigger="USER"
+ <transition transition_id="request_clearance" title=""
+             new_state="clearance_requested" trigger="USER"
              before_script="" after_script="">
   

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -51 +51 @@
             info = context.getStudentInfo()
             student = info['student']
-            if info['review_state'] == "student_created":
-                student.content_status_modify(workflow_action="enter_application_pin")
+            if info['review_state'] in ("student_created","admitted"):
+                student.content_status_modify(workflow_action="enter_clearance_pin")
                 wftool.doActionFor(info['app'],'open',dest_container=info['app'])
                 da = {}
                 pin = request.get('pin')
+                app_doc = info['app_doc']
                 da['app_ac_pin'] = pin
                 da['app_ac_date'] = current
-                info['app_doc'].edit(mapping = da)
+                app_doc.edit(mapping = da)
+                dc = {}
+                dc['clr_ac_pin'] = pin
+                dc['entry_date'] = current
+                dc['session'] = "%s" % current.year()
+                dc['lga'] = app_doc.jamb_lga
+                info['clear_doc'].edit(mapping = dc)
         elif "Manager" in member.getRoles():
             pass

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -59 +59 @@
 else:
     info['acco'] = None
+res = context.portal_catalog(container_path=student_path,
+                             portal_type='StudentClearance')
+if res:
+    clear = res[0].getObject()
+    info['clear'] = clear
+    info['clear_doc'] = clear.getContent()
+    info['clear_review_state'] = wf.getInfoFor(clear,'review_state',None)
+else:
+    info['clear'] = None
 
 items = []
 s_edit_links = {'StudentApplication': 'student_edit',
               'StudentAccommodation': '',
+              'StudentClearance': '',
               'StudentPersonal': '',
               }
 s_view_links = {'StudentApplication': None,
               'StudentAccommodation': 'accommodation_view',
+              'StudentClearance': None,
               'StudentPersonal': None,
               'StudentApplication': 'application_view',

WAeUP_SRP/trunk/skins/waeup_student/passport_entry_view.pt

@@ -18 +18 @@
       <span tal:condition="info"
             tal:define="review_state info/review_state">
-        <h3>Upload your Passport Picture!</h3>
+        <h3>Upload or Change your Passport Picture!</h3>
         <br />
         <span tal:omit-tag="" tal:replace="structure rendered_main"/>

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -9 +9 @@
 # $Id$
 """
-Called when a document form is posted.
-
-Validates data, then:
-
- - if there's no error, updates the object and redirects to it,
-
- - if there's an error, puts data in session and redirects to edit form.
-
-A form uid is propagated during the redirect to uniquely identify the
-form in the session.
 """
 wftool = context.portal_workflow
 from urllib import urlencode
 from Products.CPSDocument.utils import getFormUidUrlArg
+import DateTime
+current = DateTime.DateTime()
 
 # Until ajax posts directly to its own script...
@@ -38 +30 @@
 app = info['app']
 app_doc = info['app_doc']
+clear = info['clear']
+clear_doc = info['clear_doc']
 state = context.getStudentInfo()['review_state']
 
@@ -77 +71 @@
     else:
         args = {}
-        student.content_status_modify(workflow_action="apply_for_admission")
-        wftool.doActionFor(app,'close',dest_container= app)
-        psm = 'You applied for admission.'
-        action = "/application_view"
+        if info['review_state'] == "student_created":
+            student.content_status_modify(workflow_action="apply_for_admission")
+            wftool.doActionFor(app,'close',dest_container= app)
+            psm = 'You applied for admission.'
+            action = "/application_view"
+        elif info['review_state'] == "clearance_pin_entered":
+            student.content_status_modify(workflow_action="request_clearance")
+            #wftool.doActionFor(info['clear'],'open',dest_container=info['clear'])
+            da = {}
+            pin = REQUEST.get('pin')
+            da['app_ac_pin'] = pin
+            da['app_ac_date'] = current
+            app_doc = info['app_doc']
+            app_doc.edit(mapping = da)
+            dc = {}
+            dc['email'] = app_doc.appl_email
+            dc['mobil'] = app_doc.appl_mobile
+            dc['passport'] = app_doc.passport
+            info['clear_doc'].edit(mapping = dc)
+            wftool.doActionFor(app,'close',dest_container= app)
+            psm = 'You requested clearance.'
+            action = "/clearance_view"
+        else:
+            psm = ''
+            action = "/clearance_view"
+            
 else:
     is_valid, ds = app_doc.validate(request=REQUEST, proxy=context, cluster=cluster,

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -32 +32 @@
     if state == 'admission_applied':
         return redirect("%s/application_view" % student.absolute_url())
-    elif state == 'application_pin_entered':
+    elif state in ('application_pin_entered','clearance_pin_entered'):
         return redirect("%s/passport_entry_view" % student.absolute_url())
+    elif state == 'request_clearance':
+        return redirect("%s/student_view" % info['clear'].absolute_url())
     elif context.portal_type == 'StudentStudyLevel':
         return context.study_level_student_view()
     return redirect("%s/student_view" % student.absolute_url())
-
-