Changeset 1366 for WAeUP_SRP/trunk/skins/waeup_academics

Timestamp:

27 Jan 2007, 15:40:19 (18 years ago)

Author:

joachim

Message:

M profiles/default/schemas/certificate_course.xml
make level searchable
M profiles/default/layouts/course.xml
add code to course layout to allow creation
M skins/waeup_default/waeup_edit.py
M skins/waeup_default/waeup_document_create_do.py
M skins/waeup_custom/folder_delete.py
fix that courses_catalog also get updated
M skins/waeup_academics/courses_view.pt
M skins/waeup_academics/getCoursesInfo.py
use courses catalog.

Location:

WAeUP_SRP/trunk/skins/waeup_academics

Files:

• courses_view.pt (modified) (1 diff)
• getCoursesInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_academics/courses_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getCoursesInfo;
-            is_so context/isSectionOfficer;"
-            >
+<metal:html>
   <metal:body use-macro="here/waeup_content_master/macros/master">
-    <metal:block fill-slot="header">
+    <metal:block fill-slot="header"
+                 tal:define="global info context/getCoursesInfo;
+                 global is_so context/isSectionOfficer;"
+                 >
       <a href=""
          tal:attributes="href string:${here/academicsParent}">

WAeUP_SRP/trunk/skins/waeup_academics/getCoursesInfo.py

@@ -12 +12 @@
 return Info about the Faculties
 """
+def cmpsemester(a,b):
+    if a.semester == b.semester:
+        return 0
+    if a.semester > b.semester:
+        return 1
+    return -1
+    
+
+
 request = context.REQUEST
 
@@ -33 +42 @@
 info['dep_id'] = dep_id
 
-res = context.portal_catalog(container_path="%s/courses" % cp)
-items = []
-for sem in ('1','2'):
-    for r in res:
-        row = {}
-        ro = r.getObject()
-        rd = ro.getContent()
-        if rd.semester != sem:
-            continue
-        row['id'] = r.getId
-        row['title'] = rd.Title()
-        row['semester'] = rd.semester
-        row['url'] = ro.absolute_url()
-        row['review_state'] = wf.getInfoFor(ro,'review_state','None')
-        row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
-        items.append(row)
-info['courses'] = items
+res = context.courses_catalog(department=dep_id)
+items = [ brain for brain in res]
+items.sort(cmpsemester)
+rows = []
+for r in items:
+    row = {}
+    code = getattr(r,'code',None)
+    if code is None:
+        continue
+    ro = getattr(context,code)
+    row['id'] = code
+    row['title'] = r['title']
+    row['semester'] = r['semester']
+    row['url'] = "%s/%s" % (context.absolute_url(),code)
+    row['review_state'] = wf.getInfoFor(ro,'review_state','None')
+    row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
+    rows.append(row)
+#from Products.zdb import set_trace;set_trace()
+##res = context.portal_catalog(container_path="%s/courses" % cp)
+##items = []
+##for sem in ('1','2'):
+##    for r in res:
+##        row = {}
+##        ro = r.getObject()
+##        rd = ro.getContent()
+##        if rd.semester != sem:
+##            continue
+##        row['id'] = r.getId
+##        row['title'] = rd.Title()
+##        row['semester'] = rd.semester
+##        row['url'] = ro.absolute_url()
+##        row['review_state'] = wf.getInfoFor(ro,'review_state','None')
+##        row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
+##        items.append(row)
+info['courses'] = rows
 return info