From 49bf461c3689ac07a46cae33588e74f5a51101d7 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 17 Nov 2021 22:07:50 -0800 Subject: [PATCH] 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 @@ + + ats + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + bodyhours false @@ -35024,6 +35045,27 @@ + + clm_no + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + compact false @@ -35108,6 +35150,27 @@ + + ins_co_nm + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + jobdetail false @@ -35171,6 +35234,27 @@ + + ownr_nm + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + paintpriority false @@ -35192,6 +35276,27 @@ + + production_note + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + refinishhours false @@ -35213,6 +35318,27 @@ + + scheduled_completion + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + selectview false 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 ( } extra={ - - {cardSettings && cardSettings.sublets && ( - - - - )} - {technician ? ( - - - - ) : ( - - - - )} - + technician ? ( + + + + ) : ( + + + + ) } > @@ -85,12 +76,12 @@ export default function ProductionBoardCard( card.v_make_desc || "" } ${card.v_model_desc || ""}`} - {cardSettings && cardSettings.ins_co_nm && ( + {cardSettings && cardSettings.ins_co_nm && card.ins_co_nm && (
{card.ins_co_nm || ""}
)} - {cardSettings && cardSettings.clm_no && ( + {cardSettings && cardSettings.clm_no && card.clm_no && (
{card.clm_no || ""}
@@ -101,19 +92,28 @@ export default function ProductionBoardCard( {`B: ${ employee_body - ? `${employee_body.first_name} ${employee_body.last_name}` + ? `${employee_body.first_name.substr( + 0, + 3 + )} ${employee_body.last_name.charAt(0)}` : "" - }`} + } ${card.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`} {`P: ${ employee_prep - ? `${employee_prep.first_name} ${employee_prep.last_name}` + ? `${employee_prep.first_name.substr( + 0, + 3 + )} ${employee_prep.last_name.charAt(0)}` : "" }`} {`R: ${ employee_refinish - ? `${employee_refinish.first_name} ${employee_refinish.last_name}` + ? `${employee_refinish.first_name.substr( + 0, + 3 + )} ${employee_refinish.last_name.charAt(0)}` : "" - }`} + } ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`} {/* {`C: ${ employee_csr ? `${employee_csr.first_name} ${employee_csr.last_name}` @@ -122,7 +122,7 @@ export default function ProductionBoardCard( )} - {cardSettings && cardSettings.laborhrs && ( + {/* {cardSettings && cardSettings.laborhrs && ( {`B: ${ @@ -133,19 +133,21 @@ export default function ProductionBoardCard( } hrs`} - )} - {cardSettings && cardSettings.scheduled_completion && ( - - - - - {card.scheduled_completion} - - - - )} - {cardSettings && cardSettings.ats && ( - + )} */} + {cardSettings && + cardSettings.scheduled_completion && + card.scheduled_completion && ( + + + + + {card.scheduled_completion} + + + + )} + {cardSettings && cardSettings.ats && card.alt_transport && ( +
{card.alt_transport || ""}
)} 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({ > - - + */} + + - {" "} - - + handleSubletMark(s, "complete")} + onClick={(e) => { + e.stopPropagation(); + handleSubletMark(s, "complete"); + }} type={s.sublet_completed ? "primary" : "ghost"} > handleSubletMark(s, "ignore")} + onClick={(e) => { + e.stopPropagation(); + handleSubletMark(s, "ignore"); + }} type={s.sublet_ignored ? "primary" : "ghost"} >