Added helper functions, improved UI

InvenTree/part/models.py

@@ -35,11 +35,9 @@ class PartCategory(InvenTreeTree):
 
         return count
 
-    """
     @property
-    def parts(self):
-        return self.part_set.all()
-    """
+    def has_parts(self):
+        return self.parts.count() > 0
 
 
 @receiver(pre_delete, sender=PartCategory, dispatch_uid='partcategory_delete_log')
@@ -186,16 +184,16 @@ class Part(models.Model):
 
     @property
     def bom_count(self):
-        return self.bom_items.all().count()
+        return self.bom_items.count()
 
     @property
     def used_in_count(self):
-        return self.used_in.all().count()
+        return self.used_in.count()
 
     @property
     def supplier_count(self):
         # Return the number of supplier parts available for this part
-        return self.supplier_parts.all().count()
+        return self.supplier_parts.count()
 
     """
     @property

InvenTree/part/templates/part/category_detail.html

@@ -11,9 +11,15 @@
     <i>{{ category.description }}</i>
 </p>
 
+{% if category.has_children %}
+<h4>Subcategories</h4>
 {% include "part/category_subcategories.html" with children=category.children.all %}
+{% endif %}
 
+{% if category.has_parts %}
+<h4>Parts</h4>
 {% include "part/category_parts.html" with parts=category.parts.all %}
+{% endif %}
 
 <div class='container-fluid'>
 <a href="{% url 'category-create' %}?category={{ category.id }}">

InvenTree/part/templates/part/category_parts.html

@@ -1,5 +1,3 @@
-{% if parts|length > 0 %}
-Parts:
 <table class="table table-striped">
     <tr>
         <th>Part</th>
@@ -11,5 +9,4 @@ Parts:
     <td>{{ part.description }}</td>
 </tr>
 {% endfor %}
-</table>
-{% endif %}
+</table>

InvenTree/part/templates/part/category_subcategories.html

@@ -1,5 +1,3 @@
-{% if children|length > 0 %}
-Subcategories:
 <ul class="list-group">
 {% for child in children %}
 <li class="list-group-item">
@@ -10,5 +8,4 @@ Subcategories:
     <span class='badge'>{{ child.partcount }}</span>
 </li>
 {% endfor %}
-</ul>
-{% endif %}
+</ul>

InvenTree/part/templates/part/index.html

@@ -5,9 +5,15 @@
 
 {% include "part/cat_link.html" with category=category %}
 
+{% if children.all|length > 0 %}
+<h4>Part Categories</h4>
 {% include "part/category_subcategories.html" with children=children %}
+{% endif %}
 
+{% if parts.all|length > 0%}
+<h4>Top Level Parts</h4>
 {% include "part/category_parts.html" with parts=parts %}
+{% endif %}
 
 <div class='container-fluid'>
 <a href="{% url 'category-create' %}">