mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-28 03:26:45 +00:00
- Graphs like numbers, not strings, I guess... (cherry picked from commit 0c56a3132ba7a739f2d8401fa472376ae622c7ea) Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
parent
b6ca9ec6a4
commit
453c726d1e
@ -107,18 +107,19 @@ export default function PartStocktakeDetail({
|
||||
return [
|
||||
{
|
||||
accessor: 'quantity',
|
||||
sortable: true,
|
||||
sortable: false,
|
||||
switchable: false
|
||||
},
|
||||
{
|
||||
accessor: 'item_count',
|
||||
title: t`Stock Items`,
|
||||
switchable: true,
|
||||
sortable: true
|
||||
sortable: false
|
||||
},
|
||||
{
|
||||
accessor: 'cost',
|
||||
title: t`Stock Value`,
|
||||
sortable: false,
|
||||
render: (record: any) => {
|
||||
return formatPriceRange(record.cost_min, record.cost_max, {
|
||||
currency: record.cost_min_currency
|
||||
@ -127,10 +128,11 @@ export default function PartStocktakeDetail({
|
||||
},
|
||||
{
|
||||
accessor: 'date',
|
||||
sortable: true
|
||||
sortable: false
|
||||
},
|
||||
{
|
||||
accessor: 'note'
|
||||
accessor: 'note',
|
||||
sortable: false
|
||||
}
|
||||
];
|
||||
}, []);
|
||||
@ -174,17 +176,15 @@ export default function PartStocktakeDetail({
|
||||
return {
|
||||
date: new Date(record.date).valueOf(),
|
||||
quantity: record.quantity,
|
||||
value_min: record.cost_min,
|
||||
value_max: record.cost_max
|
||||
value_min: Number.parseFloat(record.cost_min),
|
||||
value_max: Number.parseFloat(record.cost_max)
|
||||
};
|
||||
}) ?? [];
|
||||
|
||||
// Sort records to ensure correct date order
|
||||
records.sort((a, b) => {
|
||||
return records.sort((a, b) => {
|
||||
return a < b ? -1 : 1;
|
||||
});
|
||||
|
||||
return records;
|
||||
}, [table.records]);
|
||||
|
||||
// Calculate the date limits of the chart
|
||||
@ -216,7 +216,8 @@ export default function PartStocktakeDetail({
|
||||
columns={tableColumns}
|
||||
props={{
|
||||
params: {
|
||||
part: partId
|
||||
part: partId,
|
||||
ordering: 'date'
|
||||
},
|
||||
rowActions: rowActions,
|
||||
tableActions: tableActions
|
||||
@ -241,6 +242,12 @@ export default function PartStocktakeDetail({
|
||||
<ChartTooltip label={label} payload={payload} />
|
||||
)
|
||||
}}
|
||||
yAxisProps={{
|
||||
allowDataOverflow: false
|
||||
}}
|
||||
rightYAxisProps={{
|
||||
allowDataOverflow: false
|
||||
}}
|
||||
xAxisProps={{
|
||||
scale: 'time',
|
||||
type: 'number',
|
||||
|
Loading…
x
Reference in New Issue
Block a user