Merge branch 'main' of https://git.itguild.info/apuc/guild_front
This commit is contained in:
@ -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>
|
||||
|
Reference in New Issue
Block a user