Merged in feature/IO-2669-Next-Contact-Date-formating (pull request #1337)

IO-2669 Next Contact Formating

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2024-03-13 16:50:00 +00:00
committed by Dave Richer

View File

@@ -1,7 +1,6 @@
import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons"; import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
import { Checkbox, Space, Tooltip } from "antd"; import { Checkbox, Space, Tooltip } from "antd";
import i18n from "i18next"; import i18n from "i18next";
import moment from "moment";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { TimeFormatter } from "../../utils/DateFormatter"; import { TimeFormatter } from "../../utils/DateFormatter";
@@ -190,17 +189,12 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
state.sortedInfo.columnKey === "date_next_contact" && state.sortedInfo.columnKey === "date_next_contact" &&
state.sortedInfo.order, state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
<span <ProductionListDate
style={{ record={record}
color: field="date_next_contact"
record.date_next_contact && pastIndicator
moment(record.date_next_contact).isBefore(moment()) time
? "red" />
: "",
}}
>
<ProductionListDate record={record} field="date_next_contact" time />
</span>
), ),
}, },
{ {