From 5116def685b657989c7f36c70d372893392d0f61 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 22 Aug 2023 23:11:43 +0000 Subject: [PATCH] documentation equipment --- src/Components/AppRoutes/index.js | 10 +- src/Components/MyImage/index.js | 31 ++ src/Components/MyModal/index.js | 14 +- .../CreateEquipmentDocumentationModal.js | 310 ++++++++----- .../EquipmentViewModal.js | 68 --- .../ViewEquipmentDocumentation.js | 295 ++++++++++++ src/Pages/EquipmentDocumentation/index.js | 418 ++++++++++-------- src/utils.js | 4 +- 8 files changed, 792 insertions(+), 358 deletions(-) create mode 100644 src/Components/MyImage/index.js delete mode 100644 src/Pages/EquipmentDocumentation/EquipmentViewModal.js create mode 100644 src/Pages/EquipmentDocumentation/ViewEquipmentDocumentation.js diff --git a/src/Components/AppRoutes/index.js b/src/Components/AppRoutes/index.js index f6bf0d0..eb65edf 100644 --- a/src/Components/AppRoutes/index.js +++ b/src/Components/AppRoutes/index.js @@ -15,7 +15,8 @@ import { useContext } from "react"; import GroupTasks from "../../Pages/GroupTasks/Overview"; import GroupTasksHistory from "../../Pages/GroupTasks/History"; import PageNotFound from "../../Pages/PageNotFound"; -import EquipmentDocumentation from "../../Pages/EquipmentDocumentation"; +import EquipmentDocumentationOverview from "../../Pages/EquipmentDocumentation"; +import ViewEquipmentDocumentations from "../../Pages/EquipmentDocumentation/ViewEquipmentDocumentation"; export default function AppRoutes() { const webSocketContext = useContext(WebSocketContext); @@ -48,15 +49,14 @@ export default function AppRoutes() { } + element={} /> } + element={} /> + {loaded ? null : ( +
+ +
+ )} + + Image setLoaded(true)} + /> + + ); +} diff --git a/src/Components/MyModal/index.js b/src/Components/MyModal/index.js index 9d80c1d..966f147 100644 --- a/src/Components/MyModal/index.js +++ b/src/Components/MyModal/index.js @@ -117,13 +117,23 @@ export function MyModalCloseSaveButtonFooter({ onCancel, onSave }) { ); } -export function MyModalCloseCreateButtonFooter({ onCancel, onCreate }) { +export function MyModalCloseCreateButtonFooter({ + onCancel, + onCreate, + isCreateButtonDisabled, + isCreateButtonLoading, +}) { const { t } = useTranslation(); return ( <> - diff --git a/src/Pages/EquipmentDocumentation/CreateEquipmentDocumentationModal.js b/src/Pages/EquipmentDocumentation/CreateEquipmentDocumentationModal.js index 8bf95a9..1868544 100644 --- a/src/Pages/EquipmentDocumentation/CreateEquipmentDocumentationModal.js +++ b/src/Pages/EquipmentDocumentation/CreateEquipmentDocumentationModal.js @@ -1,11 +1,10 @@ -import { useNavigate, useParams } from "react-router-dom"; +import { useParams } from "react-router-dom"; import MyModal, { MyModalCloseCreateButtonFooter, - MyModalCloseSaveButtonFooter, } from "../../Components/MyModal"; -import { AppStyle, Constants, myFetch, myFetchContentType } from "../../utils"; +import { AppStyle, Constants, myFetch } from "../../utils"; import { Button, Card, Col, Row, Select, Typography } from "antd"; -import { createRef, useRef, useState } from "react"; +import { useRef, useState } from "react"; import TextArea from "antd/es/input/TextArea"; import Webcam from "react-webcam"; import { @@ -14,20 +13,17 @@ import { FullscreenOutlined, PlusOutlined, } from "@ant-design/icons"; -import { DocumentationImage } from "."; +import MyImage from "../../Components/MyImage"; function UploadComponent({ index, setImagePreview }) { const handleFileChange = (event) => { const file = event.target.files[0]; - console.log("file", event.target.files); + if (file) { const reader = new FileReader(); reader.onload = () => { //setImagePreview(URL.createObjectURL(file)); setImagePreview(reader.result); - - // base 64 string - // console.log(reader.result); }; reader.readAsDataURL(file); } @@ -116,49 +112,101 @@ export function NoteComponent({ description, onDescriptionChange, onDeleteImage, + imageDocumentationId, }) { - return ( - - - ] - : [ - , - , - , - , - ] - } - > - - - + const [isImageFullScreenModalOpen, setIsImageFullScreenModalOpen] = + useState(false); - - {viewMode ? ( - {description} - ) : ( -