IO-2853 Production Board Date Modal

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

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

@@ -1,11 +1,11 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Dropdown, TimePicker } from "antd";
-import dayjs from "../../utils/day";
+import { Button, Card, Dropdown, Space, TimePicker } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 
 export default function ProductionListDate({ record, field, time, pastIndicator }) {
@@ -56,23 +56,25 @@ export default function ProductionListDate({ record, field, time, pastIndicator
         key: "overlayItem1",
         label: (
           <Card style={{ padding: "1rem" }} onClick={(e) => e.stopPropagation()}>
-            <FormDatePicker
-              onClick={(e) => e.stopPropagation()}
-              value={(record[field] && dayjs(record[field])) || null}
-              onChange={handleChange}
-              format="MM/DD/YYYY"
-              isDateOnly={!time}
-            />
-            {time && (
-              <TimePicker
+            <Space direction={"vertical"}>
+              <FormDatePicker
                 onClick={(e) => e.stopPropagation()}
                 value={(record[field] && dayjs(record[field])) || null}
                 onChange={handleChange}
-                minuteStep={15}
-                format="hh:mm a"
+                format="MM/DD/YYYY"
+                isDateOnly={!time}
               />
-            )}
-            <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+              {time && (
+                <TimePicker
+                  onClick={(e) => e.stopPropagation()}
+                  value={(record[field] && dayjs(record[field])) || null}
+                  onChange={handleChange}
+                  minuteStep={15}
+                  format="hh:mm a"
+                />
+              )}
+              <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
+            </Space>
           </Card>
         )
       }

client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx

@@ -1765,28 +1765,25 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
             </Form.Item>
           </LayoutFormRow>
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.tax_tow_rt")} name={["md_responsibility_centers", "tax_tow_rt"]}>
+            <Form.Item label={t("jobs.fields.tax_tow_rt")} name="tax_tow_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_str_rt")} name={["md_responsibility_centers", "tax_str_rt"]}>
+            <Form.Item label={t("jobs.fields.tax_str_rt")} name="tax_str_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item
-              label={t("jobs.fields.tax_paint_mat_rt")}
-              name={["md_responsibility_centers", "tax_paint_mat_rt"]}
-            >
+            <Form.Item label={t("jobs.fields.tax_paint_mat_rt")} name="tax_paint_mat_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name={["md_responsibility_centers", "tax_shop_mat_rt"]}>
+            <Form.Item label={t("jobs.fields.tax_shop_mat_rt")} name="tax_shop_mat_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_sub_rt")} name={["md_responsibility_centers", "tax_sub_rt"]}>
+            <Form.Item label={t("jobs.fields.tax_sub_rt")} name="tax_sub_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_lbr_rt")} name={["md_responsibility_centers", "tax_lbr_rt"]}>
+            <Form.Item label={t("jobs.fields.tax_lbr_rt")} name="tax_lbr_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.tax_levies_rt")} name={["md_responsibility_centers", "tax_levies_rt"]}>
+            <Form.Item label={t("jobs.fields.tax_levies_rt")} name="tax_levies_rt">
               <InputNumber min={0} max={100} precision={4} />
             </Form.Item>
           </LayoutFormRow>