From ac70c09509e62b61bae3a27d3ac26252fa069d05 Mon Sep 17 00:00:00 2001 From: andrei Date: Fri, 4 Jul 2025 07:41:01 +0500 Subject: [PATCH] =?UTF-8?q?feat(LensViewModal):=20=D0=9E=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BE=20=D0=BF=D0=B0=D1=86=D0=B8=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BB=D0=B8=D0=BD?= =?UTF-8?q?=D0=B7=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LensViewModal/LensViewModal.jsx | 37 ++++++++++++++++++- .../LensViewModal/useLensViewModal.js | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/LensViewModal.jsx b/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/LensViewModal.jsx index 2a45358..9a86fb9 100644 --- a/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/LensViewModal.jsx +++ b/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/LensViewModal.jsx @@ -1,10 +1,39 @@ -import {Button, Col, Modal, Row, Typography} from "antd"; +import {Button, Col, Modal, Result, Row, Typography} from "antd"; import PropTypes from "prop-types"; import {LensPropType} from "../../../../../../../Types/lensPropType.js"; +import useLensViewModal from "./useLensViewModal.js"; +import LoadingIndicator from "../../../../../../Widgets/LoadingIndicator/LoadingIndicator.jsx"; const {Text, Title} = Typography; const LensViewModal = ({visible, onCancel, lens}) => { + const { + lensIssue, + isLensIssuesLoading, + isLensIssuesError + } = useLensViewModal(lens, visible); + + if (isLensIssuesLoading) { + return ( + + + + ); + } + + if (isLensIssuesError) { + return ( + + Закрыть} + /> + + ); + } + return ( { + {lensIssue && ( +
+ 👨‍⚕️ Пациент + {lensIssue?.patient?.last_name} {lensIssue?.patient?.first_name} +
+ )}
); }; diff --git a/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/useLensViewModal.js b/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/useLensViewModal.js index 166df87..f453508 100644 --- a/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/useLensViewModal.js +++ b/web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/Components/LensViewModal/useLensViewModal.js @@ -11,7 +11,7 @@ const useLensViewModal = (lens, visible) => { pollingInterval: 60000, refetchOnMountOrArgChange: true, }); - + return { lensIssue, isLensIssueLoading,