From a5c36e2ca8e831e036fc0290e34b1d24de511a17 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sat, 6 Feb 2021 18:07:27 +1100 Subject: [PATCH] Update scheme for inventree test report - Copy across a simpler report which extends the "base" report - This way the InvenTree report version is always up to date! --- .../report/inventree_test_report.html | 117 +----------------- .../report/inventree_test_report_base.html | 116 +++++++++++++++++ 2 files changed, 118 insertions(+), 115 deletions(-) create mode 100644 InvenTree/report/templates/report/inventree_test_report_base.html diff --git a/InvenTree/report/templates/report/inventree_test_report.html b/InvenTree/report/templates/report/inventree_test_report.html index 4c585d531b..4607494f8f 100644 --- a/InvenTree/report/templates/report/inventree_test_report.html +++ b/InvenTree/report/templates/report/inventree_test_report.html @@ -1,116 +1,3 @@ -{% extends "report/inventree_report_base.html" %} +{% extends "report/inventree_test_report_base.html" %} -{% load i18n %} -{% load report %} -{% load inventree_extras %} - -{% block style %} -.test-table { - width: 100%; -} - -{% block bottom_left %} -content: "{{ date.isoformat }}"; -{% endblock %} - -{% block bottom_center %} -content: "InvenTree v{% inventree_version %}"; -{% endblock %} - -{% block top_center %} -content: "{% trans 'Stock Item Test Report' %}"; -{% endblock %} - -.test-row { - padding: 3px; -} - -.test-pass { - color: #5f5; -} - -.test-fail { - color: #F55; -} - -.container { - padding: 5px; - border: 1px solid; -} - -.text-left { - display: inline-block; - width: 50%; -} - -.img-right { - display: inline; - align-content: right; - align-items: right; - width: 50%; -} - -.part-img { - height: 4cm; -} - -{% endblock %} - -{% block page_content %} - -
-
-

- {{ part.full_name }} -

-

{{ part.description }}

-

{{ stock_item.location }}

-

Stock Item ID: {{ stock_item.pk }}

-
-
- -
-

- {% if stock_item.is_serialized %} - {% trans "Serial Number" %}: {{ stock_item.serial }} - {% else %} - {% trans "Quantity" %}: {% decimal stock_item.quantity %} - {% endif %} -

-
-
- -

{% trans "Test Results" %}

- - - - - - - - - - - - - - - - {% for test in result_list %} - - - {% if test.result %} - - {% else %} - - {% endif %} - - - - - {% endfor %} - - -
{% trans "Test" %}{% trans "Result" %}{% trans "Value" %}{% trans "User" %}{% trans "Date" %}

{{ test.test }}{% trans "Pass" %}{% trans "Fail" %}{{ test.value }}{{ test.user.username }}{{ test.date.date.isoformat }}
- -{% endblock %} \ No newline at end of file + diff --git a/InvenTree/report/templates/report/inventree_test_report_base.html b/InvenTree/report/templates/report/inventree_test_report_base.html new file mode 100644 index 0000000000..4c585d531b --- /dev/null +++ b/InvenTree/report/templates/report/inventree_test_report_base.html @@ -0,0 +1,116 @@ +{% extends "report/inventree_report_base.html" %} + +{% load i18n %} +{% load report %} +{% load inventree_extras %} + +{% block style %} +.test-table { + width: 100%; +} + +{% block bottom_left %} +content: "{{ date.isoformat }}"; +{% endblock %} + +{% block bottom_center %} +content: "InvenTree v{% inventree_version %}"; +{% endblock %} + +{% block top_center %} +content: "{% trans 'Stock Item Test Report' %}"; +{% endblock %} + +.test-row { + padding: 3px; +} + +.test-pass { + color: #5f5; +} + +.test-fail { + color: #F55; +} + +.container { + padding: 5px; + border: 1px solid; +} + +.text-left { + display: inline-block; + width: 50%; +} + +.img-right { + display: inline; + align-content: right; + align-items: right; + width: 50%; +} + +.part-img { + height: 4cm; +} + +{% endblock %} + +{% block page_content %} + +
+
+

+ {{ part.full_name }} +

+

{{ part.description }}

+

{{ stock_item.location }}

+

Stock Item ID: {{ stock_item.pk }}

+
+
+ +
+

+ {% if stock_item.is_serialized %} + {% trans "Serial Number" %}: {{ stock_item.serial }} + {% else %} + {% trans "Quantity" %}: {% decimal stock_item.quantity %} + {% endif %} +

+
+
+ +

{% trans "Test Results" %}

+ + + + + + + + + + + + + + + + {% for test in result_list %} + + + {% if test.result %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + + +
{% trans "Test" %}{% trans "Result" %}{% trans "Value" %}{% trans "User" %}{% trans "Date" %}

{{ test.test }}{% trans "Pass" %}{% trans "Fail" %}{{ test.value }}{{ test.user.username }}{{ test.date.date.isoformat }}
+ +{% endblock %} \ No newline at end of file