Changeset 511 for WAeUP_SRP/trunk

Timestamp:

13 Sep 2006, 06:47:55 (18 years ago)

Author:

joachim

Message:

pin checking and login for JAMB students

Location:

WAeUP_SRP/trunk

Files:

• PatchCPSWorkflowWorkflowDefinition.py (added)
• Students.py (modified) (6 diffs)
• Widgets.py (modified) (2 diffs)
• __init__.py (modified) (1 diff)
• profiles/default/rolemap.xml (modified) (1 diff)
• skins/waeup_default/process_waeup_login.py (modified) (1 diff)
• skins/waeup_student/apply_admission.py (modified) (1 diff)
• skins/waeup_student/portlet_student_workflow_display.pt (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -22 +22 @@
 MAX_TRANS = 1000
 
-def generateStudentId():
+def generateStudentId(letter):
     import random
     r = random
-    return "%c%d" % (r.choice('ABCDEFGHKLMNPQRSTUVWXY'),r.randint(99999,1000000))
+    if letter not in ('ABCDEFGIHKLMNOPQRSTUVWXY'):
+        letter= r.choice('ABCDEFGHKLMNPQRSTUVWXY')
+    return "%c%d" % (letter,r.randint(99999,1000000))
+    #return "%c%d" % (r.choice('ABCDEFGHKLMNPQRSTUVWXY'),r.randint(99999,1000000))
 
 def getStudentByRegNo(self,reg_no):
@@ -294 +297 @@
         import transaction
         tr_count = 0
-        name = 'SampleJAMBDataII'
+        name = 'SampleJAMBDataII_short'
+        wftool = self.portal_workflow
         no_import = False
         if not no_import:
@@ -317 +321 @@
                 no_import.write('%(REG-NO)s,%(NAME)s,%(SEX)s,%(STATE)s,%(LGA)s,%(ENG-SCORE)s,%(SUBJ1)s,%(SUBJ1-SCORE)s,%(SUBJ2)s,%(SUBJ2-SCORE)s,%(SUBJ3)s,%(SUBJ3-SCORE)s,%(AGGREGATE)s,%(UNIV1)s,%(FACULTY1)s,%(COURSE1)s,%(UNIV2)s,%(FACULTY2)s,%(COURSE2)s\n' % jamb)
                 continue
-            sid = generateStudentId()
+            jamb_name = jamb.get("NAME")
+            names = jamb_name.split()
+            letter = names[-1][0].upper()
+            sid = generateStudentId(letter)
             #self.log('Creating Faculty %(id)s = %(Title)s' % faculty)
             not_created = True
@@ -325 +332 @@
                     not_created = False
                 except BadRequest:
-                    sid = generateStudentId()
+                    sid = generateStudentId(letter)
             logger.info('%(tr_count)s: Creating Student with ID %(sid)s REG-NO %(jamb_reg_no)s ' % vars())
-            s = getattr(self,sid)
-            self.portal_registration.addMember(sid, 
-                                               'uNsEt' ,
-                                               roles=('Member',
-                                                      'Student',))
-            s.invokeFactory('StudentApplication','application')
+            student = getattr(self,sid)
+            student.invokeFactory('StudentApplication','application')
             da = {'Title': 'Application Data'}
-##            s.invokeFactory('StudentPersonal','personal')
-##            sp = s.personal
-##            d = {'Title': 'Personal Data'}
-##            s.invokeFactory('StudentClearance','clearance')
-##            sc = s.clearance
-##            dc = {'Title': 'Clearance Data'}
             da["jamb_reg_no"] = jamb.get("REG-NO")
-            da["jamb_lastname"] = jamb.get("NAME")
-##            d["lastname"] = jamb.get("NAME")
+            da["jamb_lastname"] = jamb_name
             da["jamb_sex"] = jamb.get("SEX")
             da["jamb_state"] = jamb.get("STATE")
@@ -351 +347 @@
             da["jamb_first_uni"] = jamb.get("UNIV1")
             da["jamb_second_uni"] = jamb.get("UNIV2")
-##            s.personal.getContent().edit(mapping=d)
-            s.application.getContent().edit(mapping=da)
-            s.application.getContent().content_status_modify(workflow_action="open")
-            s.application.manage_setLocalRoles(s_id, ['Owner',])
+            app = student.application
+            app_doc = app.getContent()
+            app_doc.edit(mapping=da)
+            wftool.doActionFor(app,'open',dest_container=app)
+            app.manage_setLocalRoles(sid, ['Owner',])
+            student.getContent().createSubObjects()
         return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
     ###)
 
 
+    security.declareProtected(View,"fixOwnership")
+    def fixOwnership(self):
+        """fix Ownership"""
+        for s in self.portal_catalog(meta_type = 'Student'):
+            student = s.getObject()
+            sid = s.getId
+            import pdb;pdb.set_trace()
+            student.application.manage_setLocalRoles(sid, ['Owner',])
+            student.personal.manage_setLocalRoles(sid, ['Owner',])
+            
     security.declareProtected(View,"Title")
     def Title(self):
@@ -393 +401 @@
             return "%s" % (content.jamb_lastname)
         return self.title
+
+    security.declarePrivate('makeStudentMember') ###(
+    def makeStudentMember(self,sid,password='uNsEt'):
+        """make the student a member"""
+        membership = self.portal_membership
+        membership.addMember(sid, 
+                             password ,
+                             roles=('Member',
+                                     'Student',
+                                     'Owner'),
+                             domains='',
+                             properties = None,)
+        member = membership.getMemberById(sid)
+        self.portal_registration.afterAdd(member, sid, password, None)
+        self.manage_setLocalRoles(sid, ['Owner',])
+
+###)
+
+    security.declareProtected(View,'createSubObjects') ###(
+    def createSubObjects(self):
+        """make the student a member"""
+        dp = {'Title': 'Personal Data'}
+        names = self.application.getContent().jamb_lastname.split()
+        if len(names) == 3:
+            dp['firstname'] = names[0].capitalize()
+            dp['middlename'] = names[1].capitalize()
+            dp['lastname'] = names[2].capitalize()
+        elif len(names) == 2:
+            dp['firstname'] = names[0].capitalize()
+            dp['lastname'] = names[1].capitalize()
+        else:
+            dp['lastname'] = app_doc.jamb_lastname
+            dp['sex'] = app_doc.jamb_sex == 'F'
+            dp['lga'] = "%s/%s" % (app_doc.jamb_state,app_doc.jamb_lga )
+        proxy = self.aq_parent
+        proxy.invokeFactory('StudentPersonal','personal')
+        per = proxy.personal
+        per_doc = per.getContent()
+        per.manage_setLocalRoles(self.getId(), ['Owner',])
+        self.portal_workflow.doActionFor(per,'open',dest_container=per)
+        per_doc.edit(mapping = dp)
+        
+###)
 
 InitializeClass(Student)

WAeUP_SRP/trunk/Widgets.py

@@ -316 +316 @@
         pin = "%(p)s%(b)s%(n)s" % vars()
         ref = datastructure[self.reference]
-        import pdb;pdb.set_trace()
+        #import pdb;pdb.set_trace()
         ok = pins.searchAndSetRecord(pin,ref)
         while 1:
@@ -333 +333 @@
                 if ok == 2:
                     break
+                student.getContent().makeStudentMember(s_id,password=pin[4:])
+                #student.getContent().createSubObjects()
             break
         if err:

WAeUP_SRP/trunk/__init__.py

@@ -11 +11 @@
 from Products.CPSCore.interfaces import ICPSSite
 
+import PatchCPSWorkflowWorkflowDefinition
+import PatchCatalogToolXMLAdapter
 # Only for CPS 3.4.1. In 3.4.2 and later this should be fixed.
 import PatchCPSDefaultImportExport
-import PatchCatalogToolXMLAdapter
 
 import Products.WAeUP_SRP.WAeUPPermissions

WAeUP_SRP/trunk/profiles/default/rolemap.xml

@@ -2 +2 @@
 <rolemap>
   <roles>
+    <role name="Staff"/>
     <role name="Student"/>
     <role name="SectionReader"/>

WAeUP_SRP/trunk/skins/waeup_default/process_waeup_login.py

@@ -13 +13 @@
     if "Manager" in member.getRoles():
         return
-return
 member_id = str(member)
 student = getattr(context.students,member_id)
 application = student.application
-student.invokeFactory('StudentPersonal','personal')
-apdoc = application.getContent()
-names = apdoc.jamb_lastname.split()
-dp = {}
-if len(names) == 3:
-    dp['firstname'] = names[0].capitalize()
-    dp['middlename'] = names[1].capitalize()
-    dp['lastname'] = names[2].capitalize()
-elif len(names) == 2:
-    dp['firstname'] = names[0].capitalize()
-    dp['lastname'] = names[1].capitalize()
-else:
-    dp['lastname'] = apdoc.jamb_lastname
-    dp['sex'] = apdoc.jamb_sex == 'F'
-    dp['lga'] = "%s/%s" % (apdoc.jamb_state,apdoc.jamb_lga )
-student.personal.getContent().edit(mapping = dp)
 ##student.content_status_modify(workflow_action="enter_application_pin")
-
 da = {}
-da['app_ac_pin'] = request.get('pin')
+pin = request.get('pin')
+da['app_ac_pin'] = pin
 da['app_ac_date'] = current
-apdoc.edit(mapping = da)
-
+application.getContent().edit(mapping = da)
 return response.redirect("%s/application_form" % student.application.absolute_url())
-
-##ma = getattr(context,member_id)
-##jkw = {'application_sc_pin': sc_pin}
-##jamb = getattr(ma,'JAMB')
-##jamb.getContent().edit(mapping=jkw)
-###pdid = 'personal%s' % member_id
-##pdid = 'PERSONAL'
-##ma.invokeFactory('StudentPersonal', pdid)
-##pd = getattr(ma,pdid)
-##pkw = {}
-##jc = jamb.getContent()
-##pkw['sex'] = getattr(jc,'sex')
-##pkw['firstname'] = getattr(jc,'firstname')
-##pkw['middlename'] = getattr(jc,'middlename')
-##pkw['lastname'] = getattr(jc,'lastname')
-##pkw['aggregate'] = getattr(jc,'aggregate')
-##pkw['faculty'] = getattr(jc,'faculty')
-##pkw['course'] = getattr(jc,'course')
-##pkw['age'] = getattr(jc,'age')
-##pkw['jamb_results'] = getattr(jc,'exam_results')
-##pkw['jamb_aggregate'] = getattr(jc,'aggregate')
-##pkw['jamb_listing_date'] = getattr(jc,'listing_date')
-##pkw['state'] = getattr(jc,'state')
-##
-##pd.getContent().edit(mapping=pkw)
-##context.notifyCPSDocumentCreation(ob=pd)
-##
-##pdid = 'DOCUMENTS'
-##ma.invokeFactory('StudentDocuments', pdid)
-##pd = getattr(ma,pdid)
-##context.notifyCPSDocumentCreation(ob=pd)
-##
-##pdid = 'ELIGIBILITY'
-##ma.invokeFactory('StudentEligibility', pdid)
-##pd = getattr(ma,pdid)
-##pd.getContent().edit(mapping=pkw)
-##context.notifyCPSDocumentCreation(ob=pd)
-##
-###return ma.personal_addon(REQUEST=context.REQUEST)
-

WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py

@@ -45 +45 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
+    pin = str(ds.get('app_ac_pin'))
     return context.REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=%s&pin=%s"
-          % (context.absolute_url(),s_id,'uNsEt',ds.get('app_ac_pin')))
+          % (context.absolute_url(),s_id,pin.split('-')[2],pin))
     
 ##    jamb_id = ds.get('jamb_reg_no')

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -13 +13 @@
 <table class="registration">
   
+  <span tal:condition="python:1">
+    <tr>
+      <td class="active"><a href="apply" 
+                            tal:attributes="href string:${context/absolute_url}/students/apply_admission">
+        Apply for PUME</a></td>
+    </tr>
+  </span>
   <span tal:condition="python:path('info/review_state')=='application_pin_entered'">
   <tr><td class="active">Admission started</td></tr>