Updated contract creation to include auto status changes. BOD-314

This commit is contained in:
Patrick Fic
2020-08-28 09:44:55 -07:00
parent 554a8f6170
commit fbde4ddc2a
15 changed files with 328 additions and 226 deletions

View File

@@ -8,7 +8,7 @@ import { DateFormatter } from "../../utils/DateFormatter";
export default function CourtesyCarContractListComponent({ contracts }) {
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" }
filteredInfo: { text: "" },
});
const { t } = useTranslation();
@@ -26,7 +26,7 @@ export default function CourtesyCarContractListComponent({ contracts }) {
<Link to={`/manage/courtesycars/contracts/${record.id}`}>
{record.agreementnumber || ""}
</Link>
)
),
},
{
title: t("jobs.fields.ro_number"),
@@ -40,7 +40,7 @@ export default function CourtesyCarContractListComponent({ contracts }) {
<Link to={`/manage/jobs/${record.job.id}`}>
{record.job.ro_number || ""}
</Link>
)
),
},
{
title: t("contracts.fields.driver"),
@@ -50,7 +50,7 @@ export default function CourtesyCarContractListComponent({ contracts }) {
sortOrder:
state.sortedInfo.columnKey === "driver_ln" && state.sortedInfo.order,
render: (text, record) =>
`${record.driver_fn || ""} ${record.driver_ln || ""}`
`${record.driver_fn || ""} ${record.driver_ln || ""}`,
},
{
title: t("contracts.fields.status"),
@@ -59,7 +59,7 @@ export default function CourtesyCarContractListComponent({ contracts }) {
sorter: (a, b) => alphaSort(a.status, b.status),
sortOrder:
state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
render: (text, record) => t(record.status)
render: (text, record) => t(record.status),
},
{
title: t("contracts.fields.start"),
@@ -68,7 +68,7 @@ export default function CourtesyCarContractListComponent({ contracts }) {
sorter: (a, b) => alphaSort(a.start, b.start),
sortOrder:
state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
render: (text, record) => <DateFormatter>{record.start}</DateFormatter>
render: (text, record) => <DateFormatter>{record.start}</DateFormatter>,
},
{
title: t("contracts.fields.scheduledreturn"),
@@ -80,8 +80,8 @@ export default function CourtesyCarContractListComponent({ contracts }) {
state.sortedInfo.order,
render: (text, record) => (
<DateFormatter>{record.scheduledreturn}</DateFormatter>
)
}
),
},
];
const handleTableChange = (pagination, filters, sorter) => {
@@ -91,7 +91,7 @@ export default function CourtesyCarContractListComponent({ contracts }) {
<Table
size="small"
pagination={{ position: "top" }}
columns={columns.map(item => ({ ...item }))}
columns={columns.map((item) => ({ ...item }))}
rowKey="id"
dataSource={contracts}
onChange={handleTableChange}