diff --git a/InvenTree/build/templates/build/allocate.html b/InvenTree/build/templates/build/allocate.html index ce84d86658..6d7017bcf2 100644 --- a/InvenTree/build/templates/build/allocate.html +++ b/InvenTree/build/templates/build/allocate.html @@ -24,6 +24,21 @@ InvenTree | Allocate Parts
+
+
+

Part

+
+
+

Available

+
+
+

Required

+
+
+

Allocated

+
+
+ {% for bom_item in bom_items.all %} {% include "build/allocation_item.html" with item=bom_item build=build collapse_id=bom_item.id %} {% endfor %} diff --git a/InvenTree/build/templates/build/allocation_item.html b/InvenTree/build/templates/build/allocation_item.html index f5af9ef6f4..920012e953 100644 --- a/InvenTree/build/templates/build/allocation_item.html +++ b/InvenTree/build/templates/build/allocation_item.html @@ -3,6 +3,8 @@ {% load static %} {% load inventree_extras %} +{% block collapse_panel_setup %}class='panel part-allocation' id='allocation-panel-{{ item.sub_part.id }}'{% endblock %} + {% block collapse_title %}
@@ -15,21 +17,16 @@ {% endblock %} {% block collapse_heading %} -
- Required: -
-
- {% multiply build.quantity item.quantity %} -
-
- Allocated: -
-
- {% part_allocation_count build item.sub_part %} +
+ {{ item.sub_part.available_stock }}
+ {% multiply build.quantity item.quantity %} +
+
+ {% part_allocation_count build item.sub_part %}
- +
{% endblock %} diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css index bd05faaafe..59e7899891 100644 --- a/InvenTree/static/css/inventree.css +++ b/InvenTree/static/css/inventree.css @@ -14,7 +14,6 @@ color: #ffcc00; } - /* CSS overrides for treeview */ .expand-icon { font-size: 11px; @@ -277,11 +276,12 @@ } .panel-group .panel { - border-radius: 8px; + border-radius: 2px; } .panel-heading { padding: 5px 10px; + background-color: #fafafa; } .float-right { @@ -299,16 +299,22 @@ transform: translate(-50%, -50%); } +.part-allocation { + padding: 3px 10px; + border: 1px solid #ccc; + border-radius: 2px; +} + .part-allocation-pass { - background: #dbf0db; + background-color: #dbf0db; } .part-allocation-underallocated { - background: #f0dbdb; + background-color: #f0dbdb; } .part-allocation-overallocated { - background: #ccf5ff; + background-color: #ccf5ff; } .glyphicon-refresh-animate { diff --git a/InvenTree/templates/collapse.html b/InvenTree/templates/collapse.html index 776c9cee35..5624f34094 100644 --- a/InvenTree/templates/collapse.html +++ b/InvenTree/templates/collapse.html @@ -2,7 +2,7 @@ {% endblock %}
-
+