From 07f16d889127de08c9509362469c83613d6e30c9 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 9 May 2018 22:02:56 +1000 Subject: [PATCH] Small improvements for build display Working toward build management --- InvenTree/build/templates/build/allocate.html | 41 ++++++++++--------- InvenTree/build/templates/build/detail.html | 39 +++++++++++++----- 2 files changed, 49 insertions(+), 31 deletions(-) diff --git a/InvenTree/build/templates/build/allocate.html b/InvenTree/build/templates/build/allocate.html index 1ed791a8ab..63e15df135 100644 --- a/InvenTree/build/templates/build/allocate.html +++ b/InvenTree/build/templates/build/allocate.html @@ -9,26 +9,27 @@
- - - - - - - - - -{% for item in build.part.bom_items.all %} - - - - - - - - -{% endfor %} - +
PartSourceQuantity
{{ item.sub_part.name }}
Select...
+{% endblock %} + +{% block js_ready %} +{{ block.super }} + + $('#build-table').bootstrapTable({ + sortable: true, + columns: [ + { + title: 'Part', + }, + { + title: 'Source', + }, + { + title: 'Quantity', + } + ] + }); + {% endblock %} \ No newline at end of file diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index d9fd5b3c0f..287c5c1bd5 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -2,7 +2,32 @@ {% load static %} {% block content %} -

Build Details

+ +
+
+

Build Details

+

{{ build.title }}{% include "build_status.html" with build=build %}

+

Building {{ build.quantity }} × {{ build.part.name }}

+
+
+

+
+ +
+

+
+
+ @@ -68,28 +93,20 @@
Title{{ build.title }}
-
- -{% if build.is_active %} - - -{% endif %} -
- {% include 'modals.html' %} {% endblock %} {% block js_ready %} {{ block.super }} - $("#edit-build").click(function () { + $("#build-edit").click(function () { launchModalForm("{% url 'build-edit' build.id %}", { reload: true }); }); - $("#cancel-build").click(function() { + $("#build-cancel").click(function() { launchModalForm("{% url 'build-cancel' build.id %}", { reload: true