From 2f6d03388d50eb3455d2e66185b3d8ecd9f36c8a Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 18 May 2020 19:15:40 +1000 Subject: [PATCH] Add serializer / table display --- InvenTree/part/serializers.py | 8 +++++++- InvenTree/templates/js/part.html | 32 +++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index 396f19ea58..64cf656f36 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -62,14 +62,20 @@ class PartTestTemplateSerializer(InvenTreeModelSerializer): Serializer for the PartTestTemplate class """ + key = serializers.CharField(read_only=True) + class Meta: model = PartTestTemplate fields = [ 'pk', + 'key', 'part', 'test_name', - 'required' + 'description', + 'required', + 'requires_value', + 'requires_attachment', ] diff --git a/InvenTree/templates/js/part.html b/InvenTree/templates/js/part.html index 528fc9aa93..1a40c7ad84 100644 --- a/InvenTree/templates/js/part.html +++ b/InvenTree/templates/js/part.html @@ -286,6 +286,14 @@ function loadPartTable(table, url, options={}) { }); } +function yesNoLabel(value) { + if (value) { + return `{% trans "YES" %}`; + } else { + return `{% trans "NO" %}`; + } +} + function loadPartTestTemplateTable(table, options) { /* @@ -332,16 +340,30 @@ function loadPartTestTemplateTable(table, options) { title: "{% trans "Test Name" %}", sortable: true, }, + { + field: 'description', + title: "{% trans "Description" %}", + }, { field: 'required', title: "{% trans 'Required' %}", sortable: true, formatter: function(value) { - if (value) { - return `{% trans "YES" %}`; - } else { - return `{% trans "NO" %}`; - } + return yesNoLabel(value); + } + }, + { + field: 'requires_value', + title: "{% trans "Requires Value" %}", + formatter: function(value) { + return yesNoLabel(value); + } + }, + { + field: 'requires_attachment', + title: "{% trans "Requires Attachment" %}", + formatter: function(value) { + return yesNoLabel(value); } }, {