From e593943d9951c592ebae63b562201aea7be1e561 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Sun, 14 Jul 2024 21:24:24 -0400 Subject: [PATCH] - Working Configurable card sizes for both Horizontal and Vertical! Signed-off-by: Dave Richer --- .../production-board-kanban.component.jsx | 1 + ...uction-board-kanban.settings.component.jsx | 84 ++-- .../trello-board/controllers/Board.jsx | 16 +- .../trello-board/controllers/Lane.jsx | 4 +- .../trello-board/styles/Base.js | 26 +- .../trello-board/styles/Globals.js | 19 + client/src/translations/en_us/common.json | 11 +- package-lock.json | 396 +++++++++++++++++- 8 files changed, 489 insertions(+), 68 deletions(-) create mode 100644 client/src/components/production-board-kanban/trello-board/styles/Globals.js 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 86ebf1d9b..b31969de5 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 @@ -210,6 +210,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr scheduled_completion: true, cardcolor: false, orientation: false, + cardSize: "small", model_info: true }, [associationSettings] 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 10e276a8f..b5bb92d90 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 @@ -1,10 +1,10 @@ import { useMutation } from "@apollo/client"; -import { Button, Card, Col, Form, notification, Popover, Row, Checkbox, Tabs, Switch } from "antd"; +import { Button, Card, Col, Form, notification, Popover, Row, Checkbox, Radio, Input, Switch } from "antd"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { UPDATE_KANBAN_SETTINGS } from "../../graphql/user.queries"; -export default function ProductionBoardKanbanSettings({ associationSettings, parentLoading }) { +export default function ProductionBoardKanbanSettings({ associationSettings, parentLoading, onSettingsChange }) { const [form] = Form.useForm(); const [open, setOpen] = useState(false); const [loading, setLoading] = useState(false); @@ -14,8 +14,10 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par const [updateKbSettings] = useMutation(UPDATE_KANBAN_SETTINGS); useEffect(() => { - form.setFieldsValue(associationSettings?.kanban_settings); - setOrientation(associationSettings?.kanban_settings?.orientation ?? true); + if (associationSettings?.kanban_settings) { + form.setFieldsValue(associationSettings.kanban_settings); + setOrientation(associationSettings.kanban_settings?.orientation ?? true); + } }, [form, associationSettings, open]); const { t } = useTranslation(); @@ -58,6 +60,29 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par const renderCardSettings = () => ( <> + + + + + + + + + + + + {t("production.options.small")} + {t("production.options.medium")} + {t("production.options.large")} + + + + @@ -133,56 +158,13 @@ export default function ProductionBoardKanbanSettings({ associationSettings, par ); - const renderBoardSettings = () => ( - <> - - - - Orientation - - - - - - - - ); - - const renderLaneSettings = () => ( - <> - - - - - ); - - 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()} + + +