Course.item_tree working, sample display code in course_detail.xhtml

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@58 6d9bc8c9-1ec2-4278-b937-99fde70a366f

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 0267c27..cd5cf37 100644 (file)
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -115,16 +115,32 @@ class Course(m.Model):
         return self.code or self.title
 
     def items(self):
-        return Item.objects.filter(course=self.id)
+        return self.item_set.all()
 
     def item_tree(self):
         """
         Return a list, representing a tree of the course items, in
         display order.  Every element of the list is an (Item, [Item])
-        tuple, where the second element is the (optional) list of
-        sub-elements (if a heading) or None (if an item).
+        tuple, where the second element is a list of sub-elements (if
+        a heading) or None (if an item).
         """
-        raise NotImplementedError
+        items = self.items()
+        # make a node-lookup table
+        dct = {}                
+        for item in items:
+            dct.setdefault(item.parent_heading, []).append(item)
+        for lst in dct.values():
+            lst.sort(key=lambda item: item.sort_order) # sort in place
+        # walk the tree
+        out = []
+        def walk(parent, accum):
+            here = dct.get(parent, [])
+            for item in here:
+                sub = []
+                walk(item, sub)
+                accum.append((item, sub))
+        walk(None, out)
+        return out
 
 
 class Member(m.Model):

diff --git a/conifer/templates/course_detail.xhtml b/conifer/templates/course_detail.xhtml
index d5242c3..79c4415 100644 (file)
--- a/conifer/templates/course_detail.xhtml
+++ b/conifer/templates/course_detail.xhtml
@@ -25,9 +25,20 @@ items = course.items()
          <tr py:for="item in items">
            <td><a href="item/${item.id}/">${item.title}</a></td>
            <td>${item.item_type}</td>
+           <td>${item.parent_heading}</td>
          </tr>
        </tbody>
       </table>
+
+      <h2>Show-as-tree test</h2>
+
+      <ol py:def="show_tree(tree)" py:if="tree">
+       <li py:for="item, subs in tree">
+         ${item}
+         ${show_tree(subs)}
+       </li>
+      </ol>
+      ${show_tree(course.item_tree())}
     </div>
   </body>
 </html>