Compare commits
No commits in common. "4d2ccf91ebe6e23f0e924b8ffe002f48b2c9db18" and "1fd6a736521086001bf1e7a2dc216021b83e0a46" have entirely different histories.
4d2ccf91eb
...
1fd6a73652
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
@ -23,8 +23,6 @@
|
||||
|
||||
.select-person {
|
||||
align-items: start;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
&__info {
|
||||
font-size: 15px;
|
||||
@ -51,17 +49,19 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
button {
|
||||
// margin: 0 auto;
|
||||
}
|
||||
}
|
||||
|
||||
.invite-person-block {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
row-gap: 10px;
|
||||
row-gap: 20px;
|
||||
&__input {
|
||||
margin: 0;
|
||||
min-width: 240px;
|
||||
min-width: 320px;
|
||||
height: 42px;
|
||||
|
||||
input {
|
||||
@ -75,7 +75,7 @@
|
||||
|
||||
&__btn {
|
||||
margin: 0;
|
||||
max-width: 190px;
|
||||
max-width: 242px;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
@ -106,6 +106,7 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
row-gap: 10px;
|
||||
padding: 19px 10px 29px 10px;
|
||||
|
||||
@media (max-width: 500px) {
|
||||
padding: 10px;
|
||||
|
||||
@ -10,13 +10,11 @@ import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
|
||||
import anyMoment from "assets/icons/anyMoment.svg";
|
||||
import doc from "assets/icons/doc.svg";
|
||||
import telegramLogo from "assets/icons/tgLogo.svg";
|
||||
import accept from "assets/images/accept.png";
|
||||
|
||||
import "./modalRegistration.scss";
|
||||
|
||||
export const ModalRegistration = ({ active, setActive }) => {
|
||||
const [loader, setLoader] = useState(false);
|
||||
const [isPartner, setIsPartner] = useState(false);
|
||||
|
||||
const fields = {
|
||||
username: "",
|
||||
@ -58,7 +56,7 @@ export const ModalRegistration = ({ active, setActive }) => {
|
||||
fields,
|
||||
showNotificationError,
|
||||
showNotificationTrue,
|
||||
isPartner
|
||||
closeModal
|
||||
);
|
||||
|
||||
return (
|
||||
@ -125,15 +123,6 @@ export const ModalRegistration = ({ active, setActive }) => {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
className="input_checkbox"
|
||||
onClick={() => setIsPartner(!isPartner)}
|
||||
>
|
||||
<p>Партнер:</p>
|
||||
<span className={isPartner ? "checkbox--active" : ""}>
|
||||
{isPartner ? <img src={accept} alt="accept" /> : ""}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="button-box">
|
||||
{loader ? (
|
||||
|
||||
@ -128,38 +128,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
.input_checkbox {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
|
||||
p {
|
||||
font-size: 16px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
span {
|
||||
border: 1px solid gray;
|
||||
border-radius: 4px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-left: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
img {
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.checkbox--active {
|
||||
background: #f2f2f2;
|
||||
}
|
||||
}
|
||||
|
||||
.button-box {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
@ -5,6 +5,7 @@ import "./modalSelect.scss";
|
||||
export const ModalSelect = ({ active, children }) => {
|
||||
return (
|
||||
<div className={active ? "project__settings active" : "project__settings "}>
|
||||
<span className="project__settings-ellipsis">...</span>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
|
||||
@ -1,30 +1,29 @@
|
||||
.project {
|
||||
&__settings {
|
||||
position: absolute;
|
||||
padding: 0 10px;
|
||||
padding: 32px 23px 10px 11px;
|
||||
background: #e1fccf;
|
||||
border-radius: 12px;
|
||||
transform: scale(0);
|
||||
bottom: -30px;
|
||||
right: -130px;
|
||||
bottom: -40px;
|
||||
right: -120px;
|
||||
|
||||
@media (max-width: 1050px) {
|
||||
right: 5px;
|
||||
bottom: -30px;
|
||||
right: 10px;
|
||||
padding-top: 10px;
|
||||
bottom: -75px;
|
||||
}
|
||||
|
||||
&-menu {
|
||||
font-size: 14px;
|
||||
padding: 5px 0;
|
||||
line-height: 38px;
|
||||
|
||||
div {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 2px 0;
|
||||
|
||||
img {
|
||||
width: 12px;
|
||||
margin-right: 5px;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
p:hover {
|
||||
|
||||
@ -87,7 +87,7 @@ const ListEmployees = ({
|
||||
}}
|
||||
>
|
||||
<span className="add-person">+</span>
|
||||
<p>Добавить участника</p>
|
||||
<p>Добавить участников</p>
|
||||
</div>
|
||||
</div>
|
||||
</ModalLayout>
|
||||
|
||||
@ -758,7 +758,8 @@ export const ModalTiсket = ({
|
||||
<div className="workers">
|
||||
<div className="workers_box task__info">
|
||||
<span className="exit" onClick={() => setActive(false)}></span>
|
||||
Создатель: <p className="workers__creator">{task.user?.fio}</p>
|
||||
<p className="workers__creator">Создатель: {task.user?.fio}</p>
|
||||
|
||||
{executor ? (
|
||||
<>
|
||||
<h5>Исполнитель: </h5>
|
||||
@ -818,6 +819,7 @@ export const ModalTiсket = ({
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{Boolean(members.length) && (
|
||||
<div className="members">
|
||||
<h5>Участники:</h5>
|
||||
@ -845,6 +847,7 @@ export const ModalTiсket = ({
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="add-worker moreItems">
|
||||
<button
|
||||
className="button-add-worker"
|
||||
@ -852,7 +855,7 @@ export const ModalTiсket = ({
|
||||
>
|
||||
+
|
||||
</button>
|
||||
<span>Добавить участника</span>
|
||||
<span>Добавить участников</span>
|
||||
{dropListMembersOpen && (
|
||||
<div className="dropdownList">
|
||||
<img
|
||||
@ -914,6 +917,7 @@ export const ModalTiсket = ({
|
||||
</div>
|
||||
<div className="time">
|
||||
<img src={watch}></img>
|
||||
<span>Длительность: </span>
|
||||
<p>
|
||||
{correctTimerTime(currentTimerCount.hours)}:
|
||||
{correctTimerTime(currentTimerCount.minute)}:
|
||||
@ -1087,7 +1091,7 @@ export const ModalTiсket = ({
|
||||
</div>
|
||||
{acceptModalOpen && (
|
||||
<AcceptModal
|
||||
title={"Вы действительно хотите переместить задачу в архив?"}
|
||||
title={"Вы точно хотите переместить задачу в архив?"}
|
||||
closeModal={closeAcceptModal}
|
||||
agreeHandler={deleteTask}
|
||||
/>
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 630px;
|
||||
width: 600px;
|
||||
margin: 26px 0 0 21px;
|
||||
|
||||
.title-project {
|
||||
@ -100,11 +100,10 @@
|
||||
}
|
||||
|
||||
&__task {
|
||||
margin-top: -20px;
|
||||
margin-top: -5px;
|
||||
padding: 18px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: scroll;
|
||||
|
||||
input {
|
||||
font-style: normal;
|
||||
@ -145,9 +144,12 @@
|
||||
}
|
||||
|
||||
.taskName {
|
||||
display: -webkit-box;
|
||||
max-width: 550px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
|
||||
.fullName {
|
||||
@ -611,8 +613,8 @@
|
||||
.exit {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
right: 15px;
|
||||
top: 25px;
|
||||
right: 20px;
|
||||
width: 13px;
|
||||
height: 13px;
|
||||
display: flex;
|
||||
@ -638,8 +640,8 @@
|
||||
span {
|
||||
font-family: "Inter", sans-serif;
|
||||
font-weight: 500;
|
||||
font-size: 12px;
|
||||
color: #666;
|
||||
font-size: 11px;
|
||||
color: #807777;
|
||||
}
|
||||
|
||||
.nameProject {
|
||||
@ -659,7 +661,7 @@
|
||||
color: #000000;
|
||||
font-size: 12px;
|
||||
line-height: 32px;
|
||||
margin-left: 10px;
|
||||
margin-left: 17px;
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
}
|
||||
@ -847,8 +849,8 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 13px;
|
||||
margin-top: 5px;
|
||||
font-size: 12px;
|
||||
margin-top: 10px;
|
||||
width: 160px;
|
||||
|
||||
p {
|
||||
@ -860,7 +862,7 @@
|
||||
&__creator {
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
|
||||
color: #2d4a17;
|
||||
max-width: 200px;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
@ -873,7 +875,6 @@
|
||||
line-height: 32px;
|
||||
font-weight: 500;
|
||||
display: flex;
|
||||
color: #2d4a17;
|
||||
}
|
||||
}
|
||||
|
||||
@ -963,11 +964,11 @@
|
||||
}
|
||||
|
||||
&_box {
|
||||
padding: 25px 0px 10px 20px;
|
||||
padding: 25px 0px 10px 40px;
|
||||
border-bottom: 1px solid #f1f1f1;
|
||||
|
||||
&-middle {
|
||||
padding: 0px 0px 10px 20px;
|
||||
padding: 0px 0px 10px 35px;
|
||||
border-bottom: 1px solid #f1f1f1;
|
||||
}
|
||||
|
||||
@ -978,7 +979,7 @@
|
||||
position: relative;
|
||||
|
||||
row-gap: 10px;
|
||||
padding: 10px 40px 0px 20px;
|
||||
padding: 10px 40px 0px 40px;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 10px;
|
||||
|
||||
@ -1109,7 +1110,7 @@
|
||||
|
||||
&-priority {
|
||||
position: relative;
|
||||
padding: 10px 40px 0 20px;
|
||||
padding: 10px 40px 0 40px;
|
||||
border-radius: 10px;
|
||||
margin-bottom: 10px;
|
||||
.priority {
|
||||
@ -1169,7 +1170,7 @@
|
||||
}
|
||||
|
||||
&-bottom {
|
||||
padding: 0px 90px 10px 35px;
|
||||
padding: 0px 110px 10px 35px;
|
||||
font-weight: 400;
|
||||
font-size: 14px;
|
||||
line-height: 32px;
|
||||
@ -1185,7 +1186,7 @@
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0 0 0 5px;
|
||||
margin: 0 0 0 12px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -812,7 +812,7 @@ export const TicketFullScreen = () => {
|
||||
<div className="workers fullScreenWorkers">
|
||||
<div className="workers_box task__info">
|
||||
<div className="workers__creator">
|
||||
Создатель: <p>{taskInfo.user?.fio}</p>
|
||||
Создатель: <p> {taskInfo.user?.fio}</p>
|
||||
</div>
|
||||
|
||||
{taskInfo.executor ? (
|
||||
@ -908,7 +908,7 @@ export const TicketFullScreen = () => {
|
||||
>
|
||||
+
|
||||
</button>
|
||||
<span>Добавить участника</span>
|
||||
<span>Добавить участников</span>
|
||||
{dropListMembersOpen && (
|
||||
<div className="dropdownList">
|
||||
<img
|
||||
@ -972,6 +972,7 @@ export const TicketFullScreen = () => {
|
||||
</div>
|
||||
<div className="time">
|
||||
<img src={watch}></img>
|
||||
<span>Длительность: </span>
|
||||
<p>
|
||||
{correctTimerTime(currentTimerCount.hours)}:
|
||||
{correctTimerTime(currentTimerCount.minute)}:
|
||||
@ -1151,7 +1152,7 @@ export const TicketFullScreen = () => {
|
||||
</div>
|
||||
{acceptModalOpen && (
|
||||
<AcceptModal
|
||||
title={"Вы действительно хотите переместить задачу в архив?"}
|
||||
title={"Вы точно хотите переместить задачу в архив?"}
|
||||
closeModal={closeAcceptModal}
|
||||
agreeHandler={deleteTask}
|
||||
/>
|
||||
|
||||
@ -62,6 +62,7 @@
|
||||
.workers__creator {
|
||||
margin-bottom: 0 !important;
|
||||
display: flex;
|
||||
|
||||
}
|
||||
|
||||
.add-worker {
|
||||
|
||||
@ -75,7 +75,7 @@ export const TrackerModal = ({
|
||||
"Выберите приоритет колонки"
|
||||
);
|
||||
const [selectedExecutorTask, setSelectedExecutorTask] = useState(
|
||||
"Выберите исполнителя"
|
||||
"Выберите исполнителя задачи"
|
||||
);
|
||||
const [selectExecutorTaskOpen, setSelectExecutorTaskOpen] = useState(false);
|
||||
const [correctProjectUsers, setCorrectProjectUsers] = useState([]);
|
||||
@ -183,7 +183,7 @@ export const TrackerModal = ({
|
||||
setActive(false);
|
||||
setValueTicket("");
|
||||
setDescriptionTicket("");
|
||||
setSelectedExecutorTask("Выберите исполнителя");
|
||||
setSelectedExecutorTask("Выберите исполнителя задачи");
|
||||
setSelectedPriority(null);
|
||||
});
|
||||
} else {
|
||||
@ -407,7 +407,7 @@ export const TrackerModal = ({
|
||||
<div className="title-project select-person">
|
||||
<h4>Добавьте участника</h4>
|
||||
<p className="select-person__info">
|
||||
Выберите пользователя в списке или добавьте по e-mail
|
||||
Выберите пользователя в проекте или добавьте по e-mail
|
||||
</p>
|
||||
<div className="invite__blocks">
|
||||
<div className="add-person-block">
|
||||
@ -440,7 +440,7 @@ export const TrackerModal = ({
|
||||
setSelectedWorker(worker);
|
||||
}}
|
||||
>
|
||||
<span>{worker.employee.fio}</span>
|
||||
<p>{worker.employee.fio}</p>
|
||||
<img
|
||||
src={urlForLocal(worker.employee.avatar)}
|
||||
alt="avatar"
|
||||
@ -473,10 +473,10 @@ export const TrackerModal = ({
|
||||
/>
|
||||
</div>
|
||||
<BaseButton
|
||||
styles={"button-add add-person-btn"}
|
||||
styles={"button-add invite-person-block__btn"}
|
||||
onClick={inviteUserByEmail}
|
||||
>
|
||||
Пригласить
|
||||
Отправить приглашение
|
||||
</BaseButton>
|
||||
</div>
|
||||
</div>
|
||||
@ -489,11 +489,20 @@ export const TrackerModal = ({
|
||||
<div className="title-project">
|
||||
<div className="createTaskHead">
|
||||
<div className="createTaskBody__right__owner">
|
||||
<p>Создание задачи</p>
|
||||
<p>Создатель: {profileInfo?.fio}</p>
|
||||
<img
|
||||
src={
|
||||
profileInfo.photo
|
||||
? urlForLocal(profileInfo.photo)
|
||||
: avatarMok
|
||||
}
|
||||
alt="avatar"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="createTaskBody">
|
||||
<div className="createTaskBody__left">
|
||||
<h4>Введите название и описание задачи</h4>
|
||||
<div className="input-container">
|
||||
<input
|
||||
maxLength="100"
|
||||
@ -640,12 +649,12 @@ export const TrackerModal = ({
|
||||
<div className="selected__executor">
|
||||
{selectedExecutorTask.user_id ? (
|
||||
<>
|
||||
<span>{selectedExecutorTask.user.fio}</span>
|
||||
<img
|
||||
className="avatar"
|
||||
src={urlForLocal(selectedExecutorTask.user.avatar)}
|
||||
alt="avatar"
|
||||
/>
|
||||
<span>{selectedExecutorTask.user.fio}</span>
|
||||
</>
|
||||
) : (
|
||||
<span>{selectedExecutorTask}</span>
|
||||
@ -662,6 +671,7 @@ export const TrackerModal = ({
|
||||
className="executor"
|
||||
key={person.user_id}
|
||||
>
|
||||
<span>{person.user.fio}</span>
|
||||
<img
|
||||
className="avatar"
|
||||
src={
|
||||
@ -671,7 +681,6 @@ export const TrackerModal = ({
|
||||
}
|
||||
alt="avatar"
|
||||
/>
|
||||
<span>{person.user.fio}</span>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
@ -683,10 +692,12 @@ export const TrackerModal = ({
|
||||
</div>
|
||||
<div className="createTaskBody__right__deadLine">
|
||||
<img src={calendarImg} alt="calendar" />
|
||||
<span>Срок исполнения</span>
|
||||
<img src={arrowRight} className="arrow" alt="arrow" />
|
||||
<p onClick={() => setDatePickerOpen(!datePickerOpen)}>
|
||||
{deadLineDate
|
||||
? getCorrectDate(deadLineDate)
|
||||
: "Срок исполнения"}
|
||||
: "Дата не выбрана"}
|
||||
</p>
|
||||
<DatePicker
|
||||
className="datePicker"
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
row-gap: 12px;
|
||||
padding-bottom: 15px;
|
||||
|
||||
.select-priority {
|
||||
@ -173,13 +174,11 @@
|
||||
.executor {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
&:hover {
|
||||
font-weight: 600;
|
||||
}
|
||||
span {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
span {
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -223,7 +222,7 @@
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
min-width: 240px;
|
||||
min-width: 320px;
|
||||
height: 42px;
|
||||
width: 100%;
|
||||
|
||||
@ -236,16 +235,6 @@
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
span {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
font-size: 13px;
|
||||
max-width: 270px;
|
||||
margin: 0;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
img {
|
||||
transition: all 0.3s ease;
|
||||
width: 20px;
|
||||
@ -257,7 +246,6 @@
|
||||
overflow-y: auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
padding: 9.5px 12px;
|
||||
@ -336,7 +324,7 @@
|
||||
}
|
||||
|
||||
.createTaskBody {
|
||||
padding: 15px 20px;
|
||||
padding: 10px;
|
||||
display: flex;
|
||||
column-gap: 20px;
|
||||
|
||||
@ -372,8 +360,8 @@
|
||||
}
|
||||
|
||||
.ck-editor__editable.ck-rounded-corners {
|
||||
min-height: 150px;
|
||||
max-height: 150px;
|
||||
min-height: 130px;
|
||||
max-height: 130px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -388,10 +376,10 @@
|
||||
align-items: center;
|
||||
column-gap: 9.5px;
|
||||
p {
|
||||
font-size: 18px;
|
||||
color: #2d4a17;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
line-height: 32px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
|
||||
img {
|
||||
@ -407,7 +395,7 @@
|
||||
|
||||
.tags {
|
||||
&__selected {
|
||||
width: 250px;
|
||||
width: 393px;
|
||||
font-weight: 300;
|
||||
line-height: 18px;
|
||||
font-size: 15px;
|
||||
@ -538,7 +526,7 @@
|
||||
|
||||
&__name {
|
||||
color: #000;
|
||||
width: 250px;
|
||||
width: 393px;
|
||||
height: 47px;
|
||||
font-size: 15px;
|
||||
font-weight: 400;
|
||||
@ -586,7 +574,7 @@
|
||||
|
||||
.select__executor {
|
||||
background: #f1f1f1;
|
||||
width: 250px;
|
||||
width: 393px;
|
||||
height: 47px;
|
||||
font-weight: 300;
|
||||
line-height: 18px;
|
||||
@ -606,7 +594,7 @@
|
||||
&__deadLine {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
column-gap: 5px;
|
||||
column-gap: 18px;
|
||||
font-weight: 300;
|
||||
line-height: 18px;
|
||||
font-size: 15px;
|
||||
@ -742,7 +730,8 @@
|
||||
}
|
||||
|
||||
.add-person-btn {
|
||||
margin: 0;
|
||||
margin: 0 auto 0 0;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.modal-add.active {
|
||||
|
||||
@ -7,7 +7,6 @@ import { Link, Navigate } from "react-router-dom";
|
||||
import { getProfileInfo } from "@redux/outstaffingSlice";
|
||||
import {
|
||||
getRequestDates,
|
||||
setEditReport,
|
||||
setReportDate,
|
||||
setRequestDate
|
||||
} from "@redux/reportSlice";
|
||||
@ -102,10 +101,7 @@ export const ProfileCalendar = () => {
|
||||
<Link to="/profile/calendar/report">
|
||||
<button
|
||||
className="calendar__btn"
|
||||
onClick={() => {
|
||||
dispatch(setReportDate(""));
|
||||
dispatch(setEditReport(""));
|
||||
}}
|
||||
onClick={() => dispatch(setReportDate(""))}
|
||||
>
|
||||
Заполнить отчет
|
||||
</button>
|
||||
|
||||
@ -5,7 +5,6 @@ import { useDispatch } from "react-redux";
|
||||
import { Link } from "react-router-dom";
|
||||
|
||||
import {
|
||||
setEditReport,
|
||||
setReportDate,
|
||||
setRequestDate,
|
||||
setSendRequest
|
||||
@ -236,7 +235,6 @@ export const ProfileCalendarComponent = React.memo(
|
||||
else {
|
||||
dispatch(setReportDate(day));
|
||||
dispatch(setSendRequest(true));
|
||||
dispatch(setEditReport(""));
|
||||
}
|
||||
}}
|
||||
onMouseEnter={() => {
|
||||
|
||||
@ -109,7 +109,7 @@ export const ProjectTicket = ({ project, index }) => {
|
||||
to={`/profile/statistics/${project.id}`}
|
||||
className="project__statistics"
|
||||
>
|
||||
Посмотреть статистику
|
||||
Просмотреть статистику
|
||||
</Link>
|
||||
|
||||
<TrackerModal
|
||||
@ -133,7 +133,7 @@ export const ProjectTicket = ({ project, index }) => {
|
||||
</div>
|
||||
<div>
|
||||
<img src={link}></img>
|
||||
<p onClick={copyProjectLink(project.id)}>скопировать ссылку</p>
|
||||
<p onClick={copyProjectLink(project.id)}>ссылка на проект</p>
|
||||
</div>
|
||||
<div
|
||||
onClick={() => {
|
||||
@ -158,7 +158,7 @@ export const ProjectTicket = ({ project, index }) => {
|
||||
</ModalSelect>
|
||||
{acceptModalOpen && (
|
||||
<AcceptModal
|
||||
title={"Вы действительно хотите переместить проект в архив?"}
|
||||
title={"Вы точно хотите переместить проект в архив?"}
|
||||
closeModal={closeAcceptModal}
|
||||
agreeHandler={removeProject}
|
||||
/>
|
||||
@ -166,7 +166,7 @@ export const ProjectTicket = ({ project, index }) => {
|
||||
|
||||
{modalDelete && (
|
||||
<AcceptModal
|
||||
title={"Вы действительно хотите удалить проект?"}
|
||||
title={"Вы точно хотите удалить?"}
|
||||
closeModal={closeAcceptModal}
|
||||
agreeHandler={removeProject}
|
||||
/>
|
||||
|
||||
@ -80,8 +80,8 @@
|
||||
position: absolute;
|
||||
font-size: 21px;
|
||||
color: #6f6f6f;
|
||||
right: 15px;
|
||||
top: 0px;
|
||||
right: 26px;
|
||||
top: 10px;
|
||||
}
|
||||
|
||||
&__avatar {
|
||||
|
||||
@ -3,11 +3,9 @@ import React, { useEffect, useState } from "react";
|
||||
import DatePicker, { registerLocale } from "react-datepicker";
|
||||
import "react-datepicker/dist/react-datepicker.css";
|
||||
import { useSelector } from "react-redux";
|
||||
import { useDispatch } from "react-redux";
|
||||
import { Link, Navigate, useNavigate } from "react-router-dom";
|
||||
|
||||
import { getEditReport, getReportDate } from "@redux/reportSlice";
|
||||
import { setEditReport } from "@redux/reportSlice";
|
||||
import { getReportDate } from "@redux/reportSlice";
|
||||
|
||||
import { apiRequest } from "@api/request";
|
||||
|
||||
@ -37,8 +35,6 @@ const ReportForm = () => {
|
||||
}
|
||||
const navigate = useNavigate();
|
||||
const reportDate = useSelector(getReportDate);
|
||||
const editReport = useSelector(getEditReport);
|
||||
const dispatch = useDispatch();
|
||||
|
||||
useEffect(() => {
|
||||
initListeners();
|
||||
@ -47,23 +43,15 @@ const ReportForm = () => {
|
||||
const [isFetching, setIsFetching] = useState(false);
|
||||
const [reportSuccess, setReportSuccess] = useState("");
|
||||
const [startDate, setStartDate] = useState(
|
||||
reportDate || editReport
|
||||
? new Date(reportDate ? reportDate._d : editReport.created_at)
|
||||
: new Date()
|
||||
reportDate ? new Date(reportDate._d) : new Date()
|
||||
);
|
||||
const [datePickerOpen, setDatePickerOpen] = useState(false);
|
||||
|
||||
const [inputs, setInputs] = useState(
|
||||
editReport
|
||||
? editReport.task
|
||||
: [{ task: "", hours_spent: "", minutes_spent: 0 }]
|
||||
);
|
||||
const [troublesInputValue, setTroublesInputValue] = useState(
|
||||
editReport ? editReport.difficulties : ""
|
||||
);
|
||||
const [scheduledInputValue, setScheduledInputValue] = useState(
|
||||
editReport ? editReport.tomorrow : ""
|
||||
);
|
||||
const [inputs, setInputs] = useState([
|
||||
{ task: "", hours_spent: "", minutes_spent: 0 }
|
||||
]);
|
||||
const [troublesInputValue, setTroublesInputValue] = useState("");
|
||||
const [scheduledInputValue, setScheduledInputValue] = useState("");
|
||||
|
||||
const addInput = () => {
|
||||
setInputs((prev) => [
|
||||
@ -124,49 +112,14 @@ const ReportForm = () => {
|
||||
setReportSuccess("");
|
||||
navigate("/profile/calendar");
|
||||
}, 1000);
|
||||
setInputs(() => []);
|
||||
setTroublesInputValue("");
|
||||
setScheduledInputValue("");
|
||||
setIsFetching(false);
|
||||
clearParams();
|
||||
setInputs(() => [{ task: "", hours_spent: "", minutes_spent: 0 }]);
|
||||
});
|
||||
};
|
||||
|
||||
const handleEditReport = () => {
|
||||
setIsFetching(true);
|
||||
for (let input of inputs) {
|
||||
if (!input.task || !input.hours_spent) {
|
||||
setReportSuccess("Заполните задачи");
|
||||
setTimeout(() => setReportSuccess(""), 2000);
|
||||
setIsFetching(false);
|
||||
return;
|
||||
}
|
||||
}
|
||||
apiRequest(`/reports/update?id=${editReport.id}`, {
|
||||
method: "PUT",
|
||||
data: {
|
||||
tasks: inputs,
|
||||
difficulties: troublesInputValue,
|
||||
tomorrow: scheduledInputValue,
|
||||
created_at: getCreatedDate(startDate),
|
||||
status: 1
|
||||
}
|
||||
}).then(() => {
|
||||
setReportSuccess("Отчет изменён");
|
||||
setTimeout(() => {
|
||||
setReportSuccess("");
|
||||
navigate("/profile/calendar");
|
||||
}, 1000);
|
||||
setIsFetching(false);
|
||||
clearParams();
|
||||
dispatch(setEditReport(""));
|
||||
});
|
||||
};
|
||||
|
||||
const clearParams = () => {
|
||||
setInputs(() => []);
|
||||
setTroublesInputValue("");
|
||||
setScheduledInputValue("");
|
||||
setInputs(() => [{ task: "", hours_spent: "", minutes_spent: 0 }]);
|
||||
};
|
||||
|
||||
return (
|
||||
<section className="report-form">
|
||||
<ProfileHeader />
|
||||
@ -180,8 +133,7 @@ const ReportForm = () => {
|
||||
]}
|
||||
/>
|
||||
<h2 className="summary__title">
|
||||
Ваши отчеты -{" "}
|
||||
<span>{editReport ? "редактировать отчет" : "добавить отчет"}</span>
|
||||
Ваши отчеты - <span>добавить отчет</span>
|
||||
</h2>
|
||||
<div>
|
||||
<div className="report__head">
|
||||
@ -195,14 +147,13 @@ const ReportForm = () => {
|
||||
<div className="report-form__content">
|
||||
<div className="report-form__block">
|
||||
<div className="report-form__block-title">
|
||||
<h2>
|
||||
{editReport
|
||||
? "Редактирование отчета за день"
|
||||
: "Добавление отчета за день"}
|
||||
</h2>
|
||||
<h2>Добавление отчета за день</h2>
|
||||
<h3>Дата заполнения отчета:</h3>
|
||||
</div>
|
||||
<div className="report-form__block-img">
|
||||
<div
|
||||
className="report-form__block-img"
|
||||
onClick={() => setDatePickerOpen(true)}
|
||||
>
|
||||
<img
|
||||
className="report-form__calendar-icon"
|
||||
src={calendarIcon}
|
||||
@ -348,15 +299,9 @@ const ReportForm = () => {
|
||||
) : (
|
||||
<button
|
||||
className="report-form__footer-btn"
|
||||
onClick={() => {
|
||||
if (editReport) {
|
||||
handleEditReport();
|
||||
} else {
|
||||
handler();
|
||||
}
|
||||
}}
|
||||
onClick={() => handler()}
|
||||
>
|
||||
{editReport ? "Редактировать" : "Отправить"}
|
||||
Отпаравить
|
||||
</button>
|
||||
)}
|
||||
<p className="report-form__footer-text">
|
||||
|
||||
@ -6,7 +6,7 @@ const StarRating = ({
|
||||
countStars = 1,
|
||||
countActiveStars = 1,
|
||||
color = "#52B709",
|
||||
size = 40
|
||||
size = 61
|
||||
}) => {
|
||||
const [shadedStars, setShadedStars] = useState([]);
|
||||
const [noShadedStars, setNoShadedStars] = useState([]);
|
||||
|
||||
@ -18,13 +18,13 @@ export const AlertResult = ({ info }) => {
|
||||
style={{ color: successTest ? "#52B709" : "#5B6871" }}
|
||||
>
|
||||
Благодарим Вас за прохождение теста "{info.questionnaire_title}". Ваши
|
||||
результаты проверены, мы готовы пригласить Вас в команду
|
||||
результаты проверены, готовы пригласить Вас в команду
|
||||
</div>
|
||||
</div>
|
||||
{!successTest && (
|
||||
<div className="alert-result__column">
|
||||
<button className="alert-result__button quiz-btn">
|
||||
Запросить пересдачу
|
||||
Запросить еще попытку
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@ -3,6 +3,12 @@ import React from "react";
|
||||
import StarRating from "@components/StarRating/StarRating";
|
||||
|
||||
export const QuizReport = ({ info }) => {
|
||||
function correctAnswers() {
|
||||
return info.number_questions * info.percent_correct_answers;
|
||||
}
|
||||
function correctWrongAnswers() {
|
||||
return info.number_questions * (1 - info.percent_correct_answers);
|
||||
}
|
||||
return (
|
||||
<div className="report">
|
||||
<div className="report__row">
|
||||
@ -17,13 +23,19 @@ export const QuizReport = ({ info }) => {
|
||||
</div>
|
||||
<div className="report__column">
|
||||
<div className="report__value">
|
||||
{info.count_correct_answers}/{info.number_questions}
|
||||
{Boolean(correctAnswers()) ? correctAnswers() : 0}
|
||||
</div>
|
||||
<div className="report__text">правильных ответов</div>
|
||||
</div>
|
||||
<div className="report__column">
|
||||
<div className="report__value report__value_false">
|
||||
{Boolean(correctWrongAnswers()) ? correctWrongAnswers() : 0}
|
||||
</div>
|
||||
<div className="report__text">неправильных ответов</div>
|
||||
</div>
|
||||
<div className="report__column">
|
||||
<div className="report__status-text">Статус:</div>
|
||||
<div className="report__status">Пройден!</div>
|
||||
<div className="report__status">Пройдено!</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -31,14 +31,16 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
.quiz-btn {
|
||||
display: flex;
|
||||
font-family: "Lab Grotesque";
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
|
||||
// box-shadow: 6px 5px 20px rgba(82, 151, 34, 0.21);
|
||||
white-space: nowrap;
|
||||
background: #406128;
|
||||
border-radius: 44px;
|
||||
color: #fff;
|
||||
outline: none;
|
||||
//border: 2px solid #52b709;
|
||||
border: none;
|
||||
transition: 0 all ease 0.8s;
|
||||
padding: 7px 51px;
|
||||
@ -46,6 +48,11 @@ $maxWidthContainer: 1123;
|
||||
font-size: 14px;
|
||||
text-decoration: none;
|
||||
line-height: 200%;
|
||||
// &:hover{
|
||||
// text-decoration: none;
|
||||
// color: #52b709;
|
||||
// background: #fff;
|
||||
// }
|
||||
&_back {
|
||||
background: #dddddd;
|
||||
color: #000;
|
||||
@ -61,11 +68,13 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
}
|
||||
.quiz-title_h3 {
|
||||
font-family: "Lab Grotesque";
|
||||
font-weight: 700;
|
||||
font-size: 18px;
|
||||
line-height: 156%;
|
||||
color: #52b709;
|
||||
}
|
||||
//=============================================
|
||||
|
||||
.error-msg {
|
||||
text-align: center;
|
||||
@ -131,6 +140,7 @@ $maxWidthContainer: 1123;
|
||||
.form-task__group {
|
||||
display: block;
|
||||
margin-bottom: 13px;
|
||||
font-family: "Lab Grotesque";
|
||||
label {
|
||||
font-weight: 400;
|
||||
font-size: 15px;
|
||||
@ -302,9 +312,9 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
|
||||
.card-introduction {
|
||||
padding: 0px 20px;
|
||||
padding: 0px 25px;
|
||||
margin: 0px 0px 50px 0px;
|
||||
flex: 0 1 33%;
|
||||
flex: 0 1 33.333%;
|
||||
@media (max-width: 850px) {
|
||||
flex: 0 1 50%;
|
||||
}
|
||||
@ -314,13 +324,14 @@ $maxWidthContainer: 1123;
|
||||
|
||||
&__body {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
gap: 20px;
|
||||
}
|
||||
&__title {
|
||||
font-weight: 900;
|
||||
font-size: 18px;
|
||||
font-size: 14px;
|
||||
line-height: 171%;
|
||||
color: #52b709;
|
||||
margin-bottom: 10px;
|
||||
margin: 0 0 30px 0;
|
||||
}
|
||||
&__icon {
|
||||
flex: 0 0 25px;
|
||||
@ -332,8 +343,8 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
&__text {
|
||||
font-weight: 400;
|
||||
font-size: 15px;
|
||||
line-height: 20px;
|
||||
font-size: 12px;
|
||||
line-height: 200%;
|
||||
color: #000000;
|
||||
}
|
||||
}
|
||||
@ -341,8 +352,20 @@ $maxWidthContainer: 1123;
|
||||
.quiz-passing-information {
|
||||
background: #fff;
|
||||
border-radius: 12px;
|
||||
&__container {
|
||||
// @media (max-width: 600px) {
|
||||
// display: block;
|
||||
// }
|
||||
// @media (max-width: 600px) {
|
||||
// display: block;
|
||||
// }
|
||||
// @media (max-width: 600px) {
|
||||
// display: block;
|
||||
// }
|
||||
}
|
||||
&__main {
|
||||
padding: 30px;
|
||||
//flex: 1 1 auto;
|
||||
padding: 35px 45px;
|
||||
height: 100%;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1.2fr 1.2fr 0.6fr;
|
||||
@ -365,7 +388,7 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
&__text {
|
||||
font-weight: 400;
|
||||
font-size: 14px;
|
||||
font-size: 12px;
|
||||
line-height: 167%;
|
||||
color: #6f6f6f;
|
||||
span {
|
||||
@ -376,7 +399,7 @@ $maxWidthContainer: 1123;
|
||||
&__timer,
|
||||
&__attempt {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
gap: 23px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@ -425,10 +448,10 @@ $maxWidthContainer: 1123;
|
||||
|
||||
&__container {
|
||||
display: block;
|
||||
@include adaptiv-value("padding-top", 15, 15, 1);
|
||||
@include adaptiv-value("padding-bottom", 15, 15, 1);
|
||||
@include adaptiv-value("padding-right", 15, 15, 1);
|
||||
@include adaptiv-value("padding-left", 15, 15, 1);
|
||||
@include adaptiv-value("padding-top", 30, 20, 1);
|
||||
@include adaptiv-value("padding-bottom", 30, 20, 1);
|
||||
@include adaptiv-value("padding-right", 28, 18, 1);
|
||||
@include adaptiv-value("padding-left", 28, 18, 1);
|
||||
}
|
||||
|
||||
&:hover {
|
||||
@ -440,8 +463,8 @@ $maxWidthContainer: 1123;
|
||||
&__top-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 15px;
|
||||
gap: 19px;
|
||||
margin: 0 0 24px 0;
|
||||
}
|
||||
&__title {
|
||||
font-weight: 500;
|
||||
@ -459,8 +482,9 @@ $maxWidthContainer: 1123;
|
||||
|
||||
p {
|
||||
flex: 0 1 66%;
|
||||
font-weight: 500;
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #000000;
|
||||
margin-bottom: 0;
|
||||
|
||||
@ -484,7 +508,7 @@ $maxWidthContainer: 1123;
|
||||
border-radius: 12px;
|
||||
padding: 13px 16px;
|
||||
position: absolute;
|
||||
bottom: 0px;
|
||||
bottom: 20px;
|
||||
left: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -493,7 +517,8 @@ $maxWidthContainer: 1123;
|
||||
gap: 10px;
|
||||
p {
|
||||
font-weight: 500;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
line-height: 129%;
|
||||
color: #000000;
|
||||
}
|
||||
a {
|
||||
@ -520,6 +545,7 @@ $maxWidthContainer: 1123;
|
||||
.block-completed-test {
|
||||
background: #ffffff;
|
||||
border-radius: 12px;
|
||||
// .block-completed-test__container
|
||||
|
||||
&__container {
|
||||
padding: 41px 35px 29px 59px;
|
||||
@ -528,6 +554,8 @@ $maxWidthContainer: 1123;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
// .block-completed-test__img
|
||||
|
||||
&__img {
|
||||
flex: 0 0 54px;
|
||||
height: 60px;
|
||||
@ -539,6 +567,8 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
}
|
||||
|
||||
// .block-completed-test__title
|
||||
|
||||
&__title {
|
||||
font-weight: 700;
|
||||
font-size: 18px;
|
||||
@ -547,20 +577,27 @@ $maxWidthContainer: 1123;
|
||||
color: #52b709;
|
||||
}
|
||||
|
||||
// .block-completed-test__text
|
||||
|
||||
&__text {
|
||||
max-width: 386px;
|
||||
margin: 0 26px 0 0;
|
||||
font-weight: 500;
|
||||
font-size: 13px;
|
||||
font-weight: 400;
|
||||
font-size: 12px;
|
||||
line-height: 200%;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
// .block-completed-test__button
|
||||
|
||||
&__button {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.report {
|
||||
// .report__row
|
||||
|
||||
&__row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -572,37 +609,36 @@ $maxWidthContainer: 1123;
|
||||
}
|
||||
}
|
||||
|
||||
// .report__column
|
||||
|
||||
&__column {
|
||||
&:first-child {
|
||||
background: #ffffff;
|
||||
flex: 0 1 40%;
|
||||
border-radius: 12px 0 0 12px;
|
||||
flex: 0 1 22%;
|
||||
border-radius: 12px;
|
||||
@media (max-width: 1000px) {
|
||||
flex: 0 1 50%;
|
||||
}
|
||||
@media (max-width: 600px) {
|
||||
border-radius: 12px 12px 0 0;
|
||||
}
|
||||
}
|
||||
height: 90px;
|
||||
flex: 0 1 30%;
|
||||
height: 128px;
|
||||
border-radius: 0px 12px 0px 0px;
|
||||
flex: 0 1 26%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background: #e1fccf;
|
||||
gap: 10px;
|
||||
gap: 21px;
|
||||
&:last-child {
|
||||
border-radius: 0 12px 12px 0;
|
||||
gap: 10px;
|
||||
@media (max-width: 1000px) {
|
||||
flex: 0 1 50%;
|
||||
}
|
||||
@media (max-width: 600px) {
|
||||
border-radius: 0 0 12px 12px;
|
||||
}
|
||||
flex-direction: column;
|
||||
gap: 0;
|
||||
}
|
||||
@media (max-width: 1000px) {
|
||||
flex: 0 1 50%;
|
||||
}
|
||||
}
|
||||
|
||||
// .report__job-title
|
||||
|
||||
&__job-title {
|
||||
font-weight: 500;
|
||||
font-size: 18px;
|
||||
@ -610,17 +646,22 @@ $maxWidthContainer: 1123;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
// .report__value
|
||||
|
||||
&__value {
|
||||
font-weight: 700;
|
||||
font-size: 52px;
|
||||
line-height: 56%;
|
||||
color: #52b709;
|
||||
// .report__value_false
|
||||
|
||||
&_false {
|
||||
color: #5b6871;
|
||||
}
|
||||
}
|
||||
|
||||
// .report__text
|
||||
|
||||
&__text {
|
||||
font-weight: 400;
|
||||
font-size: 16px;
|
||||
@ -628,20 +669,26 @@ $maxWidthContainer: 1123;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
// .report__status-text
|
||||
|
||||
&__status-text {
|
||||
font-weight: 500;
|
||||
font-size: 15px;
|
||||
font-weight: 400;
|
||||
font-size: 12px;
|
||||
line-height: 200%;
|
||||
color: #000000;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
// .report__status
|
||||
|
||||
&__status {
|
||||
background: #1458dd;
|
||||
border-radius: 5px;
|
||||
border-radius: 44px;
|
||||
font-weight: 500;
|
||||
font-size: 16px;
|
||||
line-height: 200%;
|
||||
color: #ffffff;
|
||||
padding: 7px 14px;
|
||||
padding: 7px 34px;
|
||||
max-width: 154px;
|
||||
}
|
||||
}
|
||||
@ -649,19 +696,19 @@ $maxWidthContainer: 1123;
|
||||
.alert-result {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@include adaptiv-value("padding-top", 20, 20, 1);
|
||||
@include adaptiv-value("padding-bottom", 20, 20, 1);
|
||||
@include adaptiv-value("padding-right", 20, 20, 1);
|
||||
@include adaptiv-value("padding-left", 20, 20, 1);
|
||||
@include adaptiv-value("padding-top", 39, 20, 1);
|
||||
@include adaptiv-value("padding-bottom", 39, 20, 1);
|
||||
@include adaptiv-value("padding-right", 61, 20, 1);
|
||||
@include adaptiv-value("padding-left", 61, 20, 1);
|
||||
background: #fff;
|
||||
gap: 10px;
|
||||
gap: 30px;
|
||||
border-radius: 10px;
|
||||
@media (max-width: 900px) {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
&__column {
|
||||
display: flex;
|
||||
@include adaptiv-value("gap", 20, 20, 1);
|
||||
@include adaptiv-value("gap", 44, 14, 1);
|
||||
align-items: center;
|
||||
@media (max-width: 900px) {
|
||||
flex: 1 1 auto;
|
||||
|
||||
@ -6,8 +6,7 @@ export const useFormValidation = (
|
||||
apiEndpoint,
|
||||
fields,
|
||||
showNotificationError,
|
||||
showNotificationTrue,
|
||||
isPartner
|
||||
showNotificationTrue
|
||||
) => {
|
||||
// Состояние формы, содержащее значения полей
|
||||
const [formData, setFormData] = useState(fields);
|
||||
@ -85,7 +84,7 @@ export const useFormValidation = (
|
||||
e.preventDefault();
|
||||
// Проверка валидации формы
|
||||
if (validateForm()) {
|
||||
let newformData = { ...formData, is_partner: isPartner ? 1 : 0 };
|
||||
let newformData = { ...formData };
|
||||
delete newformData.secondPassword;
|
||||
|
||||
try {
|
||||
|
||||
@ -39,7 +39,7 @@ export const PartnerCategories = () => {
|
||||
setLoader(true);
|
||||
apiRequest("/project/my-employee").then((el) => {
|
||||
setLoader(false);
|
||||
setStaff(el?.managerEmployees);
|
||||
setStaff(el.managerEmployees);
|
||||
});
|
||||
}, []);
|
||||
|
||||
@ -161,22 +161,16 @@ export const PartnerCategories = () => {
|
||||
<Loader style={"green"} height={80} width={80} />
|
||||
) : (
|
||||
<div className="partnerCategories__items">
|
||||
{Boolean(staff) ? (
|
||||
staff.map((card) => {
|
||||
return (
|
||||
<PartnerPersonCard
|
||||
key={card.id}
|
||||
name={card.employee.fio}
|
||||
img={card.employee.avatar}
|
||||
userId={card.user_id}
|
||||
/>
|
||||
);
|
||||
})
|
||||
) : (
|
||||
<span className="partnerCategories__empty">
|
||||
У вас нет нанятого персонала
|
||||
</span>
|
||||
)}
|
||||
{staff.map((card) => {
|
||||
return (
|
||||
<PartnerPersonCard
|
||||
key={card.id}
|
||||
name={card.employee.fio}
|
||||
img={card.employee.avatar}
|
||||
userId={card.user_id}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
{/*{personalInfoItems.map((item, index) => {*/}
|
||||
{/* return (*/}
|
||||
{/* <Link*/}
|
||||
|
||||
@ -21,12 +21,6 @@
|
||||
//column-gap: 21px;
|
||||
}
|
||||
|
||||
&__empty {
|
||||
font-size: 18px;
|
||||
font-weight: 500;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
|
||||
.item {
|
||||
display: flex;
|
||||
|
||||
@ -70,7 +70,7 @@ export const ProfileCandidate = () => {
|
||||
<div className="profile-candidate__instructions instructions-candidate">
|
||||
<div className="instructions-candidate__container">
|
||||
<div className="instructions-candidate___row">
|
||||
<div className="instructions-candidate__title">Инструкция:</div>
|
||||
<div className="instructions-candidate__title">Интсрукция:</div>
|
||||
<div className="instructions-candidate__note">
|
||||
<img
|
||||
className="instructions-candidate__icon"
|
||||
@ -93,7 +93,7 @@ export const ProfileCandidate = () => {
|
||||
alt=""
|
||||
/>
|
||||
<div className="instructions-candidate__text">
|
||||
Тесты ITguild предназначены для того, чтобы подтверждать
|
||||
Тесты itguild предназначены для того, чтобы подтверждать
|
||||
навыки, которые вы указали у себя.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -43,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 close from "assets/icons/close.png";
|
||||
import commentsBoard from "assets/icons/commentsBoard.svg";
|
||||
import del from "assets/icons/delete.svg";
|
||||
@ -529,9 +528,7 @@ export const ProjectTracker = () => {
|
||||
</div>
|
||||
)}
|
||||
{projectBoard.projectUsers?.length > 3 && (
|
||||
<span className="countPersons">
|
||||
+{projectBoard.projectUsers?.length - 3}
|
||||
</span>
|
||||
<span className="countPersons">+1</span>
|
||||
)}
|
||||
<span
|
||||
className="add-person"
|
||||
@ -900,18 +897,21 @@ export const ProjectTracker = () => {
|
||||
className="tasks__board__item__description"
|
||||
></p>
|
||||
<div className="tasks__board__item__executor">
|
||||
<img
|
||||
src={
|
||||
task.executor?.avatar
|
||||
? urlForLocal(task.executor?.avatar)
|
||||
: avatarMok
|
||||
}
|
||||
alt="avatar"
|
||||
/>
|
||||
<span>
|
||||
{task.executor?.fio ||
|
||||
"Исполнитель не назначен"}
|
||||
{task.executor?.fio
|
||||
? task.executor?.fio
|
||||
: "Исполнитель не назначен"}
|
||||
</span>
|
||||
{task.executor?.avatar && (
|
||||
<img
|
||||
src={
|
||||
task.executor?.avatar
|
||||
? urlForLocal(task.executor?.avatar)
|
||||
: avatarMok
|
||||
}
|
||||
alt="avatar"
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
{Boolean(task.mark.length) && (
|
||||
<div className="tasks__board__item__tags">
|
||||
@ -943,7 +943,7 @@ export const ProjectTracker = () => {
|
||||
)}
|
||||
{task.dead_line && (
|
||||
<div className="tasks__board__item__deadLine">
|
||||
<img src={calendarIcon} alt="calendar" />
|
||||
<p>Срок исполнения:</p>
|
||||
<span>
|
||||
{getCorrectDate(task.dead_line)}
|
||||
</span>
|
||||
@ -1001,9 +1001,7 @@ export const ProjectTracker = () => {
|
||||
</div>
|
||||
{acceptModalOpen && (
|
||||
<AcceptModal
|
||||
title={
|
||||
"В колонке ещё есть задачи, Вы действительно хотите удалить её ?"
|
||||
}
|
||||
title={"В колонке ещё есть задачи, Вы точно хотите удалить её ?"}
|
||||
closeModal={closeAcceptModal}
|
||||
agreeHandler={() => deleteColumn(currentColumnDelete)}
|
||||
/>
|
||||
|
||||
@ -10,6 +10,7 @@ import { Footer } from "@components/Common/Footer/Footer";
|
||||
import { Navigation } from "@components/Navigation/Navigation";
|
||||
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
|
||||
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
|
||||
// import { HeadBottom } from "@components/features/Candidate-lk/HeadBottom";
|
||||
import { BlockCompletedTest } from "@components/features/quiz/BlockCompletedTest";
|
||||
import { CardIntroduction } from "@components/features/quiz/Card-introduction";
|
||||
import { QuizPassingInformation } from "@components/features/quiz/Quiz-passing-information";
|
||||
@ -42,12 +43,12 @@ export const PassingTests = () => {
|
||||
{
|
||||
title: "Зачем?",
|
||||
description:
|
||||
"Тесты ITguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя."
|
||||
"Тесты itguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя."
|
||||
},
|
||||
{
|
||||
title: "Почему именно тестирование?",
|
||||
description:
|
||||
"Тесты ITguild заменяют первое техническое собеседование по любой вакансии."
|
||||
"Тесты itguild заменяют первое техническое собеседование по любой вакансии."
|
||||
},
|
||||
{
|
||||
title: "Какие тесты нужно проходить?",
|
||||
@ -137,6 +138,11 @@ export const PassingTests = () => {
|
||||
)}
|
||||
</div>
|
||||
<Footer />
|
||||
{/*<Prompt*/}
|
||||
{/* when={showPrompt}*/}
|
||||
{/* message="Unsaved changes detected, continue?"*/}
|
||||
{/* beforeUnload={true}*/}
|
||||
{/*/>*/}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@ -17,12 +17,12 @@
|
||||
}
|
||||
&__block {
|
||||
background: #e1fccf;
|
||||
border-radius: 12px;
|
||||
border-radius: 12px 12px 0px 0px;
|
||||
font-weight: 400;
|
||||
font-size: 23px;
|
||||
font-size: 18px;
|
||||
line-height: 178%;
|
||||
color: #000000;
|
||||
padding: 20px;
|
||||
padding: 20px 51px;
|
||||
margin: 0 0 16px 0;
|
||||
}
|
||||
&__cards-test {
|
||||
|
||||
@ -191,7 +191,7 @@ const Statistics = () => {
|
||||
</div>
|
||||
<div className="add-person">
|
||||
<span className="add-person__button">+</span>
|
||||
<p>Добавить участника</p>
|
||||
<p>Добавить участников</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -33,7 +33,7 @@ import project from "assets/icons/trackerProject.svg";
|
||||
import tasks from "assets/icons/trackerTasks.svg";
|
||||
import archive from "assets/images/archiveIcon.png";
|
||||
import mockAvatar from "assets/images/avatarMok.png";
|
||||
import downloadExcel from "assets/images/downloadExcel.svg";
|
||||
import downloadExel from "assets/images/downloadExel.svg";
|
||||
import noProjects from "assets/images/noProjects.png";
|
||||
import statusTimeTask from "assets/images/statusTimeTask.svg";
|
||||
|
||||
@ -305,8 +305,8 @@ export const Tracker = () => {
|
||||
<p>Сверка пройдена</p>
|
||||
</div>
|
||||
<div>
|
||||
<img src={downloadExcel} alt="#" />
|
||||
<p>Скачать Excel-отчет</p>
|
||||
<img src={downloadExel} alt="#" />
|
||||
<p>Скачать Exel отчет</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
max-width: 1160px;
|
||||
width: 100%;
|
||||
background: #e1fccf;
|
||||
border-radius: 12px 12px 0 0;
|
||||
border-radius: 12px;
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
height: 60px;
|
||||
@ -124,7 +124,8 @@
|
||||
&__content {
|
||||
width: 100%;
|
||||
background: #ffffff;
|
||||
padding: 20px 0;
|
||||
padding: 30px 0;
|
||||
margin-bottom: 10px;
|
||||
|
||||
&__wrapper {
|
||||
max-width: 1160px;
|
||||
@ -353,7 +354,7 @@
|
||||
border: 1px solid #e3e2e2;
|
||||
padding: 2px 6px;
|
||||
position: relative;
|
||||
max-width: 190px;
|
||||
max-width: 220px;
|
||||
width: 100%;
|
||||
|
||||
@media (max-width: 915px) {
|
||||
@ -829,7 +830,9 @@
|
||||
max-height: 100px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 3;
|
||||
-webkit-box-orient: vertical;
|
||||
}
|
||||
|
||||
span {
|
||||
@ -865,7 +868,6 @@
|
||||
column-gap: 10px;
|
||||
align-items: center;
|
||||
pointer-events: none;
|
||||
margin-top: 5px;
|
||||
|
||||
&__more {
|
||||
cursor: pointer;
|
||||
@ -896,7 +898,7 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
column-gap: 5px;
|
||||
margin-top: 3px;
|
||||
margin-bottom: 8px;
|
||||
|
||||
p {
|
||||
font-weight: 500;
|
||||
@ -925,6 +927,7 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
column-gap: 5px;
|
||||
margin-bottom: 8px;
|
||||
|
||||
p {
|
||||
font-weight: 500;
|
||||
@ -936,16 +939,12 @@
|
||||
font-weight: 500;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
img {
|
||||
margin-top: -2px;
|
||||
width: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
&__executor {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-top: 2px;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
column-gap: 5px;
|
||||
@ -968,7 +967,7 @@
|
||||
flex-wrap: wrap;
|
||||
column-gap: 6px;
|
||||
row-gap: 3px;
|
||||
margin: 3px 0;
|
||||
margin: 5px 0 8px;
|
||||
|
||||
.tagItem {
|
||||
padding: 3px 10px;
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
import React, { useEffect, useState } from "react";
|
||||
import { useDispatch } from "react-redux";
|
||||
import { Link, useParams } from "react-router-dom";
|
||||
|
||||
import { setEditReport } from "@redux/reportSlice";
|
||||
|
||||
import { apiRequest } from "@api/request";
|
||||
|
||||
import {
|
||||
@ -23,7 +20,6 @@ import arrow from "assets/icons/arrows/left-arrow.png";
|
||||
import "./viewReport.scss";
|
||||
|
||||
export const ViewReport = () => {
|
||||
const dispatch = useDispatch();
|
||||
const params = useParams();
|
||||
const [previousReportDay] = useState(new Date(params.date));
|
||||
const [nextReportDay] = useState(new Date(params.date));
|
||||
@ -36,7 +32,6 @@ export const ViewReport = () => {
|
||||
const [currentDay] = useState(new Date());
|
||||
const [loader, setLoader] = useState(false);
|
||||
const [deleteLoader, setDeleteLoader] = useState(false);
|
||||
const [reportInfo, setReportInfo] = useState({});
|
||||
|
||||
function getReportFromDate(day) {
|
||||
setLoader(true);
|
||||
@ -46,7 +41,6 @@ export const ViewReport = () => {
|
||||
apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then(
|
||||
(res) => {
|
||||
let spendTime = 0;
|
||||
setReportInfo(res[0]);
|
||||
setTaskId(res[0]?.id);
|
||||
for (const item of res) {
|
||||
if (item.difficulties) {
|
||||
@ -133,17 +127,7 @@ export const ViewReport = () => {
|
||||
</Link>
|
||||
{localStorage.getItem("role_status") !== "18" && (
|
||||
<div className="viewReport__bar">
|
||||
<Link
|
||||
to="/profile/calendar/report"
|
||||
onClick={() => dispatch(setEditReport(reportInfo))}
|
||||
className={
|
||||
taskText.length
|
||||
? "viewReport__bar__edit"
|
||||
: "viewReport__bar__edit disable"
|
||||
}
|
||||
>
|
||||
Редактировать
|
||||
</Link>
|
||||
<button className="viewReport__bar__edit">Редактировать</button>
|
||||
{deleteLoader ? (
|
||||
<Loader style={"green"} />
|
||||
) : (
|
||||
|
||||
@ -73,18 +73,9 @@
|
||||
}
|
||||
|
||||
&__edit {
|
||||
color: #000000;
|
||||
font-size: 15px;
|
||||
font-weight: 500;
|
||||
line-height: 32px;
|
||||
padding: 8px 24px;
|
||||
background: #E1FCCF;
|
||||
border-radius: 44px;
|
||||
border: none;
|
||||
|
||||
&:hover {
|
||||
color: #000000;
|
||||
}
|
||||
}
|
||||
|
||||
&__delete {
|
||||
|
||||
@ -4,8 +4,7 @@ const initialState = {
|
||||
dateSelected: "",
|
||||
reportDate: "",
|
||||
requestDates: "",
|
||||
sendRequest: "",
|
||||
editReport: ""
|
||||
sendRequest: ""
|
||||
};
|
||||
|
||||
export const reportSlice = createSlice({
|
||||
@ -23,20 +22,12 @@ export const reportSlice = createSlice({
|
||||
},
|
||||
setSendRequest: (state, action) => {
|
||||
state.sendRequest = action.payload;
|
||||
},
|
||||
setEditReport: (state, action) => {
|
||||
state.editReport = action.payload;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
export const {
|
||||
dateSelected,
|
||||
setReportDate,
|
||||
setRequestDate,
|
||||
setSendRequest,
|
||||
setEditReport
|
||||
} = reportSlice.actions;
|
||||
export const { dateSelected, setReportDate, setRequestDate, setSendRequest } =
|
||||
reportSlice.actions;
|
||||
|
||||
export const selectDate = (state) => state.report.dateSelected;
|
||||
|
||||
@ -46,6 +37,4 @@ export const getRequestDates = (state) => state.report.requestDates;
|
||||
|
||||
export const getSendRequest = (state) => state.report.sendRequest;
|
||||
|
||||
export const getEditReport = (state) => state.report.editReport;
|
||||
|
||||
export default reportSlice.reducer;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user