Changeset 1171

Timestamp:

1 Jan 2007, 22:54:52 (18 years ago)

Author:

Henrik Bettermann

Message:

made login after createReturningStudent work
session_result_view is not yet ready

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (5 diffs)
• profiles/default/vocabularies/searchable_student_states.xml (modified) (2 diffs)
• skins/waeup_custom/logged_in.py (modified) (1 diff)
• skins/waeup_student/createReturningStudent.py (modified) (1 diff)
• skins/waeup_student/createStudentFT.py (deleted)
• skins/waeup_student/getStudentInfo.py (modified) (1 diff)
• skins/waeup_student/personal_view.pt (modified) (1 diff)
• skins/waeup_student/reserve_accommodation.py (modified) (1 diff)
• skins/waeup_student/search_students_form.pt (modified) (1 diff)
• skins/waeup_student/session_results_view.pt (added)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -40 +40 @@
 
 
+
+
 class WAeUPTool(UniqueObject, SimpleItem, ActionProviderBase):
     """WAeUP tool"""
@@ -53 +55 @@
                      + SimpleItem.manage_options
                      )
+                     
+                     
 
     def generateStudentId(self,letter): ###(
@@ -67 +71 @@
 
     security.declareProtected(ModifyPortalContent,'createOne') ###(
-    def createOne(self,student_brain,commit=False): 
+    def createOne(self,student_brain,commit=False):
         students_folder = self.portal_url.getPortalObject().campus.students
         sid = self.waeup_tool.generateStudentId('?')
@@ -141 +145 @@
             student = res[0]
         logger.info('"%s", "creating Datastructure"' % student_id)
+
+        #student should not be allowed to perform this transition
+        #wftool = self.portal_workflow    
+        #wftool.doActionFor(student,'return')     
+
         certcode_org = student.Coursemajorcode
         certcode = makeCertificateCode(certcode_org)
@@ -194 +203 @@
         catd['entry_mode']= da['entry_mode']
         catd['matric_no'] = matric_no
-        catd['jamb_reg_no'] = da['jamb_reg_no'] 
-        catd['name'] = "%(firstname)s %(middlename)s %(lastname)s" % dp  
-        catd['sex'] = dp['sex'] 
-        catd['level'] = level 
+        catd['jamb_reg_no'] = da['jamb_reg_no']
+        catd['name'] = "%(firstname)s %(middlename)s %(lastname)s" % dp
+        catd['sex'] = dp['sex']
+        catd['level'] = level
         if certificate_brain:
             cpath = certificate_brain.getPath().split('/')
-            catd['faculty'] = cpath[-4] 
-            catd['department'] = cpath[-3] 
+            catd['faculty'] = cpath[-4]
+            catd['department'] = cpath[-3]
             catd['course'] = certcode
         self.students_catalog.modifyRecord(**catd)

WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml

@@ -6 +6 @@
  <property name="acl_write_roles">Manager</property>
  <item key="all" msgid="">all states</item>
+ <item key="returning" msgid="">returning</item>
  <item key="student_created" msgid="">data imported</item>
  <item key="application_pin_entered" msgid="">application pin entered</item>
  <item key="admission_applied" msgid="">applied for admission</item>
- <item key="pume_passed" msgid="">pume passed</item>
- <item key="pume_failed" msgid="">pume failed</item>
  <item key="objection_raised" msgid="">objection raised</item>
  <item key="admission_rejected" msgid="">admission rejected</item>
@@ -18 +17 @@
  <item key="clearance_requested" msgid="">clearance requested</item>
  <item key="cleared_and_validated" msgid="">cleared and validated</item>
- <item key="deferred" msgid="">admission deferred</item> 
  <item key="content_addable" msgid="">content addable</item>
- <item key="category_A" msgid="">category A</item>
- <item key="category_B" msgid="">category B</item>
- <item key="category_C" msgid="">category C</item>
- <item key="category_D" msgid="">category D</item>
- <item key="category_E" msgid="">category E</item>
- <item key="category_F" msgid="">category F</item>
  <item key="bed_reserved" msgid="">bed reserved</item>
  <item key="maintenance_fee_paid" msgid="">maintenance fee paid</item>

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -97 +97 @@
         elif s_review_state == "clearance_pin_entered":
             redirect_url = "%s/clearance_edit_form" % student.absolute_url()
+        if s_review_state == "returning":
+            redirect_url = "%s/student_view" % student.absolute_url()
         else:
             redirect_url = "%s/student_index" % student.absolute_url()

WAeUP_SRP/trunk/skins/waeup_student/createReturningStudent.py

@@ -21 +21 @@
 #if str(member) not in ("admin","joachim"):
 #    return "not possible"
-def createOne(student_brain):
-    sid = context.waeup_tool.generateStudentId('?')
-    students_folder.invokeFactory('Student', sid)
-    student = getattr(students_folder,sid)
-    wftool.doActionFor(student,'return')
-    student.manage_setLocalRoles(sid, ['Owner',])
-    jamb_reg_no = student_brain.Entryregno,
-    context.students_catalog.addRecord(id = sid,
-                                       matric_no = matric_no,
-                                       jamb_reg_no = jamb_reg_no,
-                                       sex = student_brain.Sex == "F",
-                                       name = "%s %s %s" % (student_brain.Firstname,
-                                                            student_brain.Middlename,
-                                                            student_brain.Lastname)
-                                    )
-    return sid,jamb_reg_no
+
+
+#defined in WAeUPTool.py
+
+# def createOne(student_brain):
+#     sid = context.waeup_tool.generateStudentId('?')
+#     students_folder.invokeFactory('Student', sid)
+#     student = getattr(students_folder,sid)
+#     wftool.doActionFor(student,'return')
+#     student.manage_setLocalRoles(sid, ['Owner',])
+#     jamb_reg_no = student_brain.Entryregno,
+#     context.students_catalog.addRecord(id = sid,
+#                                        matric_no = matric_no,
+#                                        jamb_reg_no = jamb_reg_no,
+#                                        sex = student_brain.Sex == "F",
+#                                        name = "%s %s %s" % (student_brain.Firstname,
+#                                                             student_brain.Middlename,
+#                                                             student_brain.Lastname)
+#                                     )
+#     return sid,jamb_reg_no
 
 if not matric_no:

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -68 +68 @@
 info['url'] = student.absolute_url()
 info['student_doc'] = student.getContent()
-info['app'] = student.application
-info['app_doc'] = student.application.getContent()
-info['per'] = getattr(student,'personal',None)
-info['sex'] = 'male'
-if info['per'] is not None:
-    info['per_doc'] = student.personal.getContent()
-    if info['per_doc'].sex:
-        info['sex'] = 'female'
-else:
-    if info['app_doc'].jamb_sex == "F":
-        info['sex'] = 'female'
+#info['app'] = student.application
+#info['app_doc'] = student.application.getContent()
+#info['per'] = getattr(student,'personal',None)
+#info['sex'] = 'male'
+#if info['per'] is not None:
+#    info['per_doc'] = student.personal.getContent()
+#    if info['per_doc'].sex:
+#        info['sex'] = 'female'
+#else:
+#    if info['app_doc'].jamb_sex == "F":
+#        info['sex'] = 'female'
 course = getattr(student,'study_course',None)
 if course:

WAeUP_SRP/trunk/skins/waeup_student/personal_view.pt

@@ -16 +16 @@
         <br />
         <span tal:omit-tag=""
-              tal:content="structure python: info['app_doc'].render(proxy=info['per_doc'],
+              tal:content="structure python: info['per_doc'].render(proxy=info['per_doc'],
               layout_mode='view', 
               layout_id='student_personal_fe')" 

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -26 +26 @@
 session = acco_id[-4:]
 mode = 'create'
-if info['review_state'] != 'cleared_and_validated':
+if not info['review_state'] in ('cleared_and_validated',):
     return context.REQUEST.RESPONSE.redirect("%s/no_booking_allowed" % info['student'].absolute_url())
 validate = REQUEST.has_key("cpsdocument_create_button")

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -69 +69 @@
                   <span tal:replace="student/name" />
                 </td>    
-                <td><span tal:replace="student/jamb_reg_no" /></td>    
+                <td><span tal:replace="student/matric_no" /></td>   
+                <td><span tal:replace="student/jamb_reg_no" /></td>
                 <td tal:condition="options/co_view|nothing">
                        <a href="id"