Merge pull request #68 from REACT-DEVELOPER-IBROKHIM/feat/added-in-tank-functionality

Feat/added in tank functionality

Author: REACT-DEVELOPER-IBROKHIM

Diff for: client/src/components/documents/adr/back/AdrCertificateBack.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-const AdrCertificateBack = ({ type }) => {
+const AdrCertificateBack = ({ type, tank }) => {
   return (
     <div
       className={`w-[2480px] ${type !== "search" && "h-[3508px]"} flex justify-center`}
@@ -21,13 +21,17 @@ const AdrCertificateBack = ({ type }) => {
           </div>
           <div className="border-t-8 border-black w-full h-[630px] flex font-black text-[50px] text-left">
             <div className="w-[50%] h-full border-r-[3px] border-black px-[100px] flex flex-col gap-[10px] pt-[50px]">
-              <p>2</p>
-              <p>3</p>
-              <p>4.1, 4.2, 4.3</p>
-              <p>5.1, 5.2</p>
-              <p>6.1, 6.2</p>
-              <p>8</p>
-              <p>9</p>
+              {tank && (
+                <>
+                  <p>2</p>
+                  <p>3</p>
+                  <p>4.1, 4.2, 4.3</p>
+                  <p>5.1, 5.2</p>
+                  <p>6.1, 6.2</p>
+                  <p>8</p>
+                  <p>9</p>
+                </>
+              )}
             </div>
             <div className="w-[50%] h-full border-l-[3px] border-black px-[100px] flex flex-col gap-[10px] pt-[50px]">
               <p>2</p>

Diff for: client/src/components/documents/adr/index.jsx

@@ -8,7 +8,7 @@ const AdrCertificate = forwardRef(({ document, type }, ref) => {
   return (
     <div ref={ref}>
       <AdrCertificateFront type={type} document={document} ref={ref} />
-      <AdrCertificateBack type={type} />
+      <AdrCertificateBack type={type} tank={document?.tank} />
       <MiniCertificate
         document={document}
         type={type}

Diff for: client/src/routes/sub-routes/create/Create.jsx

@@ -42,6 +42,7 @@ const Create = () => {
       birthDate: "",
       from: "",
       to: "",
+      tank: false,
     },
   );
 

Diff for: 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 (
     <Form
       className="p-10"
@@ -168,6 +166,14 @@ const CreateForm = ({ setDocument, document }) => {
           />
         </Item>
       </div>
+      <Checkbox
+        checked={document.tank}
+        onChange={(e) =>
+          handleValuesChange({ ...document, tank: e.target.checked })
+        }
+      >
+        Sisterna
+      </Checkbox>
     </Form>
   );
 };

Diff for: 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 }) => {
           />
         </Item>
       </div>
+      <Checkbox
+        checked={document.tank}
+        onChange={(e) =>
+          handleValuesChange({ ...document, tank: e.target.checked })
+        }
+      >
+        Sisterna
+      </Checkbox>
     </Form>
   );
 };

Diff for: 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 for: 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 for: 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) {