mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Test result table tweaks (#7290)
* Update initialData for new build output * Table updates
This commit is contained in:
parent
acdf7f5ec0
commit
8df04cb916
@ -439,7 +439,8 @@ class PartTestTemplateFilter(rest_filters.FilterSet):
|
|||||||
def filter_part(self, queryset, name, part):
|
def filter_part(self, queryset, name, part):
|
||||||
"""Filter by the 'part' field.
|
"""Filter by the 'part' field.
|
||||||
|
|
||||||
Note that for the 'part' field, we also include any parts "above" the specified part.
|
Note: If the 'include_inherited' query parameter is set,
|
||||||
|
we also include any parts "above" the specified part.
|
||||||
"""
|
"""
|
||||||
include_inherited = str2bool(
|
include_inherited = str2bool(
|
||||||
self.request.query_params.get('include_inherited', True)
|
self.request.query_params.get('include_inherited', True)
|
||||||
|
@ -114,7 +114,8 @@ export default function BuildOutputTable({ build }: { build: any }) {
|
|||||||
title: t`Add Build Output`,
|
title: t`Add Build Output`,
|
||||||
fields: buildOutputFields,
|
fields: buildOutputFields,
|
||||||
initialData: {
|
initialData: {
|
||||||
batch_code: build.batch
|
batch_code: build.batch,
|
||||||
|
location: build.destination ?? build.part_detail?.default_location
|
||||||
},
|
},
|
||||||
table: table
|
table: table
|
||||||
});
|
});
|
||||||
|
@ -126,16 +126,14 @@ export default function StockItemTestResultTable({
|
|||||||
switchable: false,
|
switchable: false,
|
||||||
sortable: true,
|
sortable: true,
|
||||||
render: (record: any) => {
|
render: (record: any) => {
|
||||||
let required = record.required ?? record.template_detail?.required;
|
const enabled = record.enabled ?? record.template_detail?.enabled;
|
||||||
let enabled = record.enabled ?? record.template_detail?.enabled;
|
const installed =
|
||||||
let installed =
|
|
||||||
record.stock_item != undefined && record.stock_item != itemId;
|
record.stock_item != undefined && record.stock_item != itemId;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Group justify="space-between">
|
<Group justify="space-between" wrap="nowrap">
|
||||||
<Text
|
<Text
|
||||||
style={{ fontStyle: installed ? 'italic' : undefined }}
|
style={{ fontStyle: installed ? 'italic' : undefined }}
|
||||||
fw={required && 700}
|
|
||||||
c={enabled ? undefined : 'red'}
|
c={enabled ? undefined : 'red'}
|
||||||
>
|
>
|
||||||
{!record.templateId && '- '}
|
{!record.templateId && '- '}
|
||||||
|
Loading…
Reference in New Issue
Block a user