From f16a617f43a2a150edce19df74bf0353d31178fc Mon Sep 17 00:00:00 2001 From: REACT-DEVELOPER-IBROKHIM Date: Mon, 10 Mar 2025 12:28:29 +0500 Subject: [PATCH 1/2] feat:added in tank or not in tank functionality --- .../documents/adr/back/AdrCertificateBack.jsx | 20 +++++++++++-------- client/src/components/documents/adr/index.jsx | 2 +- .../src/routes/sub-routes/create/Create.jsx | 1 + .../routes/sub-routes/create/form/index.jsx | 12 ++++++++--- .../src/routes/sub-routes/edit/form/index.jsx | 10 +++++++++- client/src/routes/sub-routes/edit/index.jsx | 1 - server/src/models/AdrCertificates.js | 4 ++++ server/src/routes/adrcertificates.js | 1 + 8 files changed, 37 insertions(+), 14 deletions(-) diff --git a/client/src/components/documents/adr/back/AdrCertificateBack.jsx b/client/src/components/documents/adr/back/AdrCertificateBack.jsx index d38522f..89202db 100644 --- a/client/src/components/documents/adr/back/AdrCertificateBack.jsx +++ b/client/src/components/documents/adr/back/AdrCertificateBack.jsx @@ -1,6 +1,6 @@ import React from "react"; -const AdrCertificateBack = ({ type }) => { +const AdrCertificateBack = ({ type, tank }) => { return (
{
-

2

-

3

-

4.1, 4.2, 4.3

-

5.1, 5.2

-

6.1, 6.2

-

8

-

9

+ {tank && + <> +

2

+

3

+

4.1, 4.2, 4.3

+

5.1, 5.2

+

6.1, 6.2

+

8

+

9

+ + }

2

diff --git a/client/src/components/documents/adr/index.jsx b/client/src/components/documents/adr/index.jsx index b9d26bd..54f5755 100644 --- a/client/src/components/documents/adr/index.jsx +++ b/client/src/components/documents/adr/index.jsx @@ -8,7 +8,7 @@ const AdrCertificate = forwardRef(({ document, type }, ref) => { return (
- + { birthDate: "", from: "", to: "", + tank: false }, ); diff --git a/client/src/routes/sub-routes/create/form/index.jsx b/client/src/routes/sub-routes/create/form/index.jsx index 17ff5e2..335ab20 100644 --- a/client/src/routes/sub-routes/create/form/index.jsx +++ b/client/src/routes/sub-routes/create/form/index.jsx @@ -1,7 +1,7 @@ import React from "react"; import { Form, Input } from "antd"; import dayjs from "dayjs"; -import { DatePicker } from "antd"; +import { DatePicker, Checkbox } from "antd"; import { DATE_FORMAT } from "@/constants/document"; import { setDataToLocalStorage } from "@/helpers/localStorageActions"; @@ -20,8 +20,6 @@ const CreateForm = ({ setDocument, document }) => { setDataToLocalStorage("document", { ...document, ...values }); }; - console.log(document); - return (
{ />
+ + handleValuesChange({ ...document, tank: e.target.checked }) + } + > + Sisterna + ); }; diff --git a/client/src/routes/sub-routes/edit/form/index.jsx b/client/src/routes/sub-routes/edit/form/index.jsx index 7617ebc..89ea650 100644 --- a/client/src/routes/sub-routes/edit/form/index.jsx +++ b/client/src/routes/sub-routes/edit/form/index.jsx @@ -1,7 +1,7 @@ import React from "react"; import { Form, Input } from "antd"; import dayjs from "dayjs"; -import { DatePicker } from "antd"; +import { DatePicker, Checkbox } from "antd"; import { DATE_FORMAT } from "@/constants/document"; import { setDataToLocalStorage } from "@/helpers/localStorageActions"; @@ -204,6 +204,14 @@ const EditForm = ({ setDocument, document, form }) => { />
+ + handleValuesChange({ ...document, tank: e.target.checked }) + } + > + Sisterna + ); }; diff --git a/client/src/routes/sub-routes/edit/index.jsx b/client/src/routes/sub-routes/edit/index.jsx index 0c4067e..b0fa80e 100644 --- a/client/src/routes/sub-routes/edit/index.jsx +++ b/client/src/routes/sub-routes/edit/index.jsx @@ -4,7 +4,6 @@ import { ArrowLeftOutlined, ArrowRightOutlined, EditOutlined, - EyeOutlined, SaveOutlined, } from "@ant-design/icons"; import EditForm from "./form"; diff --git a/server/src/models/AdrCertificates.js b/server/src/models/AdrCertificates.js index d50fe95..d8d4bcf 100644 --- a/server/src/models/AdrCertificates.js +++ b/server/src/models/AdrCertificates.js @@ -42,6 +42,10 @@ const Adr = new mongoose.Schema({ type: Boolean, default: false, }, + tank: { + type: Boolean, + default: false + } }) const model = mongoose.model('Adr', Adr) diff --git a/server/src/routes/adrcertificates.js b/server/src/routes/adrcertificates.js index d1bb808..3b9e115 100644 --- a/server/src/routes/adrcertificates.js +++ b/server/src/routes/adrcertificates.js @@ -24,6 +24,7 @@ certificate.post('/', verifyAdmin, async (req, res) => { birthDate: req.body.birthDate, from: req.body.from, to: req.body.to, + tank: req.body.tank, }) res.status(201).json(newCertificate) } catch (err) { From 144c2277e75bfe6eebf4ac1c6503cf065973615a Mon Sep 17 00:00:00 2001 From: REACT-DEVELOPER-IBROKHIM Date: Mon, 10 Mar 2025 12:29:21 +0500 Subject: [PATCH 2/2] fix:formatting --- .../src/components/documents/adr/back/AdrCertificateBack.jsx | 4 ++-- client/src/routes/sub-routes/create/Create.jsx | 2 +- server/src/models/AdrCertificates.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/components/documents/adr/back/AdrCertificateBack.jsx b/client/src/components/documents/adr/back/AdrCertificateBack.jsx index 89202db..7ae1e8c 100644 --- a/client/src/components/documents/adr/back/AdrCertificateBack.jsx +++ b/client/src/components/documents/adr/back/AdrCertificateBack.jsx @@ -21,7 +21,7 @@ const AdrCertificateBack = ({ type, tank }) => {
- {tank && + {tank && ( <>

2

3

@@ -31,7 +31,7 @@ const AdrCertificateBack = ({ type, tank }) => {

8

9

- } + )}

2

diff --git a/client/src/routes/sub-routes/create/Create.jsx b/client/src/routes/sub-routes/create/Create.jsx index 21b8765..670519c 100644 --- a/client/src/routes/sub-routes/create/Create.jsx +++ b/client/src/routes/sub-routes/create/Create.jsx @@ -42,7 +42,7 @@ const Create = () => { birthDate: "", from: "", to: "", - tank: false + tank: false, }, ); diff --git a/server/src/models/AdrCertificates.js b/server/src/models/AdrCertificates.js index d8d4bcf..7dd50d7 100644 --- a/server/src/models/AdrCertificates.js +++ b/server/src/models/AdrCertificates.js @@ -44,8 +44,8 @@ const Adr = new mongoose.Schema({ }, tank: { type: Boolean, - default: false - } + default: false, + }, }) const model = mongoose.model('Adr', Adr)