Changeset 1171 for WAeUP_SRP/trunk/skins/waeup_student

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/skins/waeup_student

Files:

• createReturningStudent.py (modified) (1 diff)
• createStudentFT.py (deleted)
• getStudentInfo.py (modified) (1 diff)
• personal_view.pt (modified) (1 diff)
• reserve_accommodation.py (modified) (1 diff)
• search_students_form.pt (modified) (1 diff)
• session_results_view.pt (added)

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"