From fc6feca92dff6c0aa221a1258917c8edef7e813f Mon Sep 17 00:00:00 2001
From: M1kola <gigablock3030@yandex.ru>
Date: Thu, 22 Jun 2023 19:43:12 +0300
Subject: [PATCH 1/3] correctProjectUsers

---
 .../Modal/TrackerModal/trackerModal.scss      |  1 +
 src/components/UI/ModalTicket/ModalTicket.jsx | 64 +++++++++++++------
 .../UI/ModalTicket/modalTicket.scss           | 12 +++-
 src/pages/Tracker/tracker.scss                |  2 +-
 4 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/src/components/Modal/TrackerModal/trackerModal.scss b/src/components/Modal/TrackerModal/trackerModal.scss
index 8e73a9f1..5bba0676 100644
--- a/src/components/Modal/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/TrackerModal/trackerModal.scss
@@ -76,6 +76,7 @@
       cursor: pointer;
       width: 100%;
       position: relative;
+      margin-bottom: 10px;
 
       p {
         max-width: 150px;
diff --git a/src/components/UI/ModalTicket/ModalTicket.jsx b/src/components/UI/ModalTicket/ModalTicket.jsx
index ba3b2025..41627bdb 100644
--- a/src/components/UI/ModalTicket/ModalTicket.jsx
+++ b/src/components/UI/ModalTicket/ModalTicket.jsx
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
 import TrackerModal from "../../../components/Modal/TrackerModal/TrackerModal";
 import TrackerTaskComment from "../../../components/TrackerTaskComment/TrackerTaskComment";
 import { apiRequest } from "../../../api/request";
-import { useDispatch } from "react-redux";
+import {useDispatch, useSelector} from "react-redux";
 import "./modalTicket.scss"
 import {
   modalToggle,
@@ -24,6 +24,7 @@ import fullScreen from "../../../assets/icons/arrows/inFullScreen.svg";
 import close from "../../../assets/icons/closeProjectPersons.svg";
 
 import {urlForLocal, getCorrectRequestDate} from "../../../utils/helper";
+import {getProfileInfo} from "@redux/outstaffingSlice";
 
 export const ModalTiсket = ({
   active,
@@ -51,6 +52,9 @@ export const ModalTiсket = ({
     seconds: 0
   })
   const [timerId, setTimerId] = useState(null)
+  const [correctProjectUsers, setCorrectProjectUsers] = useState(projectUsers)
+  const [executorId, setExecutorId] = useState(task.executor_id)
+  const profileInfo = useSelector(getProfileInfo);
 
   function deleteTask() {
     apiRequest("/task/update-task", {
@@ -168,8 +172,10 @@ export const ModalTiсket = ({
         executor_id: person.user_id
       },
     }).then((res) => {
+      setExecutorId(person.user_id)
       setDropListOpen(false)
       setExecutor(res.executor)
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -181,7 +187,9 @@ export const ModalTiсket = ({
         executor_id: 0
       },
     }).then(() => {
-      setExecutor(null)
+      setExecutorId(null)
+      setExecutor(null);
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -195,6 +203,7 @@ export const ModalTiсket = ({
     }).then((res) => {
       setDropListMembersOpen(false)
       setMembers((prevValue) => ([...prevValue, res]))
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -206,7 +215,8 @@ export const ModalTiсket = ({
         user_id: person.user_id
       },
     }).then(() => {
-      setMembers(members.filter((item) => item.user_id !== person.user_id))
+      setMembers(members.filter((item) => item.user_id !== person.user_id));
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -243,6 +253,16 @@ export const ModalTiсket = ({
         }
       })
     })
+
+    if (localStorage.getItem("role_status") !== "18" && Boolean(!correctProjectUsers.find((item) => item.user_id === profileInfo.id_user))) {
+      setCorrectProjectUsers((prevState) => [...prevState, {
+        user: {
+          avatar: profileInfo.photo,
+          fio: profileInfo.fio
+        },
+        user_id: profileInfo.id_user
+      }])
+    }
   }, [])
 
   function startTimer () {
@@ -313,23 +333,24 @@ export const ModalTiсket = ({
               setInputsValue((prevValue) => ({...prevValue, title: e.target.value}))
             }} /> :<h5>{inputsValue.title}</h5>}
             <div className="content__description">
-              {editOpen ? <input value={inputsValue.description} onChange={(e) => {
+              {editOpen ?
+                  <textarea value={inputsValue.description} onChange={(e) => {
                 setInputsValue((prevValue) => ({...prevValue, description: e.target.value}))
               }}/> :<p>{inputsValue.description}</p>}
               {/*<img src={taskImg} className="image-task"></img>*/}
             </div>
             <div className="content__communication">
-              <p className="tasks">
-                <button
-                  onClick={() => {
-                    dispatch(modalToggle("addSubtask"));
-                    setAddSubtask(true);
-                  }}
-                >
-                  <img src={plus}></img>
-                  Добавить под задачу
-                </button>
-              </p>
+              {/*<p className="tasks">*/}
+              {/*  <button*/}
+              {/*    onClick={() => {*/}
+              {/*      dispatch(modalToggle("addSubtask"));*/}
+              {/*      setAddSubtask(true);*/}
+              {/*    }}*/}
+              {/*  >*/}
+              {/*    <img src={plus}></img>*/}
+              {/*    Добавить под задачу*/}
+              {/*  </button>*/}
+              {/*</p>*/}
               <p className="file">
                 <button>
                   <img src={file}></img>
@@ -378,7 +399,7 @@ export const ModalTiсket = ({
                 {dropListOpen &&
                   <div className='dropdownList'>
                     <img src={close} className='dropdownList__close' onClick={() => setDropListOpen(false)} />
-                    {projectUsers.map((person) => {
+                    {correctProjectUsers.map((person) => {
                       return <div className='dropdownList__person' key={person.user_id} onClick={() => taskExecutor(person)}>
                         <span>{person.user.fio}</span>
                         <img src={urlForLocal(person.user.avatar)} />
@@ -434,12 +455,17 @@ export const ModalTiсket = ({
             </div>
 
             {timerStart ?
-              <button className="stop" onClick={() => stopTaskTimer()}>
+              <button
+                  className={executorId === Number(localStorage.getItem('id')) ? 'stop' : 'stop disable'}
+                  onClick={() => stopTaskTimer()}>
                 Остановить
               </button>
                 :
-              <button className={task.executor_id === Number(localStorage.getItem('id')) ? 'start' : 'start disable'} onClick={() => startTaskTimer()}>
-                Начать делать <img src={arrow}></img>
+              <button
+                  className={executorId === Number(localStorage.getItem('id')) ? 'start' : 'start disable'}
+                  onClick={() => startTaskTimer()}>
+                Начать делать
+                <img src={arrow}></img>
               </button>
             }
           </div>
diff --git a/src/components/UI/ModalTicket/modalTicket.scss b/src/components/UI/ModalTicket/modalTicket.scss
index 5912f569..8cd2293b 100644
--- a/src/components/UI/ModalTicket/modalTicket.scss
+++ b/src/components/UI/ModalTicket/modalTicket.scss
@@ -248,6 +248,16 @@
         margin: 10px 0 20px 0;
         max-width: 330px;
       }
+
+      textarea {
+        height: 100px;
+        outline: none;
+        font-weight: 400;
+        font-size: 14px;
+        line-height: 140%;
+        color: #252c32;
+        resize: none;
+      }
     }
 
     &__communication {
@@ -279,7 +289,7 @@
 
       .file {
         justify-content: space-between;
-        margin-left: 20px;
+        margin-left: 7px;
 
         button {
           display: flex;
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index 7c9e2395..5722ec1f 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -365,7 +365,7 @@
               &__items {
                 display: flex;
                 flex-wrap: wrap;
-                row-gap: 60px;
+                row-gap: 10px;
                 column-gap: 35px;
                 margin-bottom: 38px;
               }

From af8704eafe02cdc961ed28e4188401d8075d07c2 Mon Sep 17 00:00:00 2001
From: M1kola <gigablock3030@yandex.ru>
Date: Mon, 26 Jun 2023 12:57:33 +0300
Subject: [PATCH 2/3] Merge branch 'main' into tracker-connect-back

---
 .../Modal/Tracker/ModalTicket/ModalTicket.jsx | 142 ++--
 .../Tracker/ModalTicket/modalTicket.scss      |   5 +
 src/components/UI/ModalTicket/ModalTicket.jsx | 610 ------------------
 3 files changed, 86 insertions(+), 671 deletions(-)
 delete mode 100644 src/components/UI/ModalTicket/ModalTicket.jsx

diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
index 1b3ec8c7..fe3d4e14 100644
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@@ -1,14 +1,13 @@
 import React, { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { Link } from "react-router-dom";
 
-import { modalToggle, setProjectBoardFetch } from "@redux/projectsTrackerSlice";
+import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";
 
 import { getCorrectRequestDate, urlForLocal } from "@utils/helper";
 
 import { apiRequest } from "@api/request";
 
-import BaseButton from "@components/Common/BaseButton/BaseButton";
 import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
 import TrackerTaskComment from "@components/TrackerTaskComment/TrackerTaskComment";
 
@@ -21,11 +20,11 @@ import del from "assets/icons/delete.svg";
 import edit from "assets/icons/edit.svg";
 import file from "assets/icons/fileModal.svg";
 import link from "assets/icons/link.svg";
-import plus from "assets/icons/plus.svg";
 import send from "assets/icons/send.svg";
 import watch from "assets/icons/watch.svg";
 
 import "./modalTicket.scss";
+import { getProfileInfo } from "@redux/outstaffingSlice";
 
 export const ModalTiсket = ({
   active,
@@ -57,6 +56,9 @@ export const ModalTiсket = ({
     seconds: 0,
   });
   const [timerId, setTimerId] = useState(null);
+  const [correctProjectUsers, setCorrectProjectUsers] = useState(projectUsers);
+  const [executorId, setExecutorId] = useState(task.executor_id);
+  const profileInfo = useSelector(getProfileInfo);
 
   function deleteTask() {
     apiRequest("/task/update-task", {
@@ -65,7 +67,7 @@ export const ModalTiсket = ({
         task_id: task.id,
         status: 0,
       },
-    }).then(() => {
+    }).then((res) => {
       setActive(false);
       dispatch(setProjectBoardFetch(projectId));
     });
@@ -79,7 +81,7 @@ export const ModalTiсket = ({
         title: inputsValue.title,
         description: inputsValue.description,
       },
-    }).then(() => {
+    }).then((res) => {
       dispatch(setProjectBoardFetch(projectId));
     });
   }
@@ -177,8 +179,10 @@ export const ModalTiсket = ({
         executor_id: person.user_id,
       },
     }).then((res) => {
+      setExecutorId(person.user_id);
       setDropListOpen(false);
       setExecutor(res.executor);
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -190,7 +194,9 @@ export const ModalTiсket = ({
         executor_id: 0,
       },
     }).then(() => {
+      setExecutorId(null);
       setExecutor(null);
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -204,6 +210,7 @@ export const ModalTiсket = ({
     }).then((res) => {
       setDropListMembersOpen(false);
       setMembers((prevValue) => [...prevValue, res]);
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -216,6 +223,7 @@ export const ModalTiсket = ({
       },
     }).then(() => {
       setMembers(members.filter((item) => item.user_id !== person.user_id));
+      dispatch(setProjectBoardFetch(projectId));
     });
   }
 
@@ -239,24 +247,40 @@ export const ModalTiсket = ({
       (res) => {
         let timerSeconds = 0;
         res.length &&
-          res.forEach((time) => {
-            timerSeconds += time.deltaSeconds;
-            setCurrentTimerCount({
-              hours: Math.floor(timerSeconds / 60 / 60),
-              minute: Math.floor((timerSeconds / 60) % 60),
-              seconds: timerSeconds % 60,
-            });
-            updateTimerHours = Math.floor(timerSeconds / 60 / 60);
-            updateTimerMinute = Math.floor((timerSeconds / 60) % 60);
-            updateTimerSec = timerSeconds % 60;
-            if (!time.stopped_at) {
-              setTimerStart(true);
-              startTimer();
-              setTimerInfo(time);
-            }
+        res.forEach((time) => {
+          timerSeconds += time.deltaSeconds;
+          setCurrentTimerCount({
+            hours: Math.floor(timerSeconds / 60 / 60),
+            minute: Math.floor((timerSeconds / 60) % 60),
+            seconds: timerSeconds % 60,
           });
+          updateTimerHours = Math.floor(timerSeconds / 60 / 60);
+          updateTimerMinute = Math.floor((timerSeconds / 60) % 60);
+          updateTimerSec = timerSeconds % 60;
+          if (!time.stopped_at) {
+            setTimerStart(true);
+            startTimer();
+            setTimerInfo(time);
+          }
+        });
       }
     );
+
+    if (
+      localStorage.getItem("role_status") !== "18" &&
+      Boolean(!correctProjectUsers.find((item) => item.user_id === profileInfo.id_user))
+    ) {
+      setCorrectProjectUsers((prevState) => [
+        ...prevState,
+        {
+          user: {
+            avatar: profileInfo.photo,
+            fio: profileInfo.fio,
+          },
+          user_id: profileInfo.id_user,
+        },
+      ]);
+    }
   }, []);
 
   function startTimer() {
@@ -314,17 +338,16 @@ export const ModalTiсket = ({
         onClick={(e) => e.stopPropagation()}
       >
         <div className="content">
-          <Link to={`/tracker/task/${task.id}`} className="title-project__full">
-            <img src={fullScreen}></img>
-          </Link>
-
-          <div className="title-project">
+          <h3 className="title-project">
             <img src={category} className="title-project__category"></img>
-            <h2>
-              Проект:
-              <h3>{projectName}</h3>
-            </h2>
-          </div>
+            Проект: {projectName}
+            <Link
+              to={`/tracker/task/${task.id}`}
+              className="title-project__full"
+            >
+              <img src={fullScreen}></img>
+            </Link>
+          </h3>
 
           <div className="content__task">
             <span>Задача</span>
@@ -358,23 +381,22 @@ export const ModalTiсket = ({
               {/*<img src={taskImg} className="image-task"></img>*/}
             </div>
             <div className="content__communication">
-              <p className="tasks">
-                <BaseButton
-                  onClick={() => {
-                    dispatch(modalToggle("addSubtask"));
-                    setAddSubtask(true);
-                  }}
-                  styles={"button-green-add"}
-                >
-                  <img src={plus}></img>
-                  Добавить под задачу
-                </BaseButton>
-              </p>
+              {/*<p className="tasks">*/}
+              {/*  <button*/}
+              {/*    onClick={() => {*/}
+              {/*      dispatch(modalToggle("addSubtask"));*/}
+              {/*      setAddSubtask(true);*/}
+              {/*    }}*/}
+              {/*  >*/}
+              {/*    <img src={plus}></img>*/}
+              {/*    Добавить под задачу*/}
+              {/*  </button>*/}
+              {/*</p>*/}
               <p className="file">
-                <BaseButton styles={"button-add-file"}>
+                <button className='button-add-file'>
                   <img src={file}></img>
                   Загрузить файл
-                </BaseButton>
+                </button>
                 <span>{0}</span>
                 Файлов
               </p>
@@ -426,12 +448,7 @@ export const ModalTiсket = ({
               </div>
             ) : (
               <div className="add-worker moreItems ">
-                <BaseButton
-                  onClick={() => setDropListOpen(true)}
-                  styles={"button-add-worker"}
-                >
-                  +
-                </BaseButton>
+                <button className='button-add-worker' onClick={() => setDropListOpen(true)}>+</button>
                 <span>Добавить исполнителя</span>
                 {dropListOpen && (
                   <div className="dropdownList">
@@ -440,7 +457,7 @@ export const ModalTiсket = ({
                       className="dropdownList__close"
                       onClick={() => setDropListOpen(false)}
                     />
-                    {projectUsers.map((person) => {
+                    {correctProjectUsers.map((person) => {
                       return (
                         <div
                           className="dropdownList__person"
@@ -479,12 +496,7 @@ export const ModalTiсket = ({
             )}
 
             <div className="add-worker moreItems">
-              <BaseButton
-                onClick={() => setDropListMembersOpen(true)}
-                styles={"button-add-worker"}
-              >
-                +
-              </BaseButton>
+              <button className='button-add-worker' onClick={() => setDropListMembersOpen(true)}>+</button>
               <span>Добавить участников</span>
               {dropListMembersOpen && (
                 <div className="dropdownList">
@@ -526,19 +538,27 @@ export const ModalTiсket = ({
             </div>
 
             {timerStart ? (
-              <button className="stop" onClick={() => stopTaskTimer()}>
+              <button
+                className={
+                  executorId === Number(localStorage.getItem("id"))
+                    ? "stop"
+                    : "stop disable"
+                }
+                onClick={() => stopTaskTimer()}
+              >
                 Остановить
               </button>
             ) : (
               <button
                 className={
-                  task.executor_id === Number(localStorage.getItem("id"))
+                  executorId === Number(localStorage.getItem("id"))
                     ? "start"
                     : "start disable"
                 }
                 onClick={() => startTaskTimer()}
               >
-                Начать делать <img src={arrow}></img>
+                Начать делать
+                <img src={arrow}></img>
               </button>
             )}
           </div>
diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
index eefb5eb6..ac7925b8 100644
--- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
+++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
@@ -447,11 +447,16 @@
       }
 
       .button-add-worker {
+        cursor: pointer;
+        background: #8bcc60;
+        border-radius: 44px;
         width: 33px;
         height: 33px;
         display: flex;
         justify-content: center;
         align-items: center;
+        border: none;
+        color: white;
         font-size: 17px;
       }
     }
diff --git a/src/components/UI/ModalTicket/ModalTicket.jsx b/src/components/UI/ModalTicket/ModalTicket.jsx
deleted file mode 100644
index 4052fdd3..00000000
--- a/src/components/UI/ModalTicket/ModalTicket.jsx
+++ /dev/null
@@ -1,610 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { Link } from "react-router-dom";
-
-import { getProfileInfo } from "@redux/outstaffingSlice";
-
-import { apiRequest } from "../../../api/request";
-import archive from "../../../assets/icons/archive.svg";
-import arrow from "../../../assets/icons/arrows/arrowStart.png";
-import fullScreen from "../../../assets/icons/arrows/inFullScreen.svg";
-import category from "../../../assets/icons/category.svg";
-import close from "../../../assets/icons/closeProjectPersons.svg";
-import del from "../../../assets/icons/delete.svg";
-import edit from "../../../assets/icons/edit.svg";
-import file from "../../../assets/icons/fileModal.svg";
-import link from "../../../assets/icons/link.svg";
-import plus from "../../../assets/icons/plus.svg";
-import send from "../../../assets/icons/send.svg";
-import watch from "../../../assets/icons/watch.svg";
-import TrackerModal from "../../../components/Modal/TrackerModal/TrackerModal";
-import TrackerTaskComment from "../../../components/TrackerTaskComment/TrackerTaskComment";
-import {
-  modalToggle,
-  setProjectBoardFetch,
-} from "../../../redux/projectsTrackerSlice";
-import { getCorrectRequestDate, urlForLocal } from "../../../utils/helper";
-import "./modalTicket.scss";
-
-export const ModalTiсket = ({
-  active,
-  setActive,
-  task,
-  projectId,
-  projectName,
-  projectUsers,
-}) => {
-  const dispatch = useDispatch();
-  const [addSubtask, setAddSubtask] = useState(false);
-  const [editOpen, setEditOpen] = useState(false);
-  const [inputsValue, setInputsValue] = useState({
-    title: task.title,
-    description: task.description,
-    comment: "",
-  });
-  const [comments, setComments] = useState([]);
-  const [dropListOpen, setDropListOpen] = useState(false);
-  const [dropListMembersOpen, setDropListMembersOpen] = useState(false);
-  const [executor, setExecutor] = useState(task.executor);
-  const [members, setMembers] = useState(task.taskUsers);
-  const [users, setUsers] = useState([]);
-  const [timerStart, setTimerStart] = useState(false);
-  const [timerInfo, setTimerInfo] = useState({});
-  const [currentTimerCount, setCurrentTimerCount] = useState({
-    hours: 0,
-    minute: 0,
-    seconds: 0,
-  });
-  const [timerId, setTimerId] = useState(null);
-  const [correctProjectUsers, setCorrectProjectUsers] = useState(projectUsers);
-  const [executorId, setExecutorId] = useState(task.executor_id);
-  const profileInfo = useSelector(getProfileInfo);
-
-  function deleteTask() {
-    apiRequest("/task/update-task", {
-      method: "PUT",
-      data: {
-        task_id: task.id,
-        status: 0,
-      },
-    }).then((res) => {
-      setActive(false);
-      dispatch(setProjectBoardFetch(projectId));
-    });
-  }
-
-  function editTask() {
-    apiRequest("/task/update-task", {
-      method: "PUT",
-      data: {
-        task_id: task.id,
-        title: inputsValue.title,
-        description: inputsValue.description,
-      },
-    }).then((res) => {
-      dispatch(setProjectBoardFetch(projectId));
-    });
-  }
-
-  function createComment() {
-    apiRequest("/comment/create", {
-      method: "POST",
-      data: {
-        text: inputsValue.comment,
-        entity_type: 2,
-        entity_id: task.id,
-      },
-    }).then((res) => {
-      let newComment = res;
-      newComment.created_at = new Date();
-      newComment.subComments = [];
-      setInputsValue((prevValue) => ({ ...prevValue, comment: "" }));
-      setComments((prevValue) => [...prevValue, newComment]);
-    });
-  }
-
-  function commentDelete(comment) {
-    setComments((prevValue) =>
-      prevValue.filter((item) => item.id !== comment.id)
-    );
-    if (comment.subComments.length) {
-      // promiseAll
-      comment.subComments.forEach((subComment) => {
-        apiRequest("/comment/update", {
-          method: "PUT",
-          data: {
-            comment_id: subComment.id,
-            status: 0,
-          },
-        }).then(() => {});
-      });
-    }
-  }
-
-  function addSubComment(commentId, subComment) {
-    const addSubComment = comments;
-    addSubComment.forEach((comment) => {
-      if (comment.id === commentId) {
-        comment.subComments.push(subComment);
-      }
-    });
-    setComments(addSubComment);
-  }
-
-  function subCommentDelete(subComment) {
-    const deleteSubComment = comments;
-    deleteSubComment.forEach((comment, index) => {
-      if (comment.id === subComment.parent_id) {
-        deleteSubComment[index].subComments = comment.subComments.filter(
-          (item) => item.id !== subComment.id
-        );
-      }
-    });
-    setComments([...deleteSubComment]);
-  }
-
-  function startTaskTimer() {
-    apiRequest("/timer/create", {
-      method: "POST",
-      data: {
-        entity_type: 2,
-        entity_id: task.id,
-        created_at: getCorrectRequestDate(new Date()),
-      },
-    }).then((res) => {
-      setTimerStart(true);
-      setTimerInfo(res);
-      startTimer();
-    });
-  }
-
-  function stopTaskTimer() {
-    apiRequest("/timer/update", {
-      method: "PUT",
-      data: {
-        timer_id: timerInfo.id,
-        stopped_at: getCorrectRequestDate(new Date()),
-      },
-    }).then(() => {
-      setTimerStart(false);
-      clearInterval(timerId);
-    });
-  }
-
-  function taskExecutor(person) {
-    apiRequest("/task/update-task", {
-      method: "PUT",
-      data: {
-        task_id: task.id,
-        executor_id: person.user_id,
-      },
-    }).then((res) => {
-      setExecutorId(person.user_id);
-      setDropListOpen(false);
-      setExecutor(res.executor);
-      dispatch(setProjectBoardFetch(projectId));
-    });
-  }
-
-  function deleteTaskExecutor() {
-    apiRequest("/task/update-task", {
-      method: "PUT",
-      data: {
-        task_id: task.id,
-        executor_id: 0,
-      },
-    }).then(() => {
-      setExecutorId(null);
-      setExecutor(null);
-      dispatch(setProjectBoardFetch(projectId));
-    });
-  }
-
-  function addMember(person) {
-    apiRequest("/task/add-user-to-task", {
-      method: "POST",
-      data: {
-        task_id: task.id,
-        user_id: person.user_id,
-      },
-    }).then((res) => {
-      setDropListMembersOpen(false);
-      setMembers((prevValue) => [...prevValue, res]);
-      dispatch(setProjectBoardFetch(projectId));
-    });
-  }
-
-  function deleteMember(person) {
-    apiRequest("/task/del-user", {
-      method: "DELETE",
-      data: {
-        task_id: task.id,
-        user_id: person.user_id,
-      },
-    }).then(() => {
-      setMembers(members.filter((item) => item.user_id !== person.user_id));
-      dispatch(setProjectBoardFetch(projectId));
-    });
-  }
-
-  useEffect(() => {
-    apiRequest(
-      `/comment/get-by-entity?entity_type=2&entity_id=${task.id}`
-    ).then((res) => {
-      const comments = res.reduce((acc, cur) => {
-        if (!cur.parent_id) {
-          acc.push({ ...cur, subComments: [] });
-        } else {
-          acc.forEach((item) => {
-            if (item.id === cur.parent_id) item.subComments.push(cur);
-          });
-        }
-        return acc;
-      }, []);
-      setComments(comments);
-    });
-    apiRequest(`/timer/get-by-entity?entity_type=2&entity_id=${task.id}`).then(
-      (res) => {
-        let timerSeconds = 0;
-        res.length &&
-          res.forEach((time) => {
-            timerSeconds += time.deltaSeconds;
-            setCurrentTimerCount({
-              hours: Math.floor(timerSeconds / 60 / 60),
-              minute: Math.floor((timerSeconds / 60) % 60),
-              seconds: timerSeconds % 60,
-            });
-            updateTimerHours = Math.floor(timerSeconds / 60 / 60);
-            updateTimerMinute = Math.floor((timerSeconds / 60) % 60);
-            updateTimerSec = timerSeconds % 60;
-            if (!time.stopped_at) {
-              setTimerStart(true);
-              startTimer();
-              setTimerInfo(time);
-            }
-          });
-      }
-    );
-
-    if (
-      localStorage.getItem("role_status") !== "18" &&
-      Boolean(
-        !correctProjectUsers.find(
-          (item) => item.user_id === profileInfo.id_user
-        )
-      )
-    ) {
-      setCorrectProjectUsers((prevState) => [
-        ...prevState,
-        {
-          user: {
-            avatar: profileInfo.photo,
-            fio: profileInfo.fio,
-          },
-          user_id: profileInfo.id_user,
-        },
-      ]);
-    }
-  }, []);
-
-  function startTimer() {
-    setTimerId(
-      setInterval(() => {
-        run();
-      }, 1000)
-    );
-  }
-
-  let updateTimerSec = currentTimerCount.seconds,
-    updateTimerMinute = currentTimerCount.minute,
-    updateTimerHours = currentTimerCount.hours;
-
-  function run() {
-    updateTimerSec++;
-    if (updateTimerSec > 60) {
-      updateTimerMinute++;
-      updateTimerSec = 0;
-    }
-    if (updateTimerMinute === 60) {
-      updateTimerMinute = 0;
-      updateTimerHours++;
-    }
-
-    return setCurrentTimerCount({
-      hours: updateTimerHours,
-      minute: updateTimerMinute,
-      seconds: updateTimerSec,
-    });
-  }
-
-  function correctTimerTime(time) {
-    if (time < 10) return `0${time}`;
-    if (time > 10) return time;
-  }
-
-  useEffect(() => {
-    let ids = members.map((user) => user.user_id);
-    setUsers(
-      projectUsers.reduce((acc, cur) => {
-        if (!ids.includes(cur.user_id)) acc.push(cur);
-        return acc;
-      }, [])
-    );
-  }, [members]);
-
-  return (
-    <div
-      className={active ? "modal-tiket active" : "modal-tiket"}
-      onClick={() => setActive(false)}
-    >
-      <div
-        className="modal-tiket__content"
-        onClick={(e) => e.stopPropagation()}
-      >
-        <div className="content">
-          <h3 className="title-project">
-            <img src={category} className="title-project__category"></img>
-            Проект: {projectName}
-            <Link
-              to={`/tracker/task/${task.id}`}
-              className="title-project__full"
-            >
-              <img src={fullScreen}></img>
-            </Link>
-          </h3>
-
-          <div className="content__task">
-            <span>Задача</span>
-            {editOpen ? (
-              <input
-                value={inputsValue.title}
-                onChange={(e) => {
-                  setInputsValue((prevValue) => ({
-                    ...prevValue,
-                    title: e.target.value,
-                  }));
-                }}
-              />
-            ) : (
-              <h5>{inputsValue.title}</h5>
-            )}
-            <div className="content__description">
-              {editOpen ? (
-                <textarea
-                  value={inputsValue.description}
-                  onChange={(e) => {
-                    setInputsValue((prevValue) => ({
-                      ...prevValue,
-                      description: e.target.value,
-                    }));
-                  }}
-                />
-              ) : (
-                <p>{inputsValue.description}</p>
-              )}
-              {/*<img src={taskImg} className="image-task"></img>*/}
-            </div>
-            <div className="content__communication">
-              {/*<p className="tasks">*/}
-              {/*  <button*/}
-              {/*    onClick={() => {*/}
-              {/*      dispatch(modalToggle("addSubtask"));*/}
-              {/*      setAddSubtask(true);*/}
-              {/*    }}*/}
-              {/*  >*/}
-              {/*    <img src={plus}></img>*/}
-              {/*    Добавить под задачу*/}
-              {/*  </button>*/}
-              {/*</p>*/}
-              <p className="file">
-                <button>
-                  <img src={file}></img>
-                  Загрузить файл
-                </button>
-                <span>{0}</span>
-                Файлов
-              </p>
-            </div>
-            <div className="content__input">
-              <input
-                placeholder="Оставить комментарий"
-                value={inputsValue.comment}
-                onChange={(e) => {
-                  setInputsValue((prevValue) => ({
-                    ...prevValue,
-                    comment: e.target.value,
-                  }));
-                }}
-              />
-              <img src={send} onClick={createComment}></img>
-            </div>
-            <div className="comments__list">
-              {comments.map((comment) => {
-                return (
-                  <TrackerTaskComment
-                    key={comment.id}
-                    taskId={task.id}
-                    comment={comment}
-                    commentDelete={commentDelete}
-                    addSubComment={addSubComment}
-                    subCommentDelete={subCommentDelete}
-                  />
-                );
-              })}
-            </div>
-          </div>
-        </div>
-        <div className="workers">
-          <div className="workers_box task__info">
-            <span className="exit" onClick={() => setActive(false)}></span>
-            <span className="nameProject">{task.title}</span>
-            <p className="workers__creator">Создатель : {task.user?.fio}</p>
-
-            {executor ? (
-              <div className="executor">
-                <p>Исполнитель: {executor.fio}</p>
-                <img src={urlForLocal(executor.avatar)} alt="avatar" />
-                <img
-                  src={close}
-                  className="delete"
-                  onClick={() => deleteTaskExecutor()}
-                />
-              </div>
-            ) : (
-              <div className="add-worker moreItems ">
-                <button onClick={() => setDropListOpen(true)}>+</button>
-                <span>Добавить исполнителя</span>
-                {dropListOpen && (
-                  <div className="dropdownList">
-                    <img
-                      src={close}
-                      className="dropdownList__close"
-                      onClick={() => setDropListOpen(false)}
-                    />
-                    {correctProjectUsers.map((person) => {
-                      return (
-                        <div
-                          className="dropdownList__person"
-                          key={person.user_id}
-                          onClick={() => taskExecutor(person)}
-                        >
-                          <span>{person.user.fio}</span>
-                          <img src={urlForLocal(person.user.avatar)} />
-                        </div>
-                      );
-                    })}
-                  </div>
-                )}
-              </div>
-            )}
-
-            {Boolean(members.length) && (
-              <div className="members">
-                <p>Участники:</p>
-                <div className="members__list">
-                  {members.map((member) => {
-                    return (
-                      <div className="worker" key={member.user_id}>
-                        <p>{member.fio}</p>
-                        <img src={urlForLocal(member.avatar)} />
-                        <img
-                          src={close}
-                          className="delete"
-                          onClick={() => deleteMember(member)}
-                        />
-                      </div>
-                    );
-                  })}
-                </div>
-              </div>
-            )}
-
-            <div className="add-worker moreItems">
-              <button onClick={() => setDropListMembersOpen(true)}>+</button>
-              <span>Добавить участников</span>
-              {dropListMembersOpen && (
-                <div className="dropdownList">
-                  <img
-                    src={close}
-                    className="dropdownList__close"
-                    onClick={() => setDropListMembersOpen(false)}
-                  />
-                  {users.length ? (
-                    users.map((person) => {
-                      return (
-                        <div
-                          className="dropdownList__person"
-                          key={person.user_id}
-                          onClick={() => addMember(person)}
-                        >
-                          <span>{person.user.fio}</span>
-                          <img src={urlForLocal(person.user.avatar)} />
-                        </div>
-                      );
-                    })
-                  ) : (
-                    <p className="noUsers">Нет пользователей</p>
-                  )}
-                </div>
-              )}
-            </div>
-          </div>
-
-          <div className="workers_box-middle">
-            <div className="time">
-              <img src={watch}></img>
-              <span>Длительность : </span>
-              <p>
-                {correctTimerTime(currentTimerCount.hours)}:
-                {correctTimerTime(currentTimerCount.minute)}:
-                {correctTimerTime(currentTimerCount.seconds)}
-              </p>
-            </div>
-
-            {timerStart ? (
-              <button
-                className={
-                  executorId === Number(localStorage.getItem("id"))
-                    ? "stop"
-                    : "stop disable"
-                }
-                onClick={() => stopTaskTimer()}
-              >
-                Остановить
-              </button>
-            ) : (
-              <button
-                className={
-                  executorId === Number(localStorage.getItem("id"))
-                    ? "start"
-                    : "start disable"
-                }
-                onClick={() => startTaskTimer()}
-              >
-                Начать делать
-                <img src={arrow}></img>
-              </button>
-            )}
-          </div>
-
-          <div className="workers_box-bottom">
-            <div
-              className={editOpen ? "edit" : ""}
-              onClick={() => {
-                if (editOpen) {
-                  setEditOpen(!editOpen);
-                  editTask();
-                } else {
-                  setEditOpen(!editOpen);
-                }
-              }}
-            >
-              <img src={edit}></img>
-              <p>{editOpen ? "сохранить" : "редактировать"}</p>
-            </div>
-            <div>
-              <img src={link}></img>
-              <p>ссылка на проект</p>
-            </div>
-            <div onClick={deleteTask}>
-              <img src={archive}></img>
-              <p>в архив</p>
-            </div>
-            <div onClick={deleteTask}>
-              <img src={del}></img>
-              <p>удалить</p>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <TrackerModal
-        active={addSubtask}
-        setActive={setAddSubtask}
-        defautlInput={task.column_id}
-      ></TrackerModal>
-    </div>
-  );
-};
-
-export default ModalTiсket;

From ede41ed8ed4c0cebda93e50b07257ff7887d54bf Mon Sep 17 00:00:00 2001
From: M1kola <gigablock3030@yandex.ru>
Date: Mon, 26 Jun 2023 12:58:07 +0300
Subject: [PATCH 3/3] Merge branch 'main' into tracker-connect-back

---
 .../Modal/Tracker/ModalTicket/ModalTicket.jsx | 54 ++++++++++++-------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
index fe3d4e14..ac27adff 100644
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { Link } from "react-router-dom";
 
+import { getProfileInfo } from "@redux/outstaffingSlice";
 import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";
 
 import { getCorrectRequestDate, urlForLocal } from "@utils/helper";
@@ -24,7 +25,6 @@ import send from "assets/icons/send.svg";
 import watch from "assets/icons/watch.svg";
 
 import "./modalTicket.scss";
-import { getProfileInfo } from "@redux/outstaffingSlice";
 
 export const ModalTiсket = ({
   active,
@@ -247,28 +247,32 @@ export const ModalTiсket = ({
       (res) => {
         let timerSeconds = 0;
         res.length &&
-        res.forEach((time) => {
-          timerSeconds += time.deltaSeconds;
-          setCurrentTimerCount({
-            hours: Math.floor(timerSeconds / 60 / 60),
-            minute: Math.floor((timerSeconds / 60) % 60),
-            seconds: timerSeconds % 60,
+          res.forEach((time) => {
+            timerSeconds += time.deltaSeconds;
+            setCurrentTimerCount({
+              hours: Math.floor(timerSeconds / 60 / 60),
+              minute: Math.floor((timerSeconds / 60) % 60),
+              seconds: timerSeconds % 60,
+            });
+            updateTimerHours = Math.floor(timerSeconds / 60 / 60);
+            updateTimerMinute = Math.floor((timerSeconds / 60) % 60);
+            updateTimerSec = timerSeconds % 60;
+            if (!time.stopped_at) {
+              setTimerStart(true);
+              startTimer();
+              setTimerInfo(time);
+            }
           });
-          updateTimerHours = Math.floor(timerSeconds / 60 / 60);
-          updateTimerMinute = Math.floor((timerSeconds / 60) % 60);
-          updateTimerSec = timerSeconds % 60;
-          if (!time.stopped_at) {
-            setTimerStart(true);
-            startTimer();
-            setTimerInfo(time);
-          }
-        });
       }
     );
 
     if (
       localStorage.getItem("role_status") !== "18" &&
-      Boolean(!correctProjectUsers.find((item) => item.user_id === profileInfo.id_user))
+      Boolean(
+        !correctProjectUsers.find(
+          (item) => item.user_id === profileInfo.id_user
+        )
+      )
     ) {
       setCorrectProjectUsers((prevState) => [
         ...prevState,
@@ -393,7 +397,7 @@ export const ModalTiсket = ({
               {/*  </button>*/}
               {/*</p>*/}
               <p className="file">
-                <button className='button-add-file'>
+                <button className="button-add-file">
                   <img src={file}></img>
                   Загрузить файл
                 </button>
@@ -448,7 +452,12 @@ export const ModalTiсket = ({
               </div>
             ) : (
               <div className="add-worker moreItems ">
-                <button className='button-add-worker' onClick={() => setDropListOpen(true)}>+</button>
+                <button
+                  className="button-add-worker"
+                  onClick={() => setDropListOpen(true)}
+                >
+                  +
+                </button>
                 <span>Добавить исполнителя</span>
                 {dropListOpen && (
                   <div className="dropdownList">
@@ -496,7 +505,12 @@ export const ModalTiсket = ({
             )}
 
             <div className="add-worker moreItems">
-              <button className='button-add-worker' onClick={() => setDropListMembersOpen(true)}>+</button>
+              <button
+                className="button-add-worker"
+                onClick={() => setDropListMembersOpen(true)}
+              >
+                +
+              </button>
               <span>Добавить участников</span>
               {dropListMembersOpen && (
                 <div className="dropdownList">