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

Merged in release/2022-02-18 (pull request #394)

Browse Source 
Resolve Date Picker Issues.
This commit is contained in:
Patrick Fic
2022-02-15 17:31:05 +00:00
parent 3cd2445098 a3e8f56728
commit 2fc2e0f02e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/production-list-columns/production-list-columns.data.js
View File

@@ -96,7 +96,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
sortOrder:
state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
render: (text, record) => (
<ProductionListDate record={record} field="actual_in" />
<ProductionListDate record={record} field="actual_in" time/>
),
},
{
@@ -114,6 +114,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
record={record}
field="scheduled_completion"
pastIndicator
time
/>
),
},
@@ -165,6 +166,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
record={record}
field="scheduled_delivery"
pastIndicator
time
/>
),
},

7
client/src/components/production-list-columns/production-list-columns.date.component.jsx
View File

@@ -20,9 +20,9 @@ export default function ProductionListDate({
const handleChange = (date) => {
logImEXEvent("product_toggle_date", { field });
if (date.isSame(record[field] && moment(record[field]))) {
return;
}
// if (date.isSame(record[field] && moment(record[field]))) {
// return;
// }
//e.stopPropagation();
updateAlert({
@@ -67,6 +67,7 @@ export default function ProductionListDate({
value={(record[field] && moment(record[field])) || null}
onChange={handleChange}
format="MM/DD/YYYY"
isDateOnly={!time}
/>
{time && (
<TimePicker