Changeset 785

Timestamp:

6 Nov 2006, 14:22:15 (18 years ago)

Author:

joachim

Message:

check admission added,
several modifications to getStudentInfo,
request_clearance not yet implemented.

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (2 diffs)
• profiles/default/actionicons.xml (modified) (1 diff)
• profiles/default/actions.xml (modified) (1 diff)
• profiles/default/layouts/student_application.xml (modified) (1 diff)
• profiles/default/layouts/student_application_fe.xml (modified) (1 diff)
• profiles/default/schemas/student_application.xml (modified) (1 diff)
• profiles/default/workflows/waeup_student_subobject_wf/definition.xml (modified) (1 diff)
• profiles/default/workflows/waeup_student_wf/definition.xml (modified) (5 diffs)
• skins/waeup_custom/logged_in.py (modified) (1 diff)
• skins/waeup_default/portlet_session_info.pt (modified) (1 diff)
• skins/waeup_student/check_admission.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/request_clearance.py) (4 diffs)
• skins/waeup_student/check_admission_pin_form.pt (added)
• skins/waeup_student/defer_admission.py (added)
• skins/waeup_student/defer_done_view.pt (added)
• skins/waeup_student/defer_view.pt (added)
• skins/waeup_student/finally_rejected_view.pt (added)
• skins/waeup_student/getStudentInfo.py (modified) (2 diffs)
• skins/waeup_student/layout_waeup_view_student_course.pt (added)
• skins/waeup_student/portlet_student_workflow_display.pt (modified) (1 diff)
• skins/waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -295 +295 @@
                 no_import.append(format % jamb)
                 continue
+            cert_id = jamb.get(csv_d['jamb_first_cos']).upper()
+            res = self.portal_catalog({'portal_type': "Certificate",
+                                     'id': cert_id })
+            if len(res) < 1:
+                em = 'No Certificate with ID %s \n' % cert_id
+                logger.info(em)
+                no_import.append(em)
+                no_import.append(format % jamb)
+                continue
+            cert = res[0].getObject()
+            cert_path = res[0].getPath()
+            cert_doc = cert.getContent()
             jamb_name = jamb.get(csv_d['jamb_lastname'])
             jamb_name.replace('>','')
@@ -346 +358 @@
             #wftool.doActionFor(pume,'close')
             pume.manage_setLocalRoles(sid, ['Owner',])
+            #
+            # Study Course
+            #
+            student.invokeFactory('StudentStudyCourse','study_course')
+            study_course = student.study_course
+            dsc = {}
+            from_certificate = ['title',
+                               'max_elect',
+                               'max_pass',
+                               'n_core',
+                               'nr_years',
+                               'probation_credits',
+                               'promotion_credits',
+                               'start_level',
+                              ]
+            for f in from_certificate:
+                dsc[f] = getattr(cert_doc,f)
+            cpl = cert_path.split('/')
+            dsc['faculty'] = cpl[-4]
+            dsc['department'] = cpl[-3]
+            dsc['study_course'] = cert_id
+            dsc['entry_session'] = jamb.get(csv_d['session'])
+            study_course.getContent().edit(mapping=dsc)
             student.getContent().createSubObjects()
             if dp['pume_tot_score']>49:
                 wftool.doActionFor(student,'pume_pass')
+                wftool.doActionFor(student,'admit')
             else:
                 wftool.doActionFor(student,'pume_fail')
+                wftool.doActionFor(student,'finally_reject')
             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="Display PUME Result" priority="2"
               icon_expr="zoom.png"/>
- <action-icon category="student" action_id="request_clearance"
-              title="Apply for PUME" priority="3"
+ <action-icon category="student" action_id="check_admission"
+              title="Check if admitted" priority="3"
               icon_expr="bell.png"/>
  <action-icon category="student" action_id="reserve_accommodation"

WAeUP_SRP/trunk/profiles/default/actions.xml

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

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

@@ -35 +35 @@
  <property name="reference">jamb_reg_no</property>
 </widget>
+<widget name="defer_date" meta_type="DateTime Widget">
+ <property name="title">Defer Date</property>
+ <property name="fields">
+  <element value="defer_date"/>
+ </property>
+ <property name="label">Defer Date</property>
+ <property name="label_edit">Defer Date</property>
+ <property name="readonly_layout_modes">
+  <element value="edit"/>
+ </property>
+ <property name="hidden_layout_modes">
+  <element value="create"/>
+ </property>
+ <property name="hidden_readonly_layout_modes"/>
+ <property name="view_format">iso8601_medium_easy</property>
+</widget>
  <widget name="entry_mode" meta_type="String Widget">
   <property name="title">Mode of Entry</property>

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

@@ -39 +39 @@
   <property name="reference">jamb_reg_no</property>
   </widget>
+<widget name="defer_date" meta_type="DateTime Widget">
+ <property name="title">Defer Date</property>
+ <property name="fields">
+  <element value="defer_date"/>
+ </property>
+ <property name="label">Defer Date</property>
+ <property name="label_edit">Defer Date</property>
+ <property name="readonly_layout_modes">
+  <element value="edit"/>
+ </property>
+ <property name="hidden_layout_modes">
+  <element value="create"/>
+ </property>
+ <property name="hidden_readonly_layout_modes"/>
+ <property name="view_format">iso8601_medium_easy</property>
+</widget>
  <widget name="entry_mode" meta_type="String Widget">
   <property name="title">Mode of Entry</property>

WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml

@@ -6 +6 @@
  <field name="app_mobile" meta_type="CPS String Field"/>
  <field name="entry_mode" meta_type="CPS String Field"/>
- <field name="jamb_age" meta_type="CPS Int Field"/>
+  <field name="defer_date" meta_type="CPS DateTime Field"/>
+  <field name="jamb_age" meta_type="CPS Int Field"/>
  <field name="jamb_first_cos" meta_type="CPS String Field"/>
  <field name="jamb_first_uni" meta_type="CPS String Field"/>

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

@@ -33 +33 @@
   <permission-map name="View" acquired="True">
    <permission-role>Anonymous</permission-role>
+   <permission-role>Owner</permission-role>
   </permission-map>
   <permission-map name="WAeUPModify own content"

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

@@ -17 +17 @@
   <exit-transition transition_id="defer"/>
   <exit-transition transition_id="enter_clearance_pin"/>
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <state state_id="application_pin_entered" title="">
@@ -25 +28 @@
   </permission-map>
   <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
   </permission-map>
  </state>
@@ -35 +39 @@
  <state state_id="cleared_and_validated" title="">
   <exit-transition transition_id="create_content"/>
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <state state_id="clearance_requested" title="">
@@ -45 +52 @@
  <state state_id="deferred" title="">
   <exit-transition transition_id="enter_clearance_pin"/>
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <state state_id="finally_rejected" title="">
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <state state_id="pume_failed" title="">
   <exit-transition transition_id="finally_reject"/>
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <state state_id="pume_passed" title="">
   <exit-transition transition_id="admit"/>
   <exit-transition transition_id="reject_admission"/>
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <state state_id="student_created" title="">
@@ -62 +81 @@
   <exit-transition transition_id="pume_fail"/>
   <exit-transition transition_id="pume_pass"/>  
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+  </permission-map>
  </state>
  <transition transition_id="admit" title=""

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -60 +60 @@
                 da['app_ac_date'] = current
                 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)
+##                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_default/portlet_session_info.pt

@@ -6 +6 @@
   <tal:block condition="context/isStudent">
        <strong> 
-         <span tal:condition="info/is_student" tal:content="python:info['student_doc'].Title()" /> 
+         <span tal:condition="info/is_student|nothing" tal:content="python:info['student_doc'].Title()" /> 
        </strong>
   </tal:block>

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -12 +12 @@
 ti = context.portal_types[type_name]
 REQUEST.set('type_name',type_name)
-
+redirect = REQUEST.RESPONSE.redirect
+wf = context.portal_workflow
 validate = REQUEST.has_key("cpsdocument_create_button")
 
@@ -24 +25 @@
                       ob={},
                       layout_mode='create',
-                      formaction = "request_clearance",
-                      button = "Request Clearance",
+                      formaction = "check_admission",
+                      button = "Check Admission",
                       )
 if psm == 'invalid':
-    return context.clearance_pin_form(rendered = res,
+    return context.check_admission_pin_form(rendered = res,
                                  psm = "Please correct your input.",
                                  #psm = "%s, %s" % (psm,ds),
@@ -36 +37 @@
                                  )
 elif psm == '':
-    return context.clearance_pin_form(rendered = res,
+    return context.check_admission_pin_form(rendered = res,
                                  psm = None,
                                  firstlayout = True,
@@ -44 +45 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
+    student = getattr(context.campus.students, s_id)
+    review_state = wf.getInfoFor(student,'review_state',None)
+    if review_state == "finally_rejected":
+        url = "%s/campus/students/%s/pume/finally_rejected_view" % (context.portal_url(),s_id)
+        return redirect(url)
     pin = str(ds.get('app_ac_pin'))
-    return context.REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=%s&pin=%s"
+    return redirect("%s/logged_in?__ac_name=%s&__ac_password=%s&pin=%s"
           % (context.absolute_url(),s_id,pin.split('-')[2],pin))
 return
-
-

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -28 +28 @@
     if context.isManager() and 'students' in path_info:
         student_id = path_info[path_info.index('students')+1]
+    elif member_id == "Anonymous User":
+        return None
     else:
         student_id = member_id
 else:
     student_id = student.getId()
-res = context.portal_catalog(id = student_id,portal_type='Student')
-if not res:# or len(res) > 1:
+student_path = "/srp/campus/students/%s" % student_id
+student = context.restrictedTraverse(student_path,default=None)
+if student is None or student.portal_type != 'Student':
     return None
-brain = res[-1]
-student = brain.getObject()
-student_path = brain.getPath()
+##res = context.portal_catalog(id = student_id,portal_type='Student')
+##if not res:# or len(res) > 1:
+##    return None
+##brain = res[-1]
+##student = brain.getObject()
 info['review_state'] = wf.getInfoFor(student,'review_state',None)
 info['student'] = student
@@ -47 +52 @@
 info['per'] = student.personal
 info['per_doc'] = student.personal.getContent()
+course = getattr(student,'study_course',None)
+info['course'] = course
+if course:
+    info['course_doc'] = student.study_course.getContent()
 info['sex'] = 'male'
 if info['per_doc'].sex:
     info['sex'] = 'female'
-res = context.portal_catalog(container_path=student_path,
-                             portal_type='StudentAccommodation')
-if res:
-    acco = res[0].getObject()
-    info['acco'] = acco
+##res = context.portal_catalog(container_path=student_path,
+##                             portal_type='StudentAccommodation')
+##if res:
+##    acco = res[0].getObject()
+acco = getattr(student,'accommodation',None)
+if acco.portal_type != "StudentAccomodation":
+    acco = None
+info['acco'] = acco
+if acco is not None:
     info['acco_doc'] = acco.getContent()
     info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
-else:
-    info['acco'] = None
-res = context.portal_catalog(container_path=student_path,
-                             portal_type='StudentClearance')
-if res:
-    clear = res[0].getObject()
-    info['clear'] = clear
+##res = context.portal_catalog(container_path=student_path,
+##                             portal_type='StudentClearance')
+##if res:
+##    clear = res[0].getObject()
+##    info['clear'] = clear
+clear = getattr(student,'clearance',None)
+info['clear'] = clear
+if clear is not None:
     info['clear_doc'] = clear.getContent()
     info['clear_review_state'] = wf.getInfoFor(clear,'review_state',None)
-else:
-    info['clear'] = None
 
-res = context.portal_catalog(container_path=student_path,
-                             portal_type='StudentPume')
-if res:
-    pume = res[0].getObject()
-    info['pume'] = clear
+##res = context.portal_catalog(container_path=student_path,
+##                             portal_type='StudentPume')
+##if res:
+##    pume = res[0].getObject()
+##    info['pume'] = clear
+pume = getattr(student,'pume',None)
+info['pume'] = pume
+if pume is not None:
     info['pume_doc'] = pume.getContent()
     info['pume_review_state'] = wf.getInfoFor(pume,'review_state',None)

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -11 +11 @@
                    
                    
-<table class="registration">
+<table class="registration" tal:condition="info|nothing">
   
   <span tal:condition="python:path('info/review_state')=='application_pin_entered'">

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 in ('application_pin_entered','admitted'):
+    elif state in ('application_pin_entered',):
         return redirect("%s/application_edit" % student.absolute_url())
+    elif state in ('admitted',):
+        return redirect("%s/defer_view" % student.absolute_url())
     elif state == 'clearance_pin_entered':
         return redirect("%s/student_view" % info['clear'].absolute_url())