From 5540872f62ccf115fa5f8de8149386e7e8df01b8 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 17 Nov 2021 20:18:21 -0800
Subject: [PATCH 1/3] IO-1531 CC Contract add to production.

---
 .../contract-form/contract-form.component.jsx |  3 +-
 .../contract-create.page.component.jsx        | 30 +++++++++++++------
 .../contract-create.page.container.jsx        | 27 ++++++++++++++++-
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/client/src/components/contract-form/contract-form.component.jsx b/client/src/components/contract-form/contract-form.component.jsx
index acf1b53fd..803fd59d0 100644
--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -1,5 +1,5 @@
 import { WarningFilled } from "@ant-design/icons";
-import { Form, Input, InputNumber, Space } from "antd";
+import { Form, Input, InputNumber, Space, Switch } from "antd";
 import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -42,7 +42,6 @@ export default function ContractFormComponent({
             <ContractStatusSelector />
           </Form.Item>
         )}
-
         <Form.Item
           label={t("contracts.fields.start")}
           name="start"
diff --git a/client/src/pages/contract-create/contract-create.page.component.jsx b/client/src/pages/contract-create/contract-create.page.component.jsx
index cbda6e63e..6703c10a8 100644
--- a/client/src/pages/contract-create/contract-create.page.component.jsx
+++ b/client/src/pages/contract-create/contract-create.page.component.jsx
@@ -1,4 +1,5 @@
-import { Button, Col, PageHeader, Row } from "antd";
+import { Button, Col, PageHeader, Row, Space, Form, Switch } from "antd";
+
 import React from "react";
 import { useTranslation } from "react-i18next";
 import ContractCarsContainer from "../../components/contract-cars/contract-cars.container";
@@ -13,14 +14,25 @@ export default function ContractCreatePageComponent({
   const { t } = useTranslation();
 
   const CreateButton = (
-    <Button
-      disabled={!selectedJobState[0] || !selectedCarState[0]}
-      type="primary"
-      onClick={() => form.submit()}
-      loading={loading}
-    >
-      {t("general.actions.create")}
-    </Button>
+    <Space size="large">
+      {selectedJobState[0] && selectedCarState[0] && (
+        <Form.Item
+          label={t("jobs.actions.addtoproduction")}
+          name="addtoproduction"
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
+      )}
+      <Button
+        disabled={!selectedJobState[0] || !selectedCarState[0]}
+        type="primary"
+        onClick={() => form.submit()}
+        loading={loading}
+      >
+        {t("general.actions.create")}
+      </Button>
+    </Space>
   );
 
   return (
diff --git a/client/src/pages/contract-create/contract-create.page.container.jsx b/client/src/pages/contract-create/contract-create.page.container.jsx
index 95d31e486..7ab35f1c5 100644
--- a/client/src/pages/contract-create/contract-create.page.container.jsx
+++ b/client/src/pages/contract-create/contract-create.page.container.jsx
@@ -7,6 +7,7 @@ import { useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { INSERT_NEW_CONTRACT } from "../../graphql/cccontracts.queries";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import {
   setBreadcrumbs,
   setSelectedHeader,
@@ -37,8 +38,9 @@ export function ContractCreatePageContainer({
     (location.state && location.state.jobId) || null
   );
   const [insertContract] = useMutation(INSERT_NEW_CONTRACT);
+  const [intakeJob] = useMutation(UPDATE_JOB);
 
-  const handleFinish = async (values) => {
+  const handleFinish = async ({ addtoproduction, ...values }) => {
     if (!!selectedCarState[0] && !!selectedJobState[0]) {
       setLoading(true);
       const result = await insertContract({
@@ -54,12 +56,35 @@ export function ContractCreatePageContainer({
           },
         },
       });
+
       if (!result.errors) {
         //Update the courtesy car to have the damage.
         notification["success"]({
           message: t("contracts.successes.saved"),
         });
 
+        //Intake the job if required
+        if (addtoproduction) {
+          const result2 = await intakeJob({
+            variables: {
+              jobId: selectedJobState[0],
+              job: {
+                actual_in: new Date(),
+                inproduction: true,
+                status: bodyshop.md_ro_statuses.default_arrived,
+              },
+            },
+          });
+          if (result2.errors) {
+            notification["error"]({
+              message: t("jobs.errors.saving", {
+                error: JSON.stringify(!result2.errors),
+              }),
+            });
+            return;
+          }
+        }
+
         form.resetFields();
         form.resetFields();
         history.push(

From 696781c8578d498b44bcbccba10ceabbc8af654e Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 17 Nov 2021 21:47:05 -0800
Subject: [PATCH 2/3] IO-1533 Kanban Customizations

---
 ...production-board-kanban-card.component.jsx | 300 +++++++-----------
 ...n-board-kanban.card-settings.component.jsx |  89 +++---
 .../production-board-kanban.component.jsx     |  42 ++-
 3 files changed, 177 insertions(+), 254 deletions(-)

diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
index b48c09e22..ce5bd679e 100644
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -1,4 +1,4 @@
-import { EyeFilled, CalendarOutlined } from "@ant-design/icons";
+import { EyeFilled, CalendarOutlined, ToolFilled } from "@ant-design/icons";
 import { Card, Col, Row, Space, Typography } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,7 +16,7 @@ export default function ProductionBoardCard(
   cardSettings
 ) {
   const { t } = useTranslation();
-  const [flipped, setFlipped] = useState(false);
+
   let employee_body, employee_prep, employee_refinish, employee_csr;
   if (card.employee_body) {
     employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
@@ -35,16 +35,24 @@ export default function ProductionBoardCard(
 
   return (
     <Card
-      className="react-kanban-card imex-kanban-card tight-antd-rows"
-      onDoubleClick={() => setFlipped(!flipped)}
-    >
-      <div style={{ display: "flex" }}>
-        <span style={{ fontWeight: "bold", flex: 1 }}>
-          {card.ro_number || t("general.labels.na")}
-        </span>
-        <Space size="small" align="start">
-          {cardSettings && cardSettings.alert && (
-            <ProductionAlert record={card} key="alert" />
+      className="react-kanban-card imex-kanban-card"
+      size="small"
+      title={
+        <Space>
+          <ProductionAlert record={card} key="alert" />
+          <span style={{ fontWeight: "bolder" }}>
+            {card.ro_number || t("general.labels.na")}
+          </span>
+        </Space>
+      }
+      extra={
+        <Space>
+          {cardSettings && cardSettings.sublets && (
+            <Col span={12}>
+              <ProductionSubletsManageComponent
+                subletJobLines={card.subletLines}
+              />
+            </Col>
           )}
           {technician ? (
             <Link to={`/tech/joblookup?selected=${card.id}`}>
@@ -56,98 +64,10 @@ export default function ProductionBoardCard(
             </Link>
           )}
         </Space>
-      </div>
-      {flipped ? (
-        <Row>
-          {cardSettings && cardSettings.clm_no === "back" && (
-            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <div className="ellipses">{card.clm_no || ""}</div>
-            </Col>
-          )}
-          {cardSettings && cardSettings.ins_co_nm === "back" && (
-            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <div className="ellipses">{card.ins_co_nm || ""}</div>
-            </Col>
-          )}
-          {cardSettings && cardSettings.laborhrs === "back" && (
-            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <Space
-                size="small"
-                direction={
-                  cardSettings && cardSettings.compact
-                    ? "horizontal"
-                    : "vertical"
-                }
-              >
-                <div>{`B: ${card.labhrs.aggregate.sum.mod_lb_hrs || "?"}`}</div>
-                <div>{`R: ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}`}</div>
-              </Space>
-            </Col>
-          )}
-          {cardSettings && cardSettings.employeeassignments === "back" && (
-            <Col span={12}>
-              <Space
-                direction="vertical"
-                wrap={cardSettings && cardSettings.compact}
-              >
-                <div>{`B: ${
-                  employee_body
-                    ? `${employee_body.first_name} ${employee_body.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`P: ${
-                  employee_prep
-                    ? `${employee_prep.first_name} ${employee_prep.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`R: ${
-                  employee_refinish
-                    ? `${employee_refinish.first_name} ${employee_refinish.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`CSR: ${
-                  employee_csr
-                    ? `${employee_csr.first_name} ${employee_csr.last_name}`
-                    : ""
-                }`}</div>
-              </Space>
-            </Col>
-          )}
-          {cardSettings && cardSettings.scheduled_completion === "back" && (
-            <Col span={12}>
-              <Space>
-                <CalendarOutlined />
-                <DateTimeFormatter format="MM/DD">
-                  {card.scheduled_completion}
-                </DateTimeFormatter>
-              </Space>
-            </Col>
-          )}
-          {cardSettings && cardSettings.ats === "back" && (
-            <Col span={12}>
-              <Col span={cardSettings && cardSettings.compact ? 24 : 6}>
-                <div>{card.alt_transport || ""}</div>
-              </Col>
-            </Col>
-          )}
-
-          {cardSettings && cardSettings.sublets === "back" && (
-            <Col span={12}>
-              <ProductionSubletsManageComponent
-                subletJobLines={card.subletLines}
-              />
-            </Col>
-          )}
-          {cardSettings && cardSettings.production_note === "back" && (
-            <Col span={24}>
-              {cardSettings && cardSettings.production_note === "back" && (
-                <ProductionListColumnProductionNote record={card} />
-              )}
-            </Col>
-          )}
-        </Row>
-      ) : (
-        <Row>
+      }
+    >
+      <Row>
+        {cardSettings && cardSettings.ownr_nm && (
           <Col span={24}>
             {cardSettings && cardSettings.compact ? (
               <div className="ellipses">{`${card.ownr_ln || ""} ${
@@ -159,97 +79,91 @@ export default function ProductionBoardCard(
               } ${card.ownr_co_nm || ""}`}</div>
             )}
           </Col>
-          <Col span={24}>
-            <div className="ellipses">{`${card.v_model_yr || ""} ${
-              card.v_make_desc || ""
-            } ${card.v_model_desc || ""}`}</div>
+        )}
+        <Col span={24}>
+          <div className="ellipses">{`${card.v_model_yr || ""} ${
+            card.v_make_desc || ""
+          } ${card.v_model_desc || ""}`}</div>
+        </Col>
+        {cardSettings && cardSettings.ins_co_nm && (
+          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+            <div className="ellipses">{card.ins_co_nm || ""}</div>
           </Col>
+        )}
+        {cardSettings && cardSettings.clm_no && (
+          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+            <div className="ellipses">{card.clm_no || ""}</div>
+          </Col>
+        )}
 
-          {cardSettings && cardSettings.clm_no === "front" && (
-            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <div className="ellipses">{card.clm_no || ""}</div>
-            </Col>
-          )}
-          {cardSettings && cardSettings.ins_co_nm === "front" && (
-            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <div className="ellipses">{card.ins_co_nm || ""}</div>
-            </Col>
-          )}
-          {cardSettings && cardSettings.laborhrs === "front" && (
-            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-              <Space
-                size="small"
-                direction={
-                  cardSettings && cardSettings.compact
-                    ? "horizontal"
-                    : "vertical"
-                }
-              >
-                <div>{`B: ${card.labhrs.aggregate.sum.mod_lb_hrs || "?"}`}</div>
-                <div>{`R: ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}`}</div>
-              </Space>
-            </Col>
-          )}
-          {cardSettings && cardSettings.employeeassignments === "front" && (
-            <Col span={24}>
-              <Space
-                direction="vertical"
-                wrap={cardSettings && cardSettings.compact}
-              >
-                <div>{`B: ${
-                  employee_body
-                    ? `${employee_body.first_name} ${employee_body.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`P: ${
-                  employee_prep
-                    ? `${employee_prep.first_name} ${employee_prep.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`R: ${
-                  employee_refinish
-                    ? `${employee_refinish.first_name} ${employee_refinish.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`CSR: ${
-                  employee_csr
-                    ? `${employee_csr.first_name} ${employee_csr.last_name}`
-                    : ""
-                }`}</div>
-              </Space>
-            </Col>
-          )}
-          {cardSettings && cardSettings.scheduled_completion === "front" && (
-            <Col span={12}>
-              <Space>
-                <CalendarOutlined />
-                <DateTimeFormatter format="MM/DD">
-                  {card.scheduled_completion}
-                </DateTimeFormatter>
-              </Space>
-            </Col>
-          )}
-          {cardSettings && cardSettings.ats === "front" && (
-            <Col span={12}>
-              <div>{card.alt_transport || ""}</div>
-            </Col>
-          )}
-          {cardSettings && cardSettings.sublets === "front" && (
-            <Col span={12}>
-              <ProductionSubletsManageComponent
-                subletJobLines={card.subletLines}
-              />
-            </Col>
-          )}
-          {cardSettings && cardSettings.production_note === "front" && (
-            <Col span={24}>
-              {cardSettings && cardSettings.production_note === "front" && (
-                <ProductionListColumnProductionNote record={card} />
-              )}
-            </Col>
-          )}
-        </Row>
-      )}
+        {cardSettings && cardSettings.employeeassignments && (
+          <Col span={24}>
+            <Row>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`B: ${
+                employee_body
+                  ? `${employee_body.first_name} ${employee_body.last_name}`
+                  : ""
+              }`}</Col>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`P: ${
+                employee_prep
+                  ? `${employee_prep.first_name} ${employee_prep.last_name}`
+                  : ""
+              }`}</Col>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`R: ${
+                employee_refinish
+                  ? `${employee_refinish.first_name} ${employee_refinish.last_name}`
+                  : ""
+              }`}</Col>
+              {/* <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
+                employee_csr
+                  ? `${employee_csr.first_name} ${employee_csr.last_name}`
+                  : ""
+              }`}</Col> */}
+            </Row>
+          </Col>
+        )}
+        {cardSettings && cardSettings.laborhrs && (
+          <Col span={24}>
+            <Row>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`B: ${
+                card.labhrs.aggregate.sum.mod_lb_hrs || "?"
+              } hrs`}</Col>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`R: ${
+                card.larhrs.aggregate.sum.mod_lb_hrs || "?"
+              } hrs`}</Col>
+            </Row>
+          </Col>
+        )}
+        {cardSettings && cardSettings.scheduled_completion && (
+          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+            <Space>
+              <CalendarOutlined />
+              <DateTimeFormatter format="MM/DD">
+                {card.scheduled_completion}
+              </DateTimeFormatter>
+            </Space>
+          </Col>
+        )}
+        {cardSettings && cardSettings.ats && (
+          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+            <div>{card.alt_transport || ""}</div>
+          </Col>
+        )}
+        {cardSettings && cardSettings.sublets && (
+          <Col span={12}>
+            <ProductionSubletsManageComponent
+              subletJobLines={card.subletLines}
+            />
+          </Col>
+        )}
+        {cardSettings && cardSettings.production_note && (
+          <Col span={24}>
+            {cardSettings && cardSettings.production_note && (
+              <ProductionListColumnProductionNote record={card} />
+            )}
+          </Col>
+        )}
+      </Row>
     </Card>
   );
 }
diff --git a/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx
index 9ae6666a1..dba1230c6 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx
@@ -63,85 +63,74 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
-              <Form.Item label={t("production.labels.clm_no")} name="clm_no">
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.ownr_nm")}
+                name="ownr_nm"
+              >
+                <Switch />
               </Form.Item>
               <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.clm_no")}
+                name="clm_no"
+              >
+                <Switch />
+              </Form.Item>
+              <Form.Item
+                valuePropName="checked"
                 label={t("production.labels.ins_co_nm")}
                 name="ins_co_nm"
               >
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+                <Switch />
               </Form.Item>
               <Form.Item
+                valuePropName="checked"
                 label={t("production.labels.laborhrs")}
                 name="laborhrs"
               >
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+                <Switch />
               </Form.Item>
               <Form.Item
+                valuePropName="checked"
                 label={t("production.labels.employeeassignments")}
                 name="employeeassignments"
               >
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+                <Switch />
               </Form.Item>
               <Form.Item
+                valuePropName="checked"
                 label={t("production.labels.scheduled_completion")}
                 name="scheduled_completion"
               >
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+                <Switch />
               </Form.Item>{" "}
             </Col>
             <Col span={12}>
-              <Form.Item label={t("production.labels.ats")} name="ats">
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.ats")}
+                name="ats"
+              >
+                <Switch />
               </Form.Item>
               <Form.Item
+                valuePropName="checked"
                 label={t("production.labels.production_note")}
                 name="production_note"
               >
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+                <Switch />
               </Form.Item>
-              <Form.Item label={t("production.labels.alert")} name="alert">
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
-              </Form.Item>
-              <Form.Item label={t("production.labels.sublets")} name="sublets">
-                <Radio.Group>
-                  <Radio value="front">Front</Radio>
-                  <Radio value="back">Back</Radio>
-                  <Radio value="off">Off</Radio>
-                </Radio.Group>
+              {/* <Form.Item
+              valuePropName='checked' label={t("production.labels.alert")} name="alert">
+                <Switch/>
+              </Form.Item> */}
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.sublets")}
+                name="sublets"
+              >
+                <Switch />
               </Form.Item>
             </Col>
           </Row>
diff --git a/client/src/components/production-board-kanban/production-board-kanban.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
index 4423a23fe..1f3129eeb 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -2,7 +2,7 @@ import { useApolloClient } from "@apollo/client";
 import Board, { moveCard } from "@asseinfo/react-kanban";
 //import "@asseinfo/react-kanban/dist/styles.css";
 import "./production-board-kanban.styles.scss";
-import { notification, PageHeader, Space, Statistic } from "antd";
+import { Grid, notification, PageHeader, Space, Statistic } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -145,22 +145,42 @@ export function ProductionBoardKanbanComponent({
       0
     )
     .toFixed(1);
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
+  const standardSizes = {
+    xs: "250",
+    sm: "250",
+    md: "250",
+    lg: "250",
+    xl: "250",
+    xxl: "250",
+  };
+  const compactSizes = {
+    xs: "150",
+    sm: "150",
+    md: "150",
+    lg: "150",
+    xl: "155",
+    xxl: "155",
+  };
+
+  const width = selectedBreakpoint
+    ? associationSettings &&
+      associationSettings.kanban_settings &&
+      associationSettings.kanban_settings.compact
+      ? compactSizes[selectedBreakpoint[0]]
+      : standardSizes[selectedBreakpoint[0]]
+    : "250";
 
   const Container = styled.div`
     .react-kanban-card-skeleton,
     .react-kanban-card,
     .react-kanban-card-adder-form {
       box-sizing: border-box;
-      max-width: ${associationSettings &&
-      associationSettings.kanban_settings &&
-      associationSettings.kanban_settings.compact
-        ? "145"
-        : "250"}px;
-      min-width: ${associationSettings &&
-      associationSettings.kanban_settings &&
-      associationSettings.kanban_settings.compact
-        ? "145"
-        : "250"}px;
+      max-width: ${width}px;
+      min-width: ${width}px;
     }
   `;
 

From 49bf461c3689ac07a46cae33588e74f5a51101d7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 17 Nov 2021 22:07:50 -0800
Subject: [PATCH 3/3] IO-1533 Kanban Customizations

---
 bodyshop_translations.babel                   | 126 ++++++++++++++++++
 ...production-board-kanban-card.component.jsx |  94 ++++++-------
 ...n-board-kanban.card-settings.component.jsx |  10 +-
 .../production-sublets-manage.component.jsx   |  10 +-
 client/src/translations/en_us/common.json     |   6 +
 client/src/translations/es/common.json        |   6 +
 client/src/translations/fr/common.json        |   6 +
 7 files changed, 205 insertions(+), 53 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 2456b19d5..1db938a77 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -34961,6 +34961,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ats</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>bodyhours</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35024,6 +35045,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>clm_no</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>compact</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35108,6 +35150,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ins_co_nm</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>jobdetail</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35171,6 +35234,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ownr_nm</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>paintpriority</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35192,6 +35276,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>production_note</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>refinishhours</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35213,6 +35318,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>scheduled_completion</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>selectview</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
index ce5bd679e..952c23b44 100644
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -1,6 +1,6 @@
-import { EyeFilled, CalendarOutlined, ToolFilled } from "@ant-design/icons";
-import { Card, Col, Row, Space, Typography } from "antd";
-import React, { useState } from "react";
+import { CalendarOutlined, EyeFilled } from "@ant-design/icons";
+import { Card, Col, Row, Space } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
@@ -17,7 +17,7 @@ export default function ProductionBoardCard(
 ) {
   const { t } = useTranslation();
 
-  let employee_body, employee_prep, employee_refinish, employee_csr;
+  let employee_body, employee_prep, employee_refinish; //employee_csr;
   if (card.employee_body) {
     employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
   }
@@ -29,9 +29,9 @@ export default function ProductionBoardCard(
       (e) => e.id === card.employee_refinish
     );
   }
-  if (card.employee_csr) {
-    employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
-  }
+  // if (card.employee_csr) {
+  //   employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
+  // }
 
   return (
     <Card
@@ -46,24 +46,15 @@ export default function ProductionBoardCard(
         </Space>
       }
       extra={
-        <Space>
-          {cardSettings && cardSettings.sublets && (
-            <Col span={12}>
-              <ProductionSubletsManageComponent
-                subletJobLines={card.subletLines}
-              />
-            </Col>
-          )}
-          {technician ? (
-            <Link to={`/tech/joblookup?selected=${card.id}`}>
-              <EyeFilled />
-            </Link>
-          ) : (
-            <Link to={`/manage/jobs/${card.id}`}>
-              <EyeFilled />
-            </Link>
-          )}
-        </Space>
+        technician ? (
+          <Link to={`/tech/joblookup?selected=${card.id}`}>
+            <EyeFilled />
+          </Link>
+        ) : (
+          <Link to={`/manage/jobs/${card.id}`}>
+            <EyeFilled />
+          </Link>
+        )
       }
     >
       <Row>
@@ -85,12 +76,12 @@ export default function ProductionBoardCard(
             card.v_make_desc || ""
           } ${card.v_model_desc || ""}`}</div>
         </Col>
-        {cardSettings && cardSettings.ins_co_nm && (
+        {cardSettings && cardSettings.ins_co_nm && card.ins_co_nm && (
           <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
             <div className="ellipses">{card.ins_co_nm || ""}</div>
           </Col>
         )}
-        {cardSettings && cardSettings.clm_no && (
+        {cardSettings && cardSettings.clm_no && card.clm_no && (
           <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
             <div className="ellipses">{card.clm_no || ""}</div>
           </Col>
@@ -101,19 +92,28 @@ export default function ProductionBoardCard(
             <Row>
               <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`B: ${
                 employee_body
-                  ? `${employee_body.first_name} ${employee_body.last_name}`
+                  ? `${employee_body.first_name.substr(
+                      0,
+                      3
+                    )} ${employee_body.last_name.charAt(0)}`
                   : ""
-              }`}</Col>
+              } ${card.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
               <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`P: ${
                 employee_prep
-                  ? `${employee_prep.first_name} ${employee_prep.last_name}`
+                  ? `${employee_prep.first_name.substr(
+                      0,
+                      3
+                    )} ${employee_prep.last_name.charAt(0)}`
                   : ""
               }`}</Col>
               <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`R: ${
                 employee_refinish
-                  ? `${employee_refinish.first_name} ${employee_refinish.last_name}`
+                  ? `${employee_refinish.first_name.substr(
+                      0,
+                      3
+                    )} ${employee_refinish.last_name.charAt(0)}`
                   : ""
-              }`}</Col>
+              } ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
               {/* <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
                 employee_csr
                   ? `${employee_csr.first_name} ${employee_csr.last_name}`
@@ -122,7 +122,7 @@ export default function ProductionBoardCard(
             </Row>
           </Col>
         )}
-        {cardSettings && cardSettings.laborhrs && (
+        {/* {cardSettings && cardSettings.laborhrs && (
           <Col span={24}>
             <Row>
               <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`B: ${
@@ -133,19 +133,21 @@ export default function ProductionBoardCard(
               } hrs`}</Col>
             </Row>
           </Col>
-        )}
-        {cardSettings && cardSettings.scheduled_completion && (
-          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
-            <Space>
-              <CalendarOutlined />
-              <DateTimeFormatter format="MM/DD">
-                {card.scheduled_completion}
-              </DateTimeFormatter>
-            </Space>
-          </Col>
-        )}
-        {cardSettings && cardSettings.ats && (
-          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+        )} */}
+        {cardSettings &&
+          cardSettings.scheduled_completion &&
+          card.scheduled_completion && (
+            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+              <Space>
+                <CalendarOutlined />
+                <DateTimeFormatter format="MM/DD">
+                  {card.scheduled_completion}
+                </DateTimeFormatter>
+              </Space>
+            </Col>
+          )}
+        {cardSettings && cardSettings.ats && card.alt_transport && (
+          <Col span={12}>
             <div>{card.alt_transport || ""}</div>
           </Col>
         )}
diff --git a/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx
index dba1230c6..cfecf04fa 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx
@@ -84,13 +84,13 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
-              <Form.Item
+              {/* <Form.Item
                 valuePropName="checked"
                 label={t("production.labels.laborhrs")}
                 name="laborhrs"
               >
                 <Switch />
-              </Form.Item>
+              </Form.Item> */}
               <Form.Item
                 valuePropName="checked"
                 label={t("production.labels.employeeassignments")}
@@ -98,15 +98,15 @@ export default function ProductionBoardKanbanCardSettings({
               >
                 <Switch />
               </Form.Item>
+            </Col>
+            <Col span={12}>
               <Form.Item
                 valuePropName="checked"
                 label={t("production.labels.scheduled_completion")}
                 name="scheduled_completion"
               >
                 <Switch />
-              </Form.Item>{" "}
-            </Col>
-            <Col span={12}>
+              </Form.Item>
               <Form.Item
                 valuePropName="checked"
                 label={t("production.labels.ats")}
diff --git a/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx b/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx
index e930ed9c4..2fdc2619b 100644
--- a/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx
+++ b/client/src/components/production-sublets-manage/production-sublets-manage.component.jsx
@@ -56,7 +56,10 @@ export default function ProductionSubletsManageComponent({ subletJobLines }) {
               <Button
                 key="complete"
                 loading={loading}
-                onClick={() => handleSubletMark(s, "complete")}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleSubletMark(s, "complete");
+                }}
                 type={s.sublet_completed ? "primary" : "ghost"}
               >
                 <CheckCircleFilled
@@ -66,7 +69,10 @@ export default function ProductionSubletsManageComponent({ subletJobLines }) {
               <Button
                 key="sublet"
                 loading={loading}
-                onClick={() => handleSubletMark(s, "ignore")}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleSubletMark(s, "ignore");
+                }}
                 type={s.sublet_ignored ? "primary" : "ghost"}
               >
                 <EyeInvisibleFilled
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7b7f6ea0a..250e82b24 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2085,18 +2085,24 @@
 				"alert": "Alert",
 				"alertoff": "Remove alert from job",
 				"alerton": "Add alert to job",
+				"ats": "Alternative Transportation",
 				"bodyhours": "B",
 				"bodypriority": "B/P",
 				"cardsettings": "Card Settings",
+				"clm_no": "Claim Number",
 				"compact": "Compact Cards",
 				"detailpriority": "D/P",
 				"employeeassignments": "Employee Assignments",
 				"employeesearch": "Employee Search",
+				"ins_co_nm": "Insurance Company Name",
 				"jobdetail": "Job Details",
 				"laborhrs": "Labor Hours",
 				"note": "Production Note",
+				"ownr_nm": "Owner Name",
 				"paintpriority": "P/P",
+				"production_note": "Production Note",
 				"refinishhours": "R",
+				"scheduled_completion": "Scheduled Completion",
 				"selectview": "Select a View",
 				"sublets": "Sublets",
 				"totalhours": "Total Hrs ",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 574d37980..1516b6697 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2085,18 +2085,24 @@
 				"alert": "",
 				"alertoff": "",
 				"alerton": "",
+				"ats": "",
 				"bodyhours": "",
 				"bodypriority": "",
 				"cardsettings": "",
+				"clm_no": "",
 				"compact": "",
 				"detailpriority": "",
 				"employeeassignments": "",
 				"employeesearch": "",
+				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
 				"note": "",
+				"ownr_nm": "",
 				"paintpriority": "",
+				"production_note": "",
 				"refinishhours": "",
+				"scheduled_completion": "",
 				"selectview": "",
 				"sublets": "",
 				"totalhours": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 1adff188e..570e5d46c 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2085,18 +2085,24 @@
 				"alert": "",
 				"alertoff": "",
 				"alerton": "",
+				"ats": "",
 				"bodyhours": "",
 				"bodypriority": "",
 				"cardsettings": "",
+				"clm_no": "",
 				"compact": "",
 				"detailpriority": "",
 				"employeeassignments": "",
 				"employeesearch": "",
+				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
 				"note": "",
+				"ownr_nm": "",
 				"paintpriority": "",
+				"production_note": "",
 				"refinishhours": "",
+				"scheduled_completion": "",
 				"selectview": "",
 				"sublets": "",
 				"totalhours": "",