Changeset 1104 in main for branches

Timestamp:

05/21/12 10:09:13 (8 years ago)

Author:

pcosquer

Message:

fixes #121

Location:

branches/1.0/openPLM

Files:

• plmapp/tests/views.py (modified) (1 diff)
• plmapp/views/main.py (modified) (3 diffs)
• templates/parts/bom.html (modified) (1 diff)

branches/1.0/openPLM/plmapp/tests/views.py

@@ -1008 +1008 @@
         self.assertEqual(2, len(list(response.context["children"])))
         form = response.context["display_form"]
+
+    def test_children_last_level(self):
+        """
+        Tests the children view, shows only the last level.
+
+        self
+         -> c1
+             -> c4
+                 -> c6
+             -> c5
+         -> c2
+         -> c3
+             -> c7
+             -> c8
+
+        last level: (c4 -> c6), (c1 -> c5), (self -> c2), (c3 -> c7), (c3 -> c8)
+        """
+        child1 = PartController.create("c1", "Part", "a", self.user, self.DATA)
+        ls1 = self.controller.add_child(child1, 10 , 20)
+        child2 = PartController.create("c2", "Part", "a", self.user, self.DATA)
+        ls2 = self.controller.add_child(child2, 10, 21)
+        child3 = PartController.create("c3", "Part", "a", self.user, self.DATA)
+        self.controller.add_child(child3, 10, 22)
+        child4 = PartController.create("c4", "Part", "a", self.user, self.DATA)
+        l14 = child1.add_child(child4, 10, 23)
+        child5 = PartController.create("c5", "Part", "a", self.user, self.DATA)
+        l15 = child1.add_child(child5, 10, 24)
+        child6 = PartController.create("c6", "Part", "a", self.user, self.DATA)
+        l46 = child4.add_child(child6, 10, 25)
+        child7 = PartController.create("c7", "Part", "a", self.user, self.DATA)
+        l37 = child3.add_child(child7, 10, 26)
+        child8 = PartController.create("c8", "Part", "a", self.user, self.DATA)
+        l38 = child3.add_child(child8, 10, 27)
+        response = self.get(self.base_url + "BOM-child/",
+                {"level":"last", "state" : "all"},
+                page="BOM-child")
+        children = response.context["children"]
+        self.assertEqual(5, len(children))
+        self.assertEqual([l46, l15, ls2, l37, l38], [c.link for c in children])
 
     def test_add_child(self):

branches/1.0/openPLM/plmapp/views/main.py

@@ -681 +681 @@
     children = obj.get_children(max_level, date=date, only_official=only_official)
     if level == "last" and children:
-        maximum = max(children, key=attrgetter("level")).level
-        children = (c for c in children if c.level == maximum)
+        previous_level = 0
+        max_children = []
+        for c in children:
+            if max_children and c.level > previous_level:
+                del max_children[-1]
+            max_children.append(c)
+            previous_level = c.level
+        children = max_children
     children = list(children)
     # pcle
@@ -710 +716 @@
                 'decomposition_msg' : decomposition_msg,
                 'decomposable_children' : decomposable_children,
-                "display_form" : display_form, })
+                "display_form" : display_form,
+                'level' : level,
+                })
     return r2r('parts/bom.html', ctx, request)
 
@@ -810 +818 @@
     parents = obj.get_parents(max_level, date=date, only_official=only_official)
     if level == "last" and parents:
-        maximum = max(parents, key=attrgetter("level")).level
-        parents = (c for c in parents if c.level == maximum)
+        previous_level = 0
+        max_parents = []
+        for c in parents:
+            if max_parents and c.level > previous_level:
+                del max_parents[-1]
+            max_parents.append(c)
+            previous_level = c.level
+        parents = max_parents
     ctx.update({'current_page':'parents',
                 'parents' :  parents,

branches/1.0/openPLM/templates/parts/bom.html

@@ -48 +48 @@
 
             <tr class="Content"> 
-                <td class="Content expander open level{{c.level}}" style="padding-left:{{c.level|add:"-1"}}0px;" >
-                {% if forloop.last %}
+                <td class="Content {% if level != "last" %} expander open{% endif%} level{{c.level}}" style="padding-left:{{c.level|add:"-1"}}0px;" >
+                {% if forloop.last or level == "last" %}
                     <span class="not_expander">{{c.level}}</span>
                 {% else %}