tracker fixes
This commit is contained in:
parent
7f0dc9612b
commit
c3ef01ee35
@ -463,8 +463,7 @@ export const ModalTiсket = ({
|
||||
</div>
|
||||
<div className="workers">
|
||||
<div className="workers_box task__info">
|
||||
<span className="exit" onClick={() => setActive(false)}>
|
||||
</span>
|
||||
<span className="exit" onClick={() => setActive(false)}></span>
|
||||
<p className="workers__creator">Создатель : {task.user?.fio}</p>
|
||||
|
||||
{executor ? (
|
||||
|
@ -24,7 +24,6 @@ import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadc
|
||||
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
|
||||
import TrackerTaskComment from "@components/TrackerTaskComment/TrackerTaskComment";
|
||||
|
||||
import archive from "assets/images/archiveIcon.png";
|
||||
import arrow from "assets/icons/arrows/arrowCalendar.png";
|
||||
import arrowStart from "assets/icons/arrows/arrowStart.png";
|
||||
import close from "assets/icons/close.png";
|
||||
@ -36,6 +35,7 @@ import send from "assets/icons/send.svg";
|
||||
import project from "assets/icons/trackerProject.svg";
|
||||
import tasks from "assets/icons/trackerTasks.svg";
|
||||
import watch from "assets/icons/watch.svg";
|
||||
import archive from "assets/images/archiveIcon.png";
|
||||
import avatarMok from "assets/images/avatarMok.png";
|
||||
|
||||
import "./ticketFullScreen.scss";
|
||||
|
@ -272,7 +272,7 @@ export const TrackerModal = ({
|
||||
>
|
||||
{modalType === "addWorker" && (
|
||||
<>
|
||||
<div className='select__person'>
|
||||
<div className="select__person">
|
||||
<div className="title-project selectPerson">
|
||||
<h4>Добавьте участника</h4>
|
||||
{/*<div className="input-container">*/}
|
||||
@ -282,12 +282,16 @@ export const TrackerModal = ({
|
||||
{/* onChange={(e) => setEmailWorker(e.target.value)}*/}
|
||||
{/* />*/}
|
||||
{/*</div>*/}
|
||||
<p className='selectPerson__info'>Выберите пользователя в проекте или добавьте по e- mail</p>
|
||||
<div className='invite__blocks'>
|
||||
<div className='addPersonBlock'>
|
||||
<p className="selectPerson__info">
|
||||
Выберите пользователя в проекте или добавьте по e- mail
|
||||
</p>
|
||||
<div className="invite__blocks">
|
||||
<div className="addPersonBlock">
|
||||
<div
|
||||
className={
|
||||
selectWorkersOpen ? "select__worker open" : "select__worker"
|
||||
selectWorkersOpen
|
||||
? "select__worker open"
|
||||
: "select__worker"
|
||||
}
|
||||
onClick={() => setSelectWorkersOpen(!selectWorkersOpen)}
|
||||
>
|
||||
@ -326,14 +330,21 @@ export const TrackerModal = ({
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<BaseButton styles={"button-add addPersonBtn"} onClick={addUserToProject}>
|
||||
<BaseButton
|
||||
styles={"button-add addPersonBtn"}
|
||||
onClick={addUserToProject}
|
||||
>
|
||||
Добавить
|
||||
</BaseButton>
|
||||
</div>
|
||||
<span>или</span>
|
||||
<div className='invitePersonBlock'>
|
||||
<div className='input-container invitePersonBlock__input'>
|
||||
<input className="name-project" placeholder='email' type="email" />
|
||||
<div className="invitePersonBlock">
|
||||
<div className="input-container invitePersonBlock__input">
|
||||
<input
|
||||
className="name-project"
|
||||
placeholder="email"
|
||||
type="email"
|
||||
/>
|
||||
</div>
|
||||
<BaseButton styles={"button-add invitePersonBlock__btn"}>
|
||||
Отправить приглашение
|
||||
@ -372,7 +383,7 @@ export const TrackerModal = ({
|
||||
"blockQuote",
|
||||
],
|
||||
removePlugins: ["BlockQuote"],
|
||||
placeholder: "Описание задачи"
|
||||
placeholder: "Описание задачи",
|
||||
}}
|
||||
onChange={(event, editor) => {
|
||||
const data = editor.getData();
|
||||
|
@ -34,7 +34,6 @@ import { Navigation } from "@components/Navigation/Navigation";
|
||||
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
|
||||
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
|
||||
|
||||
import archive from "assets/images/archiveIcon.png";
|
||||
import arrow from "assets/icons/arrows/arrowCalendar.png";
|
||||
import arrowDown from "assets/icons/arrows/selectArrow.png";
|
||||
import close from "assets/icons/close.png";
|
||||
@ -46,6 +45,7 @@ import trackerNoTasks from "assets/icons/trackerNoTasks.svg";
|
||||
import project from "assets/icons/trackerProject.svg";
|
||||
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";
|
||||
|
||||
export const ProjectTracker = () => {
|
||||
@ -390,7 +390,10 @@ export const ProjectTracker = () => {
|
||||
/>
|
||||
<div className="persons__list__count">
|
||||
<span>{projectBoard.projectUsers?.length}</span>
|
||||
{caseOfNum(projectBoard.projectUsers?.length, "persons")}
|
||||
{caseOfNum(
|
||||
projectBoard.projectUsers?.length,
|
||||
"persons"
|
||||
)}
|
||||
</div>
|
||||
<div className="persons__list__info">
|
||||
<span>В проекте - </span>
|
||||
|
@ -23,10 +23,10 @@ import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadc
|
||||
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
|
||||
import ProjectTiket from "@components/ProjectTiket/ProjectTiket";
|
||||
|
||||
import archive from "assets/images/archiveIcon.png";
|
||||
import search from "assets/icons/serchIcon.png";
|
||||
import project from "assets/icons/trackerProject.svg";
|
||||
import tasks from "assets/icons/trackerTasks.svg";
|
||||
import archive from "assets/images/archiveIcon.png";
|
||||
import avatarMok from "assets/images/avatarMok.png";
|
||||
import noProjects from "assets/images/noProjects.png";
|
||||
|
||||
|
@ -65,7 +65,7 @@ export function getCorrectRequestDate(date) {
|
||||
export function caseOfNum(number, type) {
|
||||
const comments = ["коментарий", "комментария", " коментариев"];
|
||||
const files = ["файл", "файла", "файлов"];
|
||||
const persons = ["участник", "участника", "участников"]
|
||||
const persons = ["участник", "участника", "участников"];
|
||||
const cases = [2, 0, 1, 1, 1, 2];
|
||||
if (type === "comments") {
|
||||
return comments[
|
||||
|
Loading…
Reference in New Issue
Block a user