Changeset 723 for WAeUP_SRP/trunk/skins

Timestamp:

19 Oct 2006, 17:06:51 (18 years ago)

Author:

joachim

Message:

Import and Manager view for full-time students + results

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getStudentInfo.py (modified) (3 diffs)
• getStudyCourseInfo.py (added)
• getStudyLevelInfo.py (added)
• student_index.py (modified) (1 diff)
• student_view.pt (modified) (1 diff)
• study_course_view.pt (added)
• study_level_view.pt (added)

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -21 +21 @@
 roles = member.getRoles()
 info = {}
-info['is_manager'] = context.isManager
+info['is_manager'] = context.isManager()
 info['is_student'] = context.isStudent()
 member_id = str(member)
@@ -66 +66 @@
               'StudentPersonal': '',
               }
-s_view_links = {'StudentApplication': 'application_view',
-              'StudentAccommodation': 'accommodation_view',
-              'StudentPersonal': 'personal_view',
+s_view_links = {'StudentApplication': None,
+              'StudentAccommodation': None,
+              'StudentPersonal': None,
+              'StudentStudyCourse': 'study_course_view',
               }
 sos = context.portal_catalog(container_path=student_path)
@@ -80 +81 @@
     row['type'] = so.portal_type
     row['is_editable'] = mtool.checkPermission('Modify portal content', soo)
-    sv_link = s_view_links.get(so.portal_type,None)
-    row['s_view_link'] = None
-    if sv_link:
-        row['s_view_link'] = "%s/%s" % (student.absolute_url(),sv_link)
+    sv_link = s_view_links.get(so.portal_type,None) or "academics_document_view"
+    row['s_view_link'] = "%s/%s" % (soo.absolute_url(),sv_link)
     se_link = s_edit_links.get(so.portal_type,None)
     row['s_edit_link'] = None

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -20 +20 @@
     return redirect("%s/srp_anonymous_view" % context.absolute_url())
 if context.isManager():
+    if context.portal_type == 'StudentStudyCourse':
+        return context.study_course_view()
+    elif context.portal_type == 'StudentStudyLevel':
+        return context.study_level_view()
     return redirect("%s/student_view" % context.absolute_url())
 if context.isStudent():

WAeUP_SRP/trunk/skins/waeup_student/student_view.pt

@@ -23 +23 @@
           <tr tal:repeat="row rows"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td><a href="view" tal:attributes="href string:${row/url}/academics_document_view">
+            <td><a href="view" tal:attributes="href string:${row/s_view_link}">
               <strong tal:content="row/title" /></a> </td>
             <td>