apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.itguild.info/apuc/guild_front

Browse Source
This commit is contained in:
Никита Губарь
2024-02-29 13:14:53 +03:00
parent 0df30c74c9 59d0f5eae6
commit d9781b6396
17 changed files with 256 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
View File

@ -6,7 +6,7 @@ import {
modalToggle
} from "@redux/projectsTrackerSlice";
import { caseOfNum, urlForLocal } from "@utils/helper";
import { caseOfNum, removeLast, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
@ -67,7 +67,7 @@ const ListEmployees = ({
}
alt="avatar"
/>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
<img
className="delete"
src={close}

14
src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
View File

@ -11,10 +11,10 @@ import { getProfileInfo } from "@redux/outstaffingSlice";
import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";
import {
backendImg,
caseOfNum,
getCorrectRequestDate,
getToken,
removeLast,
urlForLocal
} from "@utils/helper";
@ -771,12 +771,12 @@ export const ModalTiсket = ({
<div className="workers_box task__info">
<span className="exit" onClick={() => closeModal()}></span>
<h5>Создатель: </h5>
<p className="workers__creator">{task.user?.fio}</p>
<p className="workers__creator">{removeLast(task.user?.fio)}</p>
{executor ? (
<>
<h5>Исполнитель: </h5>
<div className="executor">
<p>{executor.fio}</p>
<p>{removeLast(executor.fio)}</p>
<img
src={
executor?.avatar
@ -815,7 +815,7 @@ export const ModalTiсket = ({
key={person.user_id}
onClick={() => taskExecutor(person)}
>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
<img
src={
person.user?.avatar
@ -838,7 +838,7 @@ export const ModalTiсket = ({
{members.map((member) => {
return (
<div className="worker" key={member.user_id}>
<p>{member.fio}</p>
<p>{removeLast(member.fio)}</p>
<img
src={
member?.avatar
@ -881,7 +881,7 @@ export const ModalTiсket = ({
key={person.user_id}
onClick={() => addMember(person)}
>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
<img
src={
person.user?.avatar
@ -907,7 +907,7 @@ export const ModalTiсket = ({
className="dead-line__container"
onClick={() => setDatePickerOpen(!datePickerOpen)}
>
<img src={calendarIcon} alt="calendar" />
<p>⌛</p>
<span>
{deadLine ? getCorrectDate(deadLine) : "Срок исполнения"}
</span>

2
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
View File

@ -950,7 +950,7 @@ export const TicketFullScreen = () => {
className="dead-line__container"
onClick={() => setDatePickerOpen(!datePickerOpen)}
>
<img src={calendarIcon} alt="calendar" />
<p>⌛</p>
<span>
{deadLine
? getCorrectDate(deadLine)

13
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -23,7 +23,7 @@ import {
} from "@redux/projectsTrackerSlice";
import { getCorrectDate } from "@utils/calendarHelper";
import { getCorrectRequestDate, urlForLocal } from "@utils/helper";
import { getCorrectRequestDate, removeLast, urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
@ -488,7 +488,7 @@ export const TrackerModal = ({
>
<p>
{selectedWorker
? selectedWorker.employee.fio
? removeLast(selectedWorker.employee.fio)
: "Выберите пользователя"}
</p>
<img className="arrow" src={arrowDown} alt="arrow" />
@ -507,7 +507,7 @@ export const TrackerModal = ({
setSelectedWorker(worker);
}}
>
<span>{worker.employee.fio}</span>
<span>{removeLast(worker.employee.fio)}</span>
<img
src={urlForLocal(worker.employee.avatar)}
alt="avatar"
@ -562,7 +562,6 @@ export const TrackerModal = ({
</div>
<div className="create-task-body">
<div className="create-task-body__left">
<h4>Введите название и описание задачи</h4>
<div className="input-container">
<input
maxLength="100"
@ -740,7 +739,7 @@ export const TrackerModal = ({
}
alt="avatar"
/>
<span>{person.user.fio}</span>
<span>{removeLast(person.user.fio)}</span>
</div>
);
})
@ -751,7 +750,7 @@ export const TrackerModal = ({
)}
</div>
<div className="create-task-body__right__dead-line">
<img src={calendarImg} alt="calendar" />
<p>⌛</p>
<p onClick={() => setDatePickerOpen(!datePickerOpen)}>
{deadLineDate
? getCorrectDate(deadLineDate)
@ -775,7 +774,7 @@ export const TrackerModal = ({
<Loader style={"green"} />
) : (
<BaseButton styles={"button-add"} onClick={createTicket}>
Создать
Создать задачу
</BaseButton>
)}
</div>

14
src/components/Modal/Tracker/TrackerModal/trackerModal.scss
View File

@ -263,7 +263,7 @@
position: absolute;
width: 100%;
padding: 9.5px 12px;
top: 48px;
top: 45px;
left: 0;
background: white;
border-radius: 5px;
@ -338,7 +338,7 @@
}
.create-task-body {
padding: 15px 20px;
padding: 15px 30px;
display: flex;
column-gap: 20px;
@ -374,8 +374,8 @@
}
.ck-editor__editable.ck-rounded-corners {
min-height: 150px;
max-height: 150px;
min-height: 180px;
max-height: 180px;
}
}
@ -384,6 +384,7 @@
flex-direction: column;
align-items: start;
justify-content: end;
row-gap: 10px;
&__owner {
display: flex;
@ -715,6 +716,11 @@
}
}
}
.button-add {
margin: 0 30px;
align-self: flex-end;
}
}
.name-project {