diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 4ef24ca6..54e92a72 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -21,10 +21,10 @@ import { urlForLocal, } from "@utils/helper"; -import { useNotification } from "@hooks/useNotification"; - import { apiRequest } from "@api/request"; +import { useNotification } from "@hooks/useNotification"; + import { getCorrectDate } from "@components/Calendar/calendarHelper"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 95c84f84..18d83967 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -621,7 +621,7 @@ export const ProjectTracker = () => { )} -
Срок исполнения:
- - {getCorrectDate(task.dead_line)} - -Срок исполнения:
+ + {getCorrectDate(task.dead_line)} + +- { - `${filterCompleteTasks.length} - ${caseOfNum(filterCompleteTasks.length, "tasks")}` - }
+ {`${filterCompleteTasks.length} + ${caseOfNum(filterCompleteTasks.length, "tasks")}`} +- { - `${projects.filter((project) => project.status === 10).length} - ${caseOfNum(projects.filter((project) => project.status === 10).length, "projects")}`} + {`${ + projects.filter((project) => project.status === 10).length + } + ${caseOfNum( + projects.filter((project) => project.status === 10) + .length, + "projects" + )}`}