diff --git a/package-lock.json b/package-lock.json index e840038..e3d263c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "@yudiel/react-qr-scanner": "^1.1.10", - "antd": "^5.10.2", + "antd": "^5.10.3", "buffer": "^6.0.3", "i18next": "^23.2.3", "i18next-browser-languagedetector": "^7.1.0", @@ -3319,9 +3319,9 @@ } }, "node_modules/@rc-component/trigger": { - "version": "1.17.2", - "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-1.17.2.tgz", - "integrity": "sha512-Jp3dXk/IzwHKM2Tn3ezdvQSwkPeH4v1s7QjIo7f5NFLIZVpJQ8a34FduZw8E6fT1PVgLXYd/JBIyd+YpgyQddA==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@rc-component/trigger/-/trigger-1.18.0.tgz", + "integrity": "sha512-vloGnWpeTmt7DBw0OHnG9poQ8h1WFh0hebq6fpgVjGYSxm6JU8rLH+kNwVNNvhL6Rg5He4ESjOk6O7uF9dJhxA==", "dependencies": { "@babel/runtime": "^7.23.2", "@rc-component/portal": "^1.1.0", @@ -5148,9 +5148,9 @@ } }, "node_modules/antd": { - "version": "5.10.2", - "resolved": "https://registry.npmjs.org/antd/-/antd-5.10.2.tgz", - "integrity": "sha512-0kV6PmlJi7vhPmYH9GCAlU62ZhiuLF+gE3REJ/9MZTo++/3i5q6SALNoRgHLMsa+rX50U3RO3wJVY+fPib594Q==", + "version": "5.10.3", + "resolved": "https://registry.npmjs.org/antd/-/antd-5.10.3.tgz", + "integrity": "sha512-IV+F4P9Fm0pXj4WFCLVLKIu7eCtVKZMLvU1a0HUIRBEy5YPsD5bDzjYkZ4F+RVPaFrAjAvChrWcX6NtQOVNuJw==", "dependencies": { "@ant-design/colors": "^7.0.0", "@ant-design/cssinjs": "^1.17.2", @@ -5161,7 +5161,7 @@ "@rc-component/color-picker": "~1.4.1", "@rc-component/mutate-observer": "^1.1.0", "@rc-component/tour": "~1.10.0", - "@rc-component/trigger": "^1.17.2", + "@rc-component/trigger": "^1.18.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", "dayjs": "^1.11.1", @@ -5179,9 +5179,9 @@ "rc-mentions": "~2.8.0", "rc-menu": "~9.12.2", "rc-motion": "^2.9.0", - "rc-notification": "~5.2.0", + "rc-notification": "~5.3.0", "rc-pagination": "~3.6.1", - "rc-picker": "~3.14.5", + "rc-picker": "~3.14.6", "rc-progress": "~3.5.1", "rc-rate": "~2.12.0", "rc-resize-observer": "^1.4.0", @@ -5193,7 +5193,7 @@ "rc-table": "~7.34.4", "rc-tabs": "~12.12.1", "rc-textarea": "~1.4.0", - "rc-tooltip": "~6.1.1", + "rc-tooltip": "~6.1.2", "rc-tree": "~5.7.12", "rc-tree-select": "~5.13.0", "rc-upload": "~4.3.5", @@ -15016,9 +15016,9 @@ } }, "node_modules/rc-notification": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.2.0.tgz", - "integrity": "sha512-HwUSypEW4mfOpiakJ7dm6TAKf+3zuSR2xm0I0XMes493rtA3n4EVMvQyldrp23hUwCE3RFj8oncyU1E8iNC4ag==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.3.0.tgz", + "integrity": "sha512-WCf0uCOkZ3HGfF0p1H4Sgt7aWfipxORWTPp7o6prA3vxwtWhtug3GfpYls1pnBp4WA+j8vGIi5c2/hQRpGzPcQ==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -15063,9 +15063,9 @@ } }, "node_modules/rc-picker": { - "version": "3.14.5", - "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-3.14.5.tgz", - "integrity": "sha512-h0O8b5AYfWwHSRUUH/9F2oBXB5gZerHIyGG6z2r5rn/kfSQodyCXEO4GNqrG30iUC1qkvLFIOn/JqI4XaO0+2A==", + "version": "3.14.6", + "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-3.14.6.tgz", + "integrity": "sha512-AdKKW0AqMwZsKvIpwUWDUnpuGKZVrbxVTZTNjcO+pViGkjC1EBcjMgxVe8tomOEaIHJL5Gd13vS8Rr3zzxWmag==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^1.5.0", @@ -15286,12 +15286,12 @@ } }, "node_modules/rc-tooltip": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.1.1.tgz", - "integrity": "sha512-YoxL0Ev4htsX37qgN23eKr0L5PIRpZaLVL9GX6aJ4x6UEnwgXZYUNCAEHfKlKT3eD1felDq3ob4+Cn9lprLDBw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-6.1.2.tgz", + "integrity": "sha512-89zwvybvCxGJu3+gGF8w5AXd4HHk6hIN7K0vZbkzjilVaEAIWPqc1fcyeUeP71n3VCcw7pTL9LyFupFbrx8gHw==", "dependencies": { "@babel/runtime": "^7.11.2", - "@rc-component/trigger": "^1.17.0", + "@rc-component/trigger": "^1.18.0", "classnames": "^2.3.1" }, "peerDependencies": { diff --git a/package.json b/package.json index 94b85e9..f898ffb 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "@yudiel/react-qr-scanner": "^1.1.10", - "antd": "^5.10.2", + "antd": "^5.10.3", "buffer": "^6.0.3", "i18next": "^23.2.3", "i18next-browser-languagedetector": "^7.1.0", diff --git a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js index e0b8830..655a089 100644 --- a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js +++ b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js @@ -689,12 +689,12 @@ export default function GroupTasksViewModal({ isOpen }) { {t("groupTasks.groupTasksViewModal.endedAt")}: {" "} - {FormatDatetime(cGroupTask.EndedAt)} + {FormatDatetime(cGroupTask?.EndedAt)}
{t("groupTasks.groupTasksViewModal.duration")}: {" "} - {GetDuration(cGroupTask.StartedAt, cGroupTask.EndedAt)} + {GetDuration(cGroupTask?.StartedAt, cGroupTask?.EndedAt)}

diff --git a/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js b/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js index b89d55b..9927a24 100644 --- a/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js +++ b/src/Pages/GroupTasks/Overview/GroupTypeSelectionModal.js @@ -8,7 +8,6 @@ import { Modal, Select, Space, - Tag, Typography, notification, } from "antd";