From 0dc6d9d37e7e9dc706b2cca7d2be8d624a3c1dec Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 30 Mar 2020 15:04:56 +1100 Subject: [PATCH] Improved visual layout --- InvenTree/InvenTree/static/css/inventree.css | 4 ++++ InvenTree/InvenTree/static/script/inventree/part.js | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 3725d79c7b..b4943a9b9a 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -112,6 +112,10 @@ font-size: 100%; } +.label-right { + float: right; +} + /* Bootstrap table overrides */ .stock-sub-group td { diff --git a/InvenTree/InvenTree/static/script/inventree/part.js b/InvenTree/InvenTree/static/script/inventree/part.js index ac2cbdd2e5..f05c5670da 100644 --- a/InvenTree/InvenTree/static/script/inventree/part.js +++ b/InvenTree/InvenTree/static/script/inventree/part.js @@ -182,7 +182,6 @@ function loadPartTable(table, url, options={}) { searchable: false, sortable: true, formatter: function(value, row, index, field) { - var html = ""; var link = "stock"; if (value) { @@ -190,22 +189,20 @@ function loadPartTable(table, url, options={}) { // Is stock "low" (below the 'minimum_stock' quantity)? if (row.minimum_stock && row.minimum_stock > value) { - value = "Low stock : " + row.in_stock + ""; + value += "Low stock"; } - html = value; - } else if (row.on_order) { // There is no stock available, but stock is on order - value = "On Order : " + row.on_order + ""; + value = "0On Order : " + row.on_order + ""; link = "orders"; } else if (row.building) { // There is no stock available, but stock is being built - value = "Building : " + row.building + ""; + value = "0Building : " + row.building + ""; link = "builds"; } else { // There is no stock available - value ="No Stock"; + value = "0No Stock"; } return renderLink(value, '/part/' + row.pk + "/" + link + "/");