diff --git a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx index e35689a9..4f8311b9 100644 --- a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx +++ b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx @@ -67,7 +67,7 @@ const ListEmployees = ({ } alt="avatar" /> - {person.user.fio} + {person.user.fio.split(" ").slice(0, -1).join(" ")} { return (
-

{member.fio}

+

{member.fio.split(" ").slice(0, -1).join(" ")}

setDatePickerOpen(!datePickerOpen)} > - calendar +

{deadLine ? getCorrectDate(deadLine) : "Срок исполнения"} diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 2f8331b1..cc813790 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -950,7 +950,7 @@ export const TicketFullScreen = () => { className="dead-line__container" onClick={() => setDatePickerOpen(!datePickerOpen)} > - calendar +

{deadLine ? getCorrectDate(deadLine) diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index 0704694b..fc3a4c00 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -521,7 +521,6 @@ export const TrackerModal = ({
-

Введите название и описание задачи

- calendar +

setDatePickerOpen(!datePickerOpen)}> {deadLineDate ? getCorrectDate(deadLineDate) @@ -734,7 +733,7 @@ export const TrackerModal = ({ ) : ( - Создать + Создать задачу )}

diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index f1bbe9e0..1be824e8 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -337,7 +337,7 @@ } .create-task-body { - padding: 15px 20px; + padding: 15px 30px; display: flex; column-gap: 20px; @@ -373,8 +373,8 @@ } .ck-editor__editable.ck-rounded-corners { - min-height: 150px; - max-height: 150px; + min-height: 180px; + max-height: 180px; } } @@ -383,6 +383,7 @@ flex-direction: column; align-items: start; justify-content: end; + row-gap: 10px; &__owner { display: flex; @@ -714,6 +715,11 @@ } } } + + .button-add { + margin: 0 30px; + align-self: flex-end; + } } .name-project { diff --git a/src/pages/ProjectTracker/ProjectTracker.jsx b/src/pages/ProjectTracker/ProjectTracker.jsx index 97c79530..dcb09d12 100644 --- a/src/pages/ProjectTracker/ProjectTracker.jsx +++ b/src/pages/ProjectTracker/ProjectTracker.jsx @@ -23,8 +23,7 @@ import { setToggleTab } from "@redux/projectsTrackerSlice"; -import { urlForLocal } from "@utils/helper"; -import { caseOfNum } from "@utils/helper"; +import { removeLast, urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; @@ -44,7 +43,6 @@ import TrackerSelectColumn from "@components/TrackerSelectColumn/TrackerSelectCo import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrowDown from "assets/icons/arrows/selectArrow.png"; -import calendarIcon from "assets/icons/calendar.svg"; import category from "assets/icons/category.svg"; import close from "assets/icons/close.png"; import commentsBoard from "assets/icons/commentsBoard.svg"; @@ -64,7 +62,6 @@ export const ProjectTracker = () => { const dispatch = useDispatch(); const projectId = useParams(); - const currentDate = new Date().getFullYear(); const [openColumnSelect, setOpenColumnSelect] = useState({}); const [selectedTab, setSelectedTab] = useState(0); const [priorityTask, setPriorityTask] = useState(0); @@ -612,7 +609,7 @@ export const ProjectTracker = () => { key={user.user_id} onClick={() => executorFilter(user)} > -

{user.user?.fio}

+

{removeLast(user.user?.fio)}

{ } }} > -

+

{task.title}

@@ -955,7 +949,7 @@ export const ProjectTracker = () => { {task.dead_line && (

- + {getCorrectDate(task.dead_line)}
diff --git a/src/utils/helper.js b/src/utils/helper.js index 6ed6d29b..667ee82c 100644 --- a/src/utils/helper.js +++ b/src/utils/helper.js @@ -91,3 +91,8 @@ export function copyProjectLink(projectId) { `https://itguild.info/tracker/project/${projectId}` ); } + +export function removeLast(string) { + let lastIndex = string.lastIndexOf(" "); + return string.substring(0, lastIndex); +}