- })
+ 
{comment.user.fio}
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index 134ff358..768a4f30 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -6,6 +6,7 @@ import {
activeLoader,
deletePersonOnProject,
filterCreatedByMe,
+ filteredExecutorTasks,
filteredParticipateTasks,
getBoarderLoader,
getProjectBoard,
@@ -20,6 +21,7 @@ import {
} from "@redux/projectsTrackerSlice";
import { urlForLocal } from "@utils/helper";
+import { caseOfNum } from "@utils/helper";
import { apiRequest } from "@api/request";
@@ -28,13 +30,13 @@ import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import ModalTicket from "@components/Modal/Tracker/ModalTicket/ModalTicket";
import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
-// import TrackerModal from "@components/Modal/TrackerModal/TrackerModal";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import archive from "assets/icons/archiveTracker.svg";
import arrow from "assets/icons/arrows/arrowCalendar.png";
+import arrowDown from "assets/icons/arrows/selectArrow.png";
import close from "assets/icons/close.png";
import commentsBoard from "assets/icons/commentsBoard.svg";
import del from "assets/icons/delete.svg";
@@ -61,6 +63,8 @@ export const ProjectTracker = () => {
const [checkBoxParticipateTasks, setCheckBoxParticipateTasks] =
useState(false);
const [checkBoxMyTasks, setCheckBoxMyTasks] = useState(false);
+ const [selectedExecutor, setSelectedExecutor] = useState(null);
+ const [selectExecutorOpen, setSelectedExecutorOpen] = useState(false);
const startWrapperIndexTest = useRef({});
const projectBoard = useSelector(getProjectBoard);
const loader = useSelector(getBoarderLoader);
@@ -228,6 +232,7 @@ export const ProjectTracker = () => {
dispatch(setProjectBoardFetch(projectId.id));
setCheckBoxParticipateTasks(false);
setCheckBoxMyTasks(false);
+ setSelectedExecutor(null);
}
setCheckBoxParticipateTasks(!checkBoxParticipateTasks);
}
@@ -239,10 +244,23 @@ export const ProjectTracker = () => {
dispatch(setProjectBoardFetch(projectId.id));
setCheckBoxParticipateTasks(false);
setCheckBoxMyTasks(false);
+ setSelectedExecutor(null);
}
setCheckBoxMyTasks(!checkBoxMyTasks);
}
+ function executorFilter(user) {
+ dispatch(filteredExecutorTasks(user.user_id));
+ setSelectedExecutor(user);
+ }
+
+ function deleteSelectedExecutorFilter() {
+ setSelectedExecutor(null);
+ setCheckBoxParticipateTasks(false);
+ setCheckBoxMyTasks(false);
+ dispatch(setProjectBoardFetch(projectId.id));
+ }
+
return (
}
+ {selectedExecutor ? (
+
+
+ 
+
+ ) : (
+ {selectedExecutor.user.fio}
+
+ setSelectedExecutorOpen(!selectExecutorOpen)
+ }
+ >
+ 
+ {selectExecutorOpen && (
+
+ )}
Выберите исполнитель
+
+ {projectBoard.projectUsers.map((user) => {
+ return (
+
+ )}
+ executorFilter(user)}
+ >
+
+
+ );
+ })}
+ {user.user?.fio}
+Вернуться на проекты
{task.title}
-{task.description}
+
@@ -301,11 +310,20 @@ export const Tracker = () => {
})
{task.title}
-{task.description}
+
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index 1a38bead..9ed708bb 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -208,7 +208,8 @@
&__wrapper {
display: flex;
- max-width: 1160px;
+ max-width: 1260px;
+ width: 100%;
margin: 0 auto;
justify-content: space-between;
padding: 0 10px;
@@ -252,7 +253,6 @@
&__persons {
position: relative;
display: flex;
- cursor: pointer;
align-items: center;
.projectPersons {
@@ -302,8 +302,14 @@
background: #00c5a8;
color: white;
font-size: 14px;
+ transition: all 0.15s ease;
left: -28px;
z-index: 2;
+ cursor: pointer;
+
+ &:hover {
+ background: #10d5bb;
+ }
}
p {
@@ -461,11 +467,114 @@
}
}
+ &__executor {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ cursor: pointer;
+ margin-right: 10px;
+ border-radius: 8px;
+ border: 1px solid #e3e2e2;
+ padding: 2px 6px;
+ position: relative;
+ max-width: 220px;
+ width: 100%;
+
+ &Selected {
+ display: flex;
+ align-items: center;
+ border-radius: 8px;
+ max-width: 220px;
+ width: 100%;
+ margin-right: 10px;
+ justify-content: center;
+
+ p {
+ color: #252c32;
+ font-weight: 400;
+ font-size: 14px;
+ line-height: 24px;
+ max-width: 155px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .avatar {
+ margin: 0 5px;
+ }
+
+ .delete {
+ cursor: pointer;
+ }
+
+ img {
+ display: flex;
+ width: 20px;
+ height: 20px;
+ }
+ }
+ p {
+ color: #252c32;
+ font-weight: 400;
+ font-size: 14px;
+ line-height: 24px;
+ }
+
+ img {
+ transition: all 0.15s ease;
+ margin-left: 5px;
+ }
+
+ .open {
+ transform: rotate(180deg);
+ }
+
+ &Dropdown {
+ position: absolute;
+ top: 33px;
+ background: white;
+ border-radius: 8px;
+ z-index: 5;
+ padding: 10px 10px;
+ display: flex;
+ flex-direction: column;
+ row-gap: 7px;
+ width: 100%;
+
+
+ .executorDropdown__person {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ p {
+ max-width: 155px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ img {
+ width: 15px;
+ height: 15px;
+ }
+
+ &:hover {
+ p {
+ font-weight: 600;
+ }
+ }
+ }
+ }
+ }
+
&__back {
cursor: pointer;
display: flex;
align-items: center;
color: black;
+ max-width: 180px;
+ width: 100%;
p {
font-weight: 400;
@@ -477,6 +586,12 @@
margin-left: 10px;
width: 20px;
}
+
+ &:hover {
+ p {
+ font-weight: 500;
+ }
+ }
}
}
@@ -738,12 +853,20 @@
font-weight: 500;
font-size: 16px;
line-height: 24px;
- cursor: pointer;
+ max-width: 250px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.add {
color: #6f6f6f;
font-size: 19px;
+ cursor: pointer;
+
+ &:hover {
+ font-weight: 600;
+ }
}
.more {
@@ -751,6 +874,11 @@
position: relative;
bottom: 4px;
font-size: 20px;
+ cursor: pointer;
+
+ &:hover {
+ font-weight: 600;
+ }
}
.done {
diff --git a/src/redux/projectsTrackerSlice.js b/src/redux/projectsTrackerSlice.js
index d8a10860..7a4b7023 100644
--- a/src/redux/projectsTrackerSlice.js
+++ b/src/redux/projectsTrackerSlice.js
@@ -122,6 +122,13 @@ export const projectsTrackerSlice = createSlice({
);
});
},
+ filteredExecutorTasks: (state, action) => {
+ state.projectBoard.columns.forEach((column) => {
+ column.tasks = column.tasks.filter(
+ (task) => task.executor_id === action.payload
+ );
+ });
+ },
setColumnName: (state, action) => {
state.columnName = action.payload;
},
@@ -174,6 +181,7 @@ export const {
addPersonToProject,
filterCreatedByMe,
filteredParticipateTasks,
+ filteredExecutorTasks,
movePositionProjectTask,
} = projectsTrackerSlice.actions;
diff --git a/src/utils/helper.js b/src/utils/helper.js
index f32e202b..bae68067 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -61,3 +61,23 @@ export function getCorrectRequestDate(date) {
const sec = String(date.getUTCSeconds());
return `${yyyy}-${mm}-${dd} ${hh}:${min}:${sec}`;
}
+
+export function caseOfNum(number, type) {
+ const comments = ["коментарий", "комментария", " коментариев"];
+ const files = ["файлов", "файла", "файлов"];
+ const cases = [2, 0, 1, 1, 1, 2];
+ if (type === "comments") {
+ return comments[
+ number % 100 > 4 && number % 100 < 20
+ ? 2
+ : cases[number % 10 < 5 ? number % 10 : 5]
+ ];
+ }
+ if (type === "files") {
+ return files[
+ number % 100 > 4 && number % 100 < 20
+ ? 2
+ : cases[number % 10 < 5 ? number % 10 : 5]
+ ];
+ }
+}