IO-928 IO-932 IO-940 Production List Updates

This commit is contained in:
Patrick Fic
2021-04-26 13:32:16 -07:00
parent cffcd4b19b
commit ccc1a37ebb
3 changed files with 16 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file

View File

@@ -21,7 +21,10 @@ export function JobAltTransportChange({ bodyshop, job }) {
const onClick = async ({ key }) => { const onClick = async ({ key }) => {
const result = await updateJob({ const result = await updateJob({
variables: { jobId: job.id, job: { alt_transport: key } }, variables: {
jobId: job.id,
job: { alt_transport: key === "null" ? null : key },
},
}); });
if (!!!result.errors) { if (!!!result.errors) {
@@ -40,6 +43,8 @@ export function JobAltTransportChange({ bodyshop, job }) {
bodyshop.appt_alt_transport.map((alt) => ( bodyshop.appt_alt_transport.map((alt) => (
<Menu.Item key={alt}>{alt}</Menu.Item> <Menu.Item key={alt}>{alt}</Menu.Item>
))} ))}
<Menu.Divider />
<Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
</Menu> </Menu>
); );
return ( return (

View File

@@ -2,9 +2,9 @@ import i18n from "i18next";
import React from "react"; import React from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { DateFormatter } from "../../utils/DateFormatter";
import PhoneFormatter from "../../utils/PhoneFormatter"; import PhoneFormatter from "../../utils/PhoneFormatter";
import { alphaSort, dateSort } from "../../utils/sorters"; import { alphaSort, dateSort } from "../../utils/sorters";
import JobAltTransportChange from "../job-at-change/job-at-change.component";
import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component"; import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
import ProductionListColumnAlert from "./production-list-columns.alert.component"; import ProductionListColumnAlert from "./production-list-columns.alert.component";
import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component"; import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
@@ -15,6 +15,7 @@ import ProductionListColumnPaintPriority from "./production-list-columns.paintpr
import ProductionListColumnNote from "./production-list-columns.productionnote.component"; import ProductionListColumnNote from "./production-list-columns.productionnote.component";
import ProductionListColumnStatus from "./production-list-columns.status.component"; import ProductionListColumnStatus from "./production-list-columns.status.component";
import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component"; import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
const r = ({ technician, state }) => { const r = ({ technician, state }) => {
return [ return [
{ {
@@ -79,7 +80,7 @@ const r = ({ technician, state }) => {
sortOrder: sortOrder:
state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order, state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
<DateFormatter>{record.actual_in || ""}</DateFormatter> <ProductionListDate record={record} field="actual_in" />
), ),
}, },
{ {
@@ -183,6 +184,12 @@ const r = ({ technician, state }) => {
sortOrder: sortOrder:
state.sortedInfo.columnKey === "alt_transport" && state.sortedInfo.columnKey === "alt_transport" &&
state.sortedInfo.order, state.sortedInfo.order,
render: (text, record) => (
<div>
{record.alt_transport}
<JobAltTransportChange job={record} />
</div>
),
}, },
{ {
title: i18n.t("jobs.fields.status"), title: i18n.t("jobs.fields.status"),