From 06678577547e7f89310a5979941583c10a42b014 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 15 Jul 2021 12:04:48 +1000 Subject: [PATCH] Refactor part base display --- InvenTree/part/templates/part/detail.html | 216 +------------------ InvenTree/part/templates/part/part_base.html | 58 +++-- 2 files changed, 47 insertions(+), 227 deletions(-) diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index 8a78eb85a5..ecfddf66c5 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -18,131 +18,6 @@
- - - - - - {% if part.IPN %} - - - - - - {% endif %} - {% if part.revision %} - - - - - - {% endif %} - {% if part.trackable %} - - - - - - {% endif %} - - - - - - {% if part.variant_of %} - - - - - - {% endif %} - {% if part.keywords %} - - - - - - {% endif %} - - - - - - {% if part.link %} - - - - - - {% endif %} - {% if part.default_location %} - - - - - - {% endif %} - {% if part.default_supplier %} - - - - - - {% endif %} - {% if part.units %} - - - - - - {% endif %} - {% if part.minimum_stock > 0 %} - - - - - - {% endif %} - {% if part.default_expiry > 0 %} - - - - - - {% endif %} - - - - - - {% if part.creation_user %} - - - - - - {% endif %} - {% if part.responsible %} - - - - - - {% endif %} - - @@ -171,96 +46,7 @@
{% trans "Part name" %}{{ part.name }}{% include "clip.html"%}
{% trans "IPN" %}{{ part.IPN }}{% include "clip.html"%}
{% trans "Revision" %}{{ part.revision }}{% include "clip.html"%}
{% trans "Latest Serial Number" %} - {% if part.getLatestSerialNumber %} - {{ part.getLatestSerialNumber }}{% include "clip.html"%} - {% else %} - {% trans "No serial numbers recorded" %} - {% endif %} -
{% trans "Description" %}{{ part.description }}{% include "clip.html"%}
{% trans "Variant Of" %}{{ part.variant_of.full_name }}{% include "clip.html"%}
{% trans "Keywords" %}{{ part.keywords }}{% include "clip.html"%}
{% trans "Category" %} - {% if part.category %} - {{ part.category.pathstring }}{% include "clip.html"%} - {% endif %} -
{% trans "External Link" %}{{ part.link }}{% include "clip.html"%}
{% trans "Default Location" %}{{ part.default_location.pathstring }}{% include "clip.html"%}
{% trans "Default Supplier" %} - {{ part.default_supplier.supplier.name }} | {{ part.default_supplier.SKU }} - {% include "clip.html"%}
{% trans "Units" %}{{ part.units }}{% include "clip.html"%}
{% trans "Minimum Stock" %}{{ part.minimum_stock }}
{% trans "Stock Expiry Time" %}{{ part.default_expiry }} {% trans "days" %}
{% trans "Creation Date" %}{{ part.creation_date }}
{% trans "Created By" %}{{ part.creation_user }}
{% trans "Responsible User" %}{{ part.responsible }}
- - - - - - - {% if part.virtual %} - - {% else %} - - {% endif %} - - - - - - {% if part.is_template %} - - {% else %} - - {% endif %} - - - - - - {% if part.assembly %} - - {% else %} - - {% endif %} - - - - - - {% if part.component %} - - {% else %} - - {% endif %} - - - - - - {% if part.trackable %} - - {% else %} - - {% endif %} - - - - - - {% if part.purchaseable %} - - {% else %} - - {% endif %} - - - - - - {% if part.salable %} - - {% else %} - - {% endif %} - - - - - - - {% if part.active %} - - {% else %} - - {% endif %} - -
{% trans "Virtual" %}{% include "slide.html" with state=part.virtual field='virtual' %}{% trans "Part is virtual (not a physical part)" %}{% trans "Part is not a virtual part" %}
{% trans "Template" %}{% include "slide.html" with state=part.is_template field='is_template' %}{% trans "Part is a template part (variants can be made from this part)" %}{% trans "Part is not a template part" %}
{% trans "Assembly" %}{% include "slide.html" with state=part.assembly field='assembly' %}{% trans "Part can be assembled from other parts" %}{% trans "Part cannot be assembled from other parts" %}
{% trans "Component" %}{% include "slide.html" with state=part.component field='component' %}{% trans "Part can be used in assemblies" %}{% trans "Part cannot be used in assemblies" %}
{% trans "Trackable" %}{% include "slide.html" with state=part.trackable field='trackable' %}{% trans "Part stock is tracked by serial number" %}{% trans "Part stock is not tracked by serial number" %}
{% trans "Purchaseable" %}{% include "slide.html" with state=part.purchaseable field='purchaseable' %}{% trans "Part can be purchased from external suppliers" %}{% trans "Part can be purchased from external suppliers" %}
{% trans "Salable" %}{% include "slide.html" with state=part.salable field='salable' %}{% trans "Part can be sold to customers" %}{% trans "Part cannot be sold to customers" %}
- {% if part.active %} - - {% else %} - - {% endif %} - {% trans "Active" %}{% include "slide.html" with state=part.active field='active' disabled=False %}{% trans "Part is active" %}{% trans "Part is not active" %}
+
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 391f6d1d35..2fdcbb278b 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -27,7 +27,34 @@ {% endif %} + {% if part.description %}

{{ part.description }}

+ {% endif %} +

+

+ {% if part.virtual %} + + {% endif %} + {% if part.is_template %} + + {% endif %} + {% if part.assembly %} + + {% endif %} + {% if part.component %} + + {% endif %} + {% if part.trackable %} + + {% endif %} + {% if part.purchaseable %} + + {% endif %} + {% if part.salable %} + + {% endif %} +
+

- {% if part.IPN %} + {% if part.keywords %} - - - + + + {% endif %} {% if part.link %} @@ -112,7 +139,22 @@ {% endif %} + + + + {% if part.trackable and part.getLatestSerialNumber %} + + + + + + {% endif %}
{% trans "IPN" %}{{ part.IPN }}{% trans "Keywords" %}{{ part.keywords }}
{% trans "Creation Date" %} + {{ part.creation_date }} + {% if part.creation_user %} + {{ part.creation_user }} + {% endif %} +
{% trans "Latest Serial Number" %}{{ part.getLatestSerialNumber }}{% include "clip.html"%}
@@ -197,14 +239,6 @@ {% endif %} {% endif %} {% endif %} - {% if part.trackable and part.getLatestSerialNumber %} - - - - {% trans "Latest Serial Number" %} - {{ part.getLatestSerialNumber }}{% include "clip.html"%} - - {% endif %}