Changeset 3473 for WAeUP_SRP/base/skins

Timestamp:

29 Apr 2008, 09:24:51 (17 years ago)

Author:

joachim

Message:

remove Title from all StudentObjects?,
adjust templates to use getStudentObjectitles,
remove waeup_academics.getDocumentInfo (was duplicate),
do not use portal_catalog for listing faculties and departments.

Location:

WAeUP_SRP/base/skins

Files:

• waeup_academics/academics_view.pt (modified) (1 diff)
• waeup_academics/courses_view.pt (modified) (1 diff)
• waeup_academics/department_view.pt (modified) (1 diff)
• waeup_academics/faculty_view.pt (modified) (2 diffs)
• waeup_academics/getAcademicsInfo.py (deleted)
• waeup_academics/getCoursesCertificatesInfo.py (modified) (2 diffs)
• waeup_academics/getDepartmentsInfo.py (deleted)
• waeup_academics/getDocumentInfo.py (deleted)
• waeup_academics/getFacultiesInfo.py (deleted)
• waeup_academics/getLevelInfo.py (modified) (2 diffs)
• waeup_default/getDocumentInfo.py (modified) (1 diff)
• waeup_default/getFolderObjectsInfo.py (added)
• waeup_default/waeup_document_view.pt (modified) (2 diffs)
• waeup_documents/getDocumentsInfo.py (modified) (1 diff)
• waeup_student/clearance_view.pt (modified) (1 diff)
• waeup_student/getStudentFolderInfo.py (modified) (2 diffs)
• waeup_student/getStudentObjectTitles.py (added)
• waeup_student/study_course_view.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_academics/academics_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getFacultiesInfo;
-            is_so context/isSectionOfficer;"
+<metal:html tal:define="info context/getFolderObjectsInfo;
+            is_so info/is_sectionofficer;"
             >
   <metal:body use-macro="here/main_template/macros/master">

WAeUP_SRP/base/skins/waeup_academics/courses_view.pt

@@ -10 +10 @@
         Up one level
       </a>
-      <h3 tal:content="here/title_or_id">
-        Page Title
-      </h3>
+      <h3 tal:content="here/aq_parent/LongTitle|here/aq_parent/title_or_id" />
+      <h4 tal:content="here/title_or_id" />
       <div tal:condition="python:0" tal:content="info/container_path"/>
       <div tal:condition="python:0" tal:content="info/dep_id"/>

WAeUP_SRP/base/skins/waeup_academics/department_view.pt

@@ -9 +9 @@
         Up one level
       </a>
-      <h3 tal:content="here/title_or_id" />
-      <div tal:condition="nothing" tal:content="info/container_path"/>
+      <h3 tal:content="info/doc/LongTitle|here/title_or_id" />
       <br />
     </metal:block>

WAeUP_SRP/base/skins/waeup_academics/faculty_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getDepartmentsInfo;
-            is_so context/isSectionOfficer;"
+<metal:html tal:define="info context/getFolderObjectsInfo;
+            is_so info/is_sectionofficer;"
             >
   <metal:body use-macro="here/main_template/macros/master">
@@ -9 +9 @@
         Up one level
       </a>
-      <h3 tal:content="here/title_or_id" />
-      <div tal:condition="python:0" tal:content="info/container_path"/>
+      <h3 tal:content="info/doc/LongTitle|here/title_or_id" />
       <br />
     </metal:block>

WAeUP_SRP/base/skins/waeup_academics/getCoursesCertificatesInfo.py

@@ -10 +10 @@
 # $Id$
 """
-return Info about the Faculties
+return Info about a Department
 """
 request = context.REQUEST
@@ -17 +17 @@
 path_info = request.get('PATH_INFO').split('/')
 
-info = {}
+#info = context.waeup_tool.getAccessInfo(context)
+info = context.certificates.getFolderObjectsInfo()
 info['action'] = "%s/faculty_view" % context.absolute_url()
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
-brain = context.portal_catalog(meta_type="Department", id = context.getId())[-1]
-cp = brain.getPath()
-info['container_path'] = cp
-#res = context.portal_catalog(container_path="%s/courses" % cp)
-#items = []
-#for r in res:
-#    row = {}
-#    ro = r.getObject()
-#    rd = ro.getContent()
-#    row['id'] = r.getId
-#    row['title'] = rd.Title()
-#    row['url'] = ro.absolute_url()
-#    items.append(row)
-#info['courses'] = items
-res = context.portal_catalog(container_path="%s/certificates" % cp)
-items = []
-for r in res:
-    row = {}
-    try:
-        ro = r.getObject()
-        rd = ro.getContent()
-        row['id'] = r.getId
-        row['title'] = rd.Title()
-        row['url'] = ro.absolute_url()
-        items.append(row)
-    except AttributeError:
-        continue
-info['certificates'] = items
+info['certificates'] = info['items']
 return info
 

WAeUP_SRP/base/skins/waeup_academics/getLevelInfo.py

@@ -10 +10 @@
 # $Id$
 """
-return Info about the Faculties
+return Info about the Level
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 request = context.REQUEST
 
@@ -39 +44 @@
 second = []
 combined = []
+set_trace()
 for course_id,course in context.objectItems():
     row = {}

WAeUP_SRP/base/skins/waeup_default/getDocumentInfo.py

@@ -10 +10 @@
 # $Id:getDocumentInfo.py 486 2006-09-06 10:09:39Z joachim $
 """
-return Info about the Faculties
+return Info about a document
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
+
 request = context.REQUEST
 
-wf = context.portal_workflow
-path_info = request.get('PATH_INFO').split('/')
+#wf = context.portal_workflow
+#path_info = request.get('PATH_INFO').split('/')
 
-mtool = context.portal_membership
-if mtool.isAnonymousUser():
+# mtool = context.portal_membership
+# if mtool.isAnonymousUser():
+#     return None
+
+info = context.waeup_tool.getAccessInfo(context)
+#set_trace()
+
+student_id = info['student_id']
+if not info['is_staff'] and student_id is None:
     return None
 
-info = {}
+titles = context.getStudentObjectTitles()
+info['title'] = titles.get(context.portal_type,'') or context.title_or_id
 try:
     info['doc'] = context.getContent()

WAeUP_SRP/base/skins/waeup_default/waeup_document_view.pt

@@ -3 +3 @@
                 tal:define="info context/getDocumentInfo;
                 s_name context/getStudentNameInContext;
-                is_so context/isSectionOfficer;">
+                is_so info/is_sectionofficer;">
 
       <span tal:condition="not: info">
@@ -10 +10 @@
       <span tal:condition="info">
    
-      <a href="" tal:attributes="href string:${here/academicsParent}">
+      <a href="" tal:attributes="href string:${here/aq_parent/absolute_url}">
         <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
         Up one level
       </a>
       
-      <h3 tal:condition="here/title_or_id"> 
+      <h3> 
          <span tal:condition="python:is_so and s_name">
            <span tal:content="s_name" />:
          </span>
-         <span tal:content="here/title_or_id" />
+         <span tal:content="info/title" />
       </h3>
       

WAeUP_SRP/base/skins/waeup_documents/getDocumentsInfo.py

@@ -31 +31 @@
 info['doc'] = context.getContent()
 
+# items = []
+# facs = context.portal_catalog(portal_type='WAeUPDocument')
+# for f in facs:
+#     row = {}
+#     fo = f.getObject()
+#     fd = fo.getContent()
+#     row['id'] = fo.getId()
+#     row['title'] = fd.Title()
+#     row['url'] = fo.absolute_url()
+#     row['is_editable'] = mtool.checkPermission('Modify portal content', fo)
+#     items.append(row)
+# items.sort(cmp_id)
 items = []
-facs = context.portal_catalog(portal_type='WAeUPDocument')
-for f in facs:
+for id, doc in context.objectItems():
     row = {}
-    fo = f.getObject()
-    fd = fo.getContent()
-    row['id'] = fo.getId()
-    row['title'] = fd.Title()
-    row['url'] = fo.absolute_url()
-    row['is_editable'] = mtool.checkPermission('Modify portal content', fo)
+    row['id'] = id
+    row['title'] = doc.getContent().Title()
+    row['url'] = doc.absolute_url()
+    row['is_editable'] = mtool.checkPermission('Modify portal content', doc)
     items.append(row)
-items.sort(cmp_id)
+items.sort(cmp=lambda x,y: cmp(x['id'].lower(), y['id'].lower()))
 info['items'] = items
 return info

WAeUP_SRP/base/skins/waeup_student/clearance_view.pt

@@ -29 +29 @@
           My
         </span>
-        <span tal:content="context/title_or_id" />
+        Clearance/Elegibility Record
       </h3>        
       

WAeUP_SRP/base/skins/waeup_student/getStudentFolderInfo.py

@@ -96 +96 @@
               'PaymentsFolder': 'payments_view',
               }
+s_view_titles = context.getStudentObjectTitles()
 
 student_obj = getattr(students_folder,student_id)
@@ -103 +104 @@
     row = {}
     row['id'] = subobject.getId()
-    row['title'] = subobject.Title()
+    if subobject.portal_type == 'StudentAccommodation':
+        row['title'] = s_view_titles.get(subobject.portal_type,'') %\
+                       context.portal_vocabularies.sessions.get(subobject.getContent().session)
+    else:
+        row['title'] = s_view_titles.get(subobject.portal_type,'')
     url = row['url'] = subobject.absolute_url()
     row['type'] = subobject.portal_type

WAeUP_SRP/base/skins/waeup_student/study_course_view.pt

@@ -17 +17 @@
          <span tal:content="info/student/name" />:
        </span>
-      <span tal:content="here/title_or_id" />
+        Study Course
     </h3>
     <br />