From ccc1a37ebb984401b97093c1c56a7d9fa93e9518 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 26 Apr 2021 13:32:16 -0700
Subject: [PATCH] IO-928 IO-932 IO-940 Production List Updates

---
 bodyshop_translations.babel                           |  2 +-
 .../job-at-change/job-at-change.component.jsx         |  7 ++++++-
 .../production-list-columns.data.js                   | 11 +++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bdf2d05d6..ed707ed24 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -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
diff --git a/client/src/components/job-at-change/job-at-change.component.jsx b/client/src/components/job-at-change/job-at-change.component.jsx
index 6e8a6683c..449149ca2 100644
--- a/client/src/components/job-at-change/job-at-change.component.jsx
+++ b/client/src/components/job-at-change/job-at-change.component.jsx
@@ -21,7 +21,10 @@ export function JobAltTransportChange({ bodyshop, job }) {
 
   const onClick = async ({ key }) => {
     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) {
@@ -40,6 +43,8 @@ export function JobAltTransportChange({ bodyshop, job }) {
         bodyshop.appt_alt_transport.map((alt) => (
           <Menu.Item key={alt}>{alt}</Menu.Item>
         ))}
+      <Menu.Divider />
+      <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
     </Menu>
   );
   return (
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index 0dc9a1c99..01d595a85 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -2,9 +2,9 @@ import i18n from "i18next";
 import React from "react";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { DateFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 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 ProductionListColumnAlert from "./production-list-columns.alert.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 ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
+
 const r = ({ technician, state }) => {
   return [
     {
@@ -79,7 +80,7 @@ const r = ({ technician, state }) => {
       sortOrder:
         state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
       render: (text, record) => (
-        <DateFormatter>{record.actual_in || ""}</DateFormatter>
+        <ProductionListDate record={record} field="actual_in" />
       ),
     },
     {
@@ -183,6 +184,12 @@ const r = ({ technician, state }) => {
       sortOrder:
         state.sortedInfo.columnKey === "alt_transport" &&
         state.sortedInfo.order,
+      render: (text, record) => (
+        <div>
+          {record.alt_transport}
+          <JobAltTransportChange job={record} />
+        </div>
+      ),
     },
     {
       title: i18n.t("jobs.fields.status"),