diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
index e132c455..542a5237 100644
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@@ -1087,7 +1087,7 @@ export const ModalTiсket = ({
{acceptModalOpen && (
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 4bdda2ff..b23285de 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -1151,7 +1151,7 @@ export const TicketFullScreen = () => {
{acceptModalOpen && (
diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
index 5b62b1c0..8da9f485 100644
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@@ -640,12 +640,12 @@ export const TrackerModal = ({
{selectedExecutorTask.user_id ? (
<>
-
{selectedExecutorTask.user.fio}
+
{selectedExecutorTask.user.fio}
>
) : (
{selectedExecutorTask}
@@ -662,7 +662,6 @@ export const TrackerModal = ({
className="executor"
key={person.user_id}
>
-
{person.user.fio}
+
{person.user.fio}
);
})
diff --git a/src/components/ProjectTicket/ProjectTicket.jsx b/src/components/ProjectTicket/ProjectTicket.jsx
index 92cd283f..95b3e0b5 100644
--- a/src/components/ProjectTicket/ProjectTicket.jsx
+++ b/src/components/ProjectTicket/ProjectTicket.jsx
@@ -158,7 +158,7 @@ export const ProjectTicket = ({ project, index }) => {
{acceptModalOpen && (
@@ -166,7 +166,7 @@ export const ProjectTicket = ({ project, index }) => {
{modalDelete && (
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index 67feda43..c4f0e35a 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -54,6 +54,7 @@ import tasks from "assets/icons/trackerTasks.svg";
import accept from "assets/images/accept.png";
import archive from "assets/images/archiveIcon.png";
import avatarMok from "assets/images/avatarMok.png";
+import calendarIcon from "assets/icons/calendar.svg";
import { getCorrectDate } from "../../components/Calendar/calendarHelper";
@@ -899,21 +900,18 @@ export const ProjectTracker = () => {
className="tasks__board__item__description"
>
+
- {task.executor?.fio
- ? task.executor?.fio
- : "Исполнитель не назначен"}
+ {task.executor?.fio ||
+ "Исполнитель не назначен"}
- {task.executor?.avatar && (
-
- )}
{Boolean(task.mark.length) && (
@@ -945,7 +943,7 @@ export const ProjectTracker = () => {
)}
{task.dead_line && (
-
Срок исполнения:
+
{getCorrectDate(task.dead_line)}
@@ -1003,7 +1001,9 @@ export const ProjectTracker = () => {
{acceptModalOpen && (
deleteColumn(currentColumnDelete)}
/>
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index b17e34d2..f64fcf80 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -936,6 +936,11 @@
font-weight: 500;
font-size: 14px;
}
+
+ img {
+ margin-top: -2px;
+ width: 18px;
+ }
}
&__executor {