admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-2640-TV-Mode-for-Scheduled-In-Out (pull request #1308)

Browse Source 
IO-2640 Adjust Filters and Sorters for Table

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2024-02-23 21:14:18 +00:00
committed by Dave Richer
parent 93d139f926 3846b7c5fc
commit ebb3a13ff5
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
View File

@@ -22,6 +22,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
const { t } = useTranslation();
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: {},
});
const [isTvModeScheduledIn, setIsTvModeScheduledIn] = useLocalStorage(
"isTvModeScheduledIn",
@@ -205,6 +206,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
})
.sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) => value.includes(record.alt_transport),
render: (text, record) => (
<span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
{record.alt_transport}
@@ -406,12 +408,14 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
})
.sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) => value.includes(record.alt_transport),
},
];
const handleTableChange = (sorter) => {
setState({ ...state, sortedInfo: sorter });
const handleTableChange = (pagination, filters, sorter) => {
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
return (
<Card
title={t("dashboard.titles.scheduledindate", {

16
client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
View File

@@ -22,6 +22,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
const { t } = useTranslation();
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: {},
});
const [isTvModeScheduledOut, setIsTvModeScheduledOut] = useLocalStorage(
"isTvModeScheduledOut",
@@ -152,11 +153,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
</span>
</Link>
) : (
<span
style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}
>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
record.v_model_desc || ""
}`}</span>
<span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>{`${
record.v_model_yr || ""
} ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}</span>
);
},
},
@@ -182,6 +181,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
})
.sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) => value.includes(record.alt_transport),
render: (text, record) => (
<span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
{record.alt_transport}
@@ -209,6 +209,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
})
.sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) => value.includes(record.status),
render: (text, record) => (
<span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
{record.status}
@@ -414,11 +415,12 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
})
.sort((a, b) => alphaSort(a.text, b.text))) ||
[],
onFilter: (value, record) => value.includes(record.alt_transport),
},
];
const handleTableChange = (sorter) => {
setState({ ...state, sortedInfo: sorter });
const handleTableChange = (pagination, filters, sorter) => {
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
return (