From 8e50d0ba53f2a80814718980726bd7b7c64046cb Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Fri, 5 Jul 2024 21:23:28 -0400 Subject: [PATCH] - So so many things Signed-off-by: Dave Richer --- ...production-board-kanban-card.component.jsx | 179 ++++++++++-------- ...uction-board-kanban.settings.component.jsx | 89 +++------ .../production-board-kanban.styles.scss | 2 - .../production-board-kanban.utils.js | 2 +- .../components/Lane/SizeMemoryWrapper.jsx | 52 +++++ .../controllers/BoardContainer.jsx | 6 + .../trello-board/controllers/Lane.jsx | 90 +++++++-- .../components/trello-board/styles/Base.js | 33 ++-- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 3 +- client/src/translations/fr/common.json | 3 +- 11 files changed, 283 insertions(+), 177 deletions(-) create mode 100644 client/src/components/trello-board/components/Lane/SizeMemoryWrapper.jsx 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 4126711c0..6ad15a466 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 @@ -28,7 +28,7 @@ const cardColor = (ssbuckets, totalHrs) => { const getContrastYIQ = (bgColor) => (bgColor.r * 299 + bgColor.g * 587 + bgColor.b * 114) / 1000 >= 128 ? "black" : "white"; -export default function ProductionBoardCard({ technician, card, bodyshop, cardSettings, clone }) { +export default function ProductionBoardCard({ technician, card, bodyshop, cardSettings, clone, style }) { const { t } = useTranslation(); const { metadata } = card; @@ -72,7 +72,8 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe size="small" style={{ backgroundColor: cardSettings?.cardcolor && `rgba(${bgColor.r},${bgColor.g},${bgColor.b},${bgColor.a})`, - color: cardSettings?.cardcolor && contrastYIQ + color: cardSettings?.cardcolor && contrastYIQ, + ...style }} title={ @@ -103,10 +104,10 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe } > - {!clone && ( - - {cardSettings?.ownr_nm && ( - + + {cardSettings?.ownr_nm && ( + + {cardSettings.compact ? (
{`${metadata.ownr_ln || ""} ${metadata.ownr_co_nm || ""}`}
) : ( @@ -114,87 +115,113 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe )} - - )} - {cardSettings?.model_info && ( - + + + )} + {cardSettings?.model_info && ( + +
{`${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`}
- - )} - {cardSettings?.ins_co_nm && metadata.ins_co_nm && ( - + + + )} + {cardSettings?.ins_co_nm && metadata.ins_co_nm && ( + +
{metadata.ins_co_nm || ""}
- - )} - {cardSettings?.clm_no && metadata.clm_no && ( - + + + )} + {cardSettings?.clm_no && metadata.clm_no && ( + +
{metadata.clm_no || ""}
- - )} - {cardSettings?.employeeassignments && ( - - - {`B: ${ - employee_body ? `${employee_body.first_name.substr(0, 3)} ${employee_body.last_name.charAt(0)}` : "" - } ${metadata.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`} - {`P: ${ - employee_prep ? `${employee_prep.first_name.substr(0, 3)} ${employee_prep.last_name.charAt(0)}` : "" - }`} - {`R: ${ - employee_refinish - ? `${employee_refinish.first_name.substr(0, 3)} ${employee_refinish.last_name.charAt(0)}` - : "" - } ${metadata.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`} - {`C: ${ - employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` : "" - }`} - - - )} - {cardSettings?.actual_in && metadata.actual_in && ( - + + + )} + {cardSettings?.employeeassignments && ( + + + + +
{`B: ${employee_body ? `${employee_body.first_name.substr(0, 3)} ${employee_body.last_name.charAt(0)}` : ""} ${metadata.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
+ + + + +
{`P: ${employee_prep ? `${employee_prep.first_name.substring(0, 3)} ${employee_prep.last_name.charAt(0)}` : ""}`}
+ + + + +
{`R: ${employee_refinish ? `${employee_refinish.first_name.substring(0, 3)} ${employee_refinish.last_name.charAt(0)}` : ""} ${metadata.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}
+ + + + +
{`C: ${employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` : ""}`}
+ + + + + )} + {cardSettings?.actual_in && metadata.actual_in && ( + + {metadata.actual_in} - - )} - {cardSettings?.scheduled_completion && metadata.scheduled_completion && ( - + + + )} + {cardSettings?.scheduled_completion && metadata.scheduled_completion && ( + + {metadata.scheduled_completion} - - )} - {cardSettings?.ats && metadata.alt_transport && ( - -
{metadata.alt_transport || ""}
- - )} - {cardSettings?.sublets && ( - - - - )} - {cardSettings?.production_note && ( - - - - )} - {cardSettings?.partsstatus && ( - - - - )} - - )} + + + )} + {cardSettings?.ats && metadata.alt_transport && ( + + +
{metadata.alt_transport || ""}
+ + + )} + {cardSettings?.sublets && ( + + + + )} + {cardSettings?.production_note && ( + + + + )} + {cardSettings?.partsstatus && ( + + + + )} + ); } diff --git a/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx index d81304787..1b37922b5 100644 --- a/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx @@ -4,8 +4,6 @@ import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { UPDATE_KANBAN_SETTINGS } from "../../graphql/user.queries"; -const { TabPane } = Tabs; - export default function ProductionBoardKanbanSettings({ associationSettings, parentLoading }) { const [form] = Form.useForm(); const [open, setOpen] = useState(false); @@ -14,7 +12,7 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par const [updateKbSettings] = useMutation(UPDATE_KANBAN_SETTINGS); useEffect(() => { - form.setFieldsValue(associationSettings && associationSettings.kanban_settings); + form.setFieldsValue(associationSettings?.kanban_settings); }, [form, associationSettings, open]); const { t } = useTranslation(); @@ -25,7 +23,7 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par const result = await updateKbSettings({ variables: { - id: associationSettings && associationSettings.id, + id: associationSettings?.id, ks: values } }); @@ -43,7 +41,7 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par setHasChanges(false); }; - const handleValuesChange = (changedValues, allValues) => { + const handleValuesChange = () => { setHasChanges(true); }; @@ -139,80 +137,39 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par - {/**/} - {/* */} - {/* */} - {/* */} - {/* {t("board.labels.some_setting_3")}*/} - {/* */} - {/* */} - {/* */} - {/* */} - {/* {t("board.labels.some_setting_4")}*/} - {/* */} - {/* */} - {/* */} - {/**/} - {/**/} - {/* */} - {/* /!* Add beta settings here if any *!/*/} - {/* */} - {/**/} ); const renderLaneSettings = () => ( <> - - {/**/} - {/* */} - {/* {t("lane.labels.some_setting_1")}*/} - {/* */} - {/**/} - {/**/} - {/* */} - {/* {t("lane.labels.some_setting_2")}*/} - {/* */} - {/**/} - + - {/**/} - {/* */} - {/* */} - {/* */} - {/* {t("lane.labels.some_setting_3")}*/} - {/* */} - {/* */} - {/* */} - {/* */} - {/* {t("lane.labels.some_setting_4")}*/} - {/* */} - {/* */} - {/* */} - {/**/} - {/**/} - {/* */} - {/* /!* Add beta settings here if any *!/*/} - {/* */} - {/**/} ); + const items = [ + { + key: "1", + label: t("production.settings.tabs.card"), + children: renderCardSettings() + }, + { + key: "2", + label: t("production.settings.tabs.board"), + children: renderBoardSettings() + }, + { + key: "3", + label: t("production.settings.tabs.lane"), + children: renderLaneSettings() + } + ]; + const overlay = (
- - - {renderCardSettings()} - - - {renderBoardSettings()} - - - {renderLaneSettings()} - - +