Changeset 542 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

24 Sep 2006, 06:03:25 (18 years ago)

Author:

Henrik Bettermann

Message:

index pages reorganized (part 1)

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• application_slip.pt (modified) (1 diff)
• application_view.pt (modified) (1 diff)
• layout_application_print.pt (modified) (1 diff)
• students_anonymous_view.pt (deleted)
• students_index.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/student_index.py) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt

@@ -7 +7 @@
       <span tal:condition="info"
             tal:define="review_state info/review_state">
+        <h3>Post UME Acknowledegement Slip</h3>
+        <br />      
         <span tal:omit-tag=""
               tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],

WAeUP_SRP/trunk/skins/waeup_student/application_view.pt

@@ -7 +7 @@
       <span tal:condition="info"
             tal:define="review_state info/review_state">
-        <h3 tal:content="info/review_state|nothing"></h3>
+        <h3>My Application Record</h3>
+        <br />
         <span tal:omit-tag=""
               tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],

WAeUP_SRP/trunk/skins/waeup_student/layout_application_print.pt

@@ -4 +4 @@
              widgets python:context.getRenderedWidgets(layout);"
              >
-  <h3>Post UME Acknowledegement Slip</h3>
-  <br />
+
   <table cellpadding="10em" cellspacing="">
     <tr>

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -1 @@
-## Script (Python) "cpsdocument_edit"
+## Script (Python) "students_indext"
 ##bind container=container
 ##bind context=context
@@ -10 +10 @@
 # $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
 """
-return the current student_index_html 
+return the current students_index_html
 """
 
 request = context.REQUEST
 redirect = request.RESPONSE.redirect
+pm = context.portal_membership
+
+
+if pm.isAnonymousUser():
+    return redirect("%s/campus_anonymous_view" % context.campus.absolute_url())
+
+
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
-pm = context.portal_membership
-if pm.isAnonymousUser():
-    return redirect("%s/students_anonymous_view" % campus.students.absolute_url())
 member = pm.getAuthenticatedMember()
 roles = member.getRoles()
-if "Manager" in roles or "SectionManager" in roles:
-    return redirect("%s/students_manager_view" % campus.students.absolute_url())
-    
-info = context.getStudentInfo()
-student = info['student']
-doc = info['app_doc']
-state = context.getStudentInfo()['review_state']
-if state == 'admission_applied':
-    return redirect("%s/application_view" % student.absolute_url())
-elif state == 'application_pin_entered':
-    return redirect("%s/passport_entry_view" % student.absolute_url())
+isManager = "Manager" in roles or "SectionManager" in roles
+isStudent = "Student" in roles
+
+if isManager:
+    return redirect("%s/academics_contents" % campus.students.absolute_url())
+if isStudent:
+    info = context.getStudentInfo()
+    student = info['student']
+    doc = info['app_doc']
+    state = context.getStudentInfo()['review_state']
+    if state == 'admission_applied':
+        return redirect("%s/application_view" % student.absolute_url())
+    elif state == 'application_pin_entered':
+        return redirect("%s/passport_entry_view" % student.absolute_url())