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 
debag-conflict
This commit is contained in:
Никита Губарь 2024-02-09 18:27:43 +03:00
commit e1516910ee
34 changed files with 371 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/assets/images/downloadExel.svg → src/assets/images/downloadExcel.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

15
src/components/Common/ModalLayout/modalLayout.scss
View File

@ -23,6 +23,8 @@
.select-person {
align-items: start;
margin: 0;
padding: 0;
&__info {
font-size: 15px;
@ -49,19 +51,17 @@
display: flex;
flex-direction: column;
justify-content: space-between;
button {
// margin: 0 auto;
}
align-items: center;
}
.invite-person-block {
display: flex;
flex-direction: column;
row-gap: 20px;
align-items: center;
row-gap: 10px;
&__input {
margin: 0;
min-width: 320px;
min-width: 240px;
height: 42px;
input {
@ -75,7 +75,7 @@
&__btn {
margin: 0;
max-width: 242px;
max-width: 190px;
width: 100%;
}
}
@ -106,7 +106,6 @@
display: flex;
flex-direction: column;
row-gap: 10px;
padding: 19px 10px 29px 10px;
@media (max-width: 500px) {
padding: 10px;

13
src/components/Modal/ModalRegistration/ModalRegistration.jsx
View File

@ -10,11 +10,13 @@ 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: "",
@ -56,7 +58,7 @@ export const ModalRegistration = ({ active, setActive }) => {
fields,
showNotificationError,
showNotificationTrue,
closeModal
isPartner
);
return (
@ -123,6 +125,15 @@ 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 ? (

32
src/components/Modal/ModalRegistration/modalRegistration.scss
View File

@ -128,6 +128,38 @@
}
}
.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;

1
src/components/Modal/ModalSelect/ModalSelect.jsx
View File

@ -5,7 +5,6 @@ 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>
);

17
src/components/Modal/ModalSelect/modalSelect.scss
View File

@ -1,29 +1,30 @@
.project {
&__settings {
position: absolute;
padding: 32px 23px 10px 11px;
padding: 0 10px;
background: #e1fccf;
border-radius: 12px;
transform: scale(0);
bottom: -40px;
right: -120px;
bottom: -30px;
right: -130px;
@media (max-width: 1050px) {
right: 10px;
padding-top: 10px;
bottom: -75px;
right: 5px;
bottom: -30px;
}
&-menu {
font-size: 14px;
line-height: 38px;
padding: 5px 0;
div {
display: flex;
align-items: center;
padding: 2px 0;
img {
margin-right: 12px;
width: 12px;
margin-right: 5px;
}
p:hover {

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

@ -87,7 +87,7 @@ const ListEmployees = ({
}}
>
<span className="add-person">+</span>
<p>Добавить участников</p>
<p>Добавить участника</p>
</div>
</div>
</ModalLayout>

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

@ -758,8 +758,7 @@ 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>
@ -819,7 +818,6 @@ export const ModalTiсket = ({
)}
</div>
)}
{Boolean(members.length) && (
<div className="members">
<h5>Участники:</h5>
@ -847,7 +845,6 @@ export const ModalTiсket = ({
</div>
</div>
)}
<div className="add-worker more-items">
<button
className="button-add-worker"
@ -855,7 +852,7 @@ export const ModalTiсket = ({
>
+
</button>
<span>Добавить участников</span>
<span>Добавить участника</span>
{dropListMembersOpen && (
<div className="dropdown-list">
<img
@ -917,7 +914,6 @@ export const ModalTiсket = ({
</div>
<div className="time">
<img src={watch}></img>
<span>Длительность: </span>
<p>
{correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}:
@ -1091,7 +1087,7 @@ export const ModalTiсket = ({
</div>
{acceptModalOpen && (
<AcceptModal
title={"Вы точно хотите переместить задачу в архив?"}
title={"Вы действительно хотите переместить задачу в архив?"}
closeModal={closeAcceptModal}
agreeHandler={deleteTask}
/>

37
src/components/Modal/Tracker/ModalTicket/modalTicket.scss
View File

@ -52,7 +52,7 @@
position: relative;
display: flex;
flex-direction: column;
width: 600px;
width: 630px;
margin: 26px 0 0 21px;
.title-project {
@ -100,10 +100,11 @@
}
&__task {
margin-top: -5px;
margin-top: -20px;
padding: 18px;
display: flex;
flex-direction: column;
overflow-y: scroll;
input {
font-style: normal;
@ -144,12 +145,9 @@
}
.task-name {
display: -webkit-box;
max-width: 550px;
overflow: hidden;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.full-name {
@ -613,8 +611,8 @@
.exit {
cursor: pointer;
position: absolute;
top: 25px;
right: 20px;
top: 15px;
right: 15px;
width: 13px;
height: 13px;
display: flex;
@ -640,8 +638,8 @@
span {
font-family: "Inter", sans-serif;
font-weight: 500;
font-size: 11px;
color: #807777;
font-size: 12px;
color: #666;
}
.nameProject {
@ -661,7 +659,7 @@
color: #000000;
font-size: 12px;
line-height: 32px;
margin-left: 17px;
margin-left: 10px;
font-style: normal;
font-weight: 400;
}
@ -849,8 +847,8 @@
display: flex;
align-items: center;
justify-content: space-between;
font-size: 12px;
margin-top: 10px;
font-size: 13px;
margin-top: 5px;
width: 160px;
p {
@ -862,7 +860,7 @@
&__creator {
font-size: 14px;
font-weight: 500;
color: #2d4a17;
max-width: 200px;
overflow: hidden;
white-space: nowrap;
@ -875,6 +873,7 @@
line-height: 32px;
font-weight: 500;
display: flex;
color: #2d4a17;
}
}
@ -964,11 +963,11 @@
}
&_box {
padding: 25px 0px 10px 40px;
padding: 25px 0px 10px 20px;
border-bottom: 1px solid #f1f1f1;
&-middle {
padding: 0px 0px 10px 35px;
padding: 0px 0px 10px 20px;
border-bottom: 1px solid #f1f1f1;
}
@ -979,7 +978,7 @@
position: relative;
row-gap: 10px;
padding: 10px 40px 0px 40px;
padding: 10px 40px 0px 20px;
border-radius: 10px;
margin-bottom: 10px;
@ -1110,7 +1109,7 @@
&-priority {
position: relative;
padding: 10px 40px 0 40px;
padding: 10px 40px 0 20px;
border-radius: 10px;
margin-bottom: 10px;
.priority {
@ -1170,7 +1169,7 @@
}
&-bottom {
padding: 0px 110px 10px 35px;
padding: 0px 90px 10px 35px;
font-weight: 400;
font-size: 14px;
line-height: 32px;
@ -1186,7 +1185,7 @@
}
p {
margin: 0 0 0 12px;
margin: 0 0 0 5px;
}
}

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

@ -812,7 +812,7 @@ export const TicketFullScreen = () => {
<div className="workers fullscreen-workers">
<div className="workers_box task__info">
<div className="workers__creator">
Создатель: <p>&nbsp;{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="dropdown-list">
<img
@ -972,7 +972,6 @@ export const TicketFullScreen = () => {
</div>
<div className="time">
<img src={watch}></img>
<span>Длительность: </span>
<p>
{correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}:
@ -1152,7 +1151,7 @@ export const TicketFullScreen = () => {
</div>
{acceptModalOpen && (
<AcceptModal
title={"Вы точно хотите переместить задачу в архив?"}
title={"Вы действительно хотите переместить задачу в архив?"}
closeModal={closeAcceptModal}
agreeHandler={deleteTask}
/>

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

@ -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);
}}
>
<p>{worker.employee.fio}</p>
<span>{worker.employee.fio}</span>
<img
src={urlForLocal(worker.employee.avatar)}
alt="avatar"
@ -473,10 +473,10 @@ export const TrackerModal = ({
/>
</div>
<BaseButton
styles={"button-add invite-person-block__btn"}
styles={"button-add add-person-btn"}
onClick={inviteUserByEmail}
>
Отправить приглашение
Пригласить
</BaseButton>
</div>
</div>
@ -489,19 +489,11 @@ export const TrackerModal = ({
<div className="title-project">
<div className="create-task-head">
<div className="create-task-body__right__owner">
<p>Создатель: {profileInfo?.fio}</p>
<img
src={
profileInfo.photo
? urlForLocal(profileInfo.photo)
: avatarMok
}
alt="avatar"
/>
<p>Создание задачи</p>
</div>
</div>
<div className="create-task-body">
<div className="create-task-body__left">
<div className="createTaskBody">
<div className="createTaskBody__left">
<h4>Введите название и описание задачи</h4>
<div className="input-container">
<input
@ -649,12 +641,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>
@ -671,7 +663,6 @@ export const TrackerModal = ({
className="executor"
key={person.user_id}
>
<span>{person.user.fio}</span>
<img
className="avatar"
src={
@ -681,6 +672,7 @@ export const TrackerModal = ({
}
alt="avatar"
/>
<span>{person.user.fio}</span>
</div>
);
})
@ -692,12 +684,10 @@ export const TrackerModal = ({
</div>
<div className="create-task-body__right__dead-line">
<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"

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

@ -30,7 +30,6 @@
display: flex;
align-items: center;
flex-direction: column;
row-gap: 12px;
padding-bottom: 15px;
.select-priority {
@ -174,11 +173,13 @@
.executor {
display: flex;
justify-content: space-between;
&:hover {
span {
font-weight: 600;
}
span {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
}
@ -222,7 +223,7 @@
border-radius: 5px;
cursor: pointer;
position: relative;
min-width: 320px;
min-width: 240px;
height: 42px;
width: 100%;
@ -235,6 +236,16 @@
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;
@ -246,6 +257,7 @@
overflow-y: auto;
display: flex;
flex-direction: column;
justify-content: center;
position: absolute;
width: 100%;
padding: 9.5px 12px;
@ -324,7 +336,7 @@
}
.create-task-body {
padding: 10px;
padding: 15px 20px;
display: flex;
column-gap: 20px;
@ -360,8 +372,8 @@
}
.ck-editor__editable.ck-rounded-corners {
min-height: 130px;
max-height: 130px;
min-height: 150px;
max-height: 150px;
}
}
@ -376,10 +388,10 @@
align-items: center;
column-gap: 9.5px;
p {
color: #2d4a17;
font-size: 14px;
font-size: 18px;
font-weight: 500;
line-height: 32px;
padding-left: 15px;
}
img {
@ -395,7 +407,7 @@
.tags {
&__selected {
width: 393px;
width: 250px;
font-weight: 300;
line-height: 18px;
font-size: 15px;
@ -526,7 +538,7 @@
&__name {
color: #000;
width: 393px;
width: 250px;
height: 47px;
font-size: 15px;
font-weight: 400;
@ -574,7 +586,7 @@
.select__executor {
background: #f1f1f1;
width: 393px;
width: 250px;
height: 47px;
font-weight: 300;
line-height: 18px;
@ -594,7 +606,7 @@
&__dead-line {
display: flex;
align-items: center;
column-gap: 18px;
column-gap: 5px;
font-weight: 300;
line-height: 18px;
font-size: 15px;
@ -730,8 +742,7 @@
}
.add-person-btn {
margin: 0 auto 0 0;
margin-top: 20px;
margin: 0;
}
.modal-add.active {

6
src/components/ProfileCalendar/ProfileCalendar.jsx
View File

@ -7,6 +7,7 @@ import { Link, Navigate } from "react-router-dom";
import { getProfileInfo } from "@redux/outstaffingSlice";
import {
getRequestDates,
setEditReport,
setReportDate,
setRequestDate
} from "@redux/reportSlice";
@ -101,7 +102,10 @@ export const ProfileCalendar = () => {
<Link to="/profile/calendar/report">
<button
className="calendar__btn"
onClick={() => dispatch(setReportDate(""))}
onClick={() => {
dispatch(setReportDate(""));
dispatch(setEditReport(""));
}}
>
Заполнить отчет
</button>

2
src/components/ProfileCalendar/ProfileCalendarComponent.jsx
View File

@ -5,6 +5,7 @@ import { useDispatch } from "react-redux";
import { Link } from "react-router-dom";
import {
setEditReport,
setReportDate,
setRequestDate,
setSendRequest
@ -235,6 +236,7 @@ export const ProfileCalendarComponent = React.memo(
else {
dispatch(setReportDate(day));
dispatch(setSendRequest(true));
dispatch(setEditReport(""));
}
}}
onMouseEnter={() => {

8
src/components/ProjectTicket/ProjectTicket.jsx
View File

@ -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}
/>

4
src/components/ProjectTicket/projectTicket.scss
View File

@ -80,8 +80,8 @@
position: absolute;
font-size: 21px;
color: #6f6f6f;
right: 26px;
top: 10px;
right: 15px;
top: 0px;
}
&__avatar {

89
src/components/ReportForm/ReportForm.jsx
View File

@ -3,9 +3,11 @@ 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 { getReportDate } from "@redux/reportSlice";
import { getEditReport, getReportDate } from "@redux/reportSlice";
import { setEditReport } from "@redux/reportSlice";
import { apiRequest } from "@api/request";
@ -35,6 +37,8 @@ const ReportForm = () => {
}
const navigate = useNavigate();
const reportDate = useSelector(getReportDate);
const editReport = useSelector(getEditReport);
const dispatch = useDispatch();
useEffect(() => {
initListeners();
@ -43,15 +47,23 @@ const ReportForm = () => {
const [isFetching, setIsFetching] = useState(false);
const [reportSuccess, setReportSuccess] = useState("");
const [startDate, setStartDate] = useState(
reportDate ? new Date(reportDate._d) : new Date()
reportDate || editReport
? new Date(reportDate ? reportDate._d : editReport.created_at)
: new Date()
);
const [datePickerOpen, setDatePickerOpen] = useState(false);
const [inputs, setInputs] = useState([
{ task: "", hours_spent: "", minutes_spent: 0 }
]);
const [troublesInputValue, setTroublesInputValue] = useState("");
const [scheduledInputValue, setScheduledInputValue] = useState("");
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 addInput = () => {
setInputs((prev) => [
@ -112,12 +124,47 @@ const ReportForm = () => {
setReportSuccess("");
navigate("/profile/calendar");
}, 1000);
setIsFetching(false);
clearParams();
});
};
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("");
setIsFetching(false);
setInputs(() => [{ task: "", hours_spent: "", minutes_spent: 0 }]);
});
};
return (
@ -133,7 +180,8 @@ const ReportForm = () => {
]}
/>
<h2 className="summary__title">
Ваши отчеты - <span>добавить отчет</span>
Ваши отчеты -{" "}
<span>{editReport ? "редактировать отчет" : "добавить отчет"}</span>
</h2>
<div>
<div className="report__head">
@ -147,13 +195,14 @@ const ReportForm = () => {
<div className="report-form__content">
<div className="report-form__block">
<div className="report-form__block-title">
<h2>Добавление отчета за день</h2>
<h2>
{editReport
? "Редактирование отчета за день"
: "Добавление отчета за день"}
</h2>
<h3>Дата заполнения отчета:</h3>
</div>
<div
className="report-form__block-img"
onClick={() => setDatePickerOpen(true)}
>
<div className="report-form__block-img">
<img
className="report-form__calendar-icon"
src={calendarIcon}
@ -299,9 +348,15 @@ const ReportForm = () => {
) : (
<button
className="report-form__footer-btn"
onClick={() => handler()}
onClick={() => {
if (editReport) {
handleEditReport();
} else {
handler();
}
}}
>
Отпаравить
{editReport ? "Редактировать" : "Отправить"}
</button>
)}
<p className="report-form__footer-text">

2
src/components/StarRating/StarRating.js
View File

@ -6,7 +6,7 @@ const StarRating = ({
countStars = 1,
countActiveStars = 1,
color = "#52B709",
size = 61
size = 40
}) => {
const [shadedStars, setShadedStars] = useState([]);
const [noShadedStars, setNoShadedStars] = useState([]);

4
src/components/features/quiz/AlertResult.jsx
View File

@ -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>
)}

16
src/components/features/quiz/QuizReport.jsx
View File

@ -3,12 +3,6 @@ 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">
@ -23,19 +17,13 @@ export const QuizReport = ({ info }) => {
</div>
<div className="report__column">
<div className="report__value">
{Boolean(correctAnswers()) ? correctAnswers() : 0}
{info.count_correct_answers}/{info.number_questions}
</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>

141
src/components/features/quiz/quiz.scss
View File

@ -31,16 +31,14 @@ $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;
@ -48,11 +46,6 @@ $maxWidthContainer: 1123;
font-size: 14px;
text-decoration: none;
line-height: 200%;
// &:hover{
// text-decoration: none;
// color: #52b709;
// background: #fff;
// }
&_back {
background: #dddddd;
color: #000;
@ -68,13 +61,11 @@ $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;
@ -140,7 +131,6 @@ $maxWidthContainer: 1123;
.form-task__group {
display: block;
margin-bottom: 13px;
font-family: "Lab Grotesque";
label {
font-weight: 400;
font-size: 15px;
@ -312,9 +302,9 @@ $maxWidthContainer: 1123;
}
.card-introduction {
padding: 0px 25px;
padding: 0px 20px;
margin: 0px 0px 50px 0px;
flex: 0 1 33.333%;
flex: 0 1 33%;
@media (max-width: 850px) {
flex: 0 1 50%;
}
@ -324,14 +314,13 @@ $maxWidthContainer: 1123;
&__body {
display: flex;
gap: 20px;
gap: 10px;
}
&__title {
font-weight: 900;
font-size: 14px;
line-height: 171%;
font-size: 18px;
color: #52b709;
margin: 0 0 30px 0;
margin-bottom: 10px;
}
&__icon {
flex: 0 0 25px;
@ -343,8 +332,8 @@ $maxWidthContainer: 1123;
}
&__text {
font-weight: 400;
font-size: 12px;
line-height: 200%;
font-size: 15px;
line-height: 20px;
color: #000000;
}
}
@ -352,20 +341,8 @@ $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 {
//flex: 1 1 auto;
padding: 35px 45px;
padding: 30px;
height: 100%;
display: grid;
grid-template-columns: 1fr 1.2fr 1.2fr 0.6fr;
@ -388,7 +365,7 @@ $maxWidthContainer: 1123;
}
&__text {
font-weight: 400;
font-size: 12px;
font-size: 14px;
line-height: 167%;
color: #6f6f6f;
span {
@ -399,7 +376,7 @@ $maxWidthContainer: 1123;
&__timer,
&__attempt {
display: flex;
gap: 23px;
gap: 10px;
align-items: center;
}
@ -448,10 +425,10 @@ $maxWidthContainer: 1123;
&__container {
display: block;
@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);
@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);
}
&:hover {
@ -463,8 +440,8 @@ $maxWidthContainer: 1123;
&__top-head {
display: flex;
align-items: center;
gap: 19px;
margin: 0 0 24px 0;
gap: 10px;
margin-bottom: 15px;
}
&__title {
font-weight: 500;
@ -482,9 +459,8 @@ $maxWidthContainer: 1123;
p {
flex: 0 1 66%;
font-weight: 700;
font-size: 12px;
line-height: 20px;
font-weight: 500;
font-size: 13px;
color: #000000;
margin-bottom: 0;
@ -508,7 +484,7 @@ $maxWidthContainer: 1123;
border-radius: 12px;
padding: 13px 16px;
position: absolute;
bottom: 20px;
bottom: 0px;
left: 0;
display: flex;
align-items: center;
@ -517,8 +493,7 @@ $maxWidthContainer: 1123;
gap: 10px;
p {
font-weight: 500;
font-size: 14px;
line-height: 129%;
font-size: 13px;
color: #000000;
}
a {
@ -545,7 +520,6 @@ $maxWidthContainer: 1123;
.block-completed-test {
background: #ffffff;
border-radius: 12px;
// .block-completed-test__container
&__container {
padding: 41px 35px 29px 59px;
@ -554,8 +528,6 @@ $maxWidthContainer: 1123;
flex-wrap: wrap;
}
// .block-completed-test__img
&__img {
flex: 0 0 54px;
height: 60px;
@ -567,8 +539,6 @@ $maxWidthContainer: 1123;
}
}
// .block-completed-test__title
&__title {
font-weight: 700;
font-size: 18px;
@ -577,27 +547,20 @@ $maxWidthContainer: 1123;
color: #52b709;
}
// .block-completed-test__text
&__text {
max-width: 386px;
margin: 0 26px 0 0;
font-weight: 400;
font-size: 12px;
line-height: 200%;
font-weight: 500;
font-size: 13px;
color: #000000;
}
// .block-completed-test__button
&__button {
display: block;
}
}
.report {
// .report__row
&__row {
display: flex;
align-items: center;
@ -609,35 +572,36 @@ $maxWidthContainer: 1123;
}
}
// .report__column
&__column {
&:first-child {
background: #ffffff;
flex: 0 1 22%;
border-radius: 12px;
flex: 0 1 40%;
border-radius: 12px 0 0 12px;
@media (max-width: 1000px) {
flex: 0 1 50%;
}
@media (max-width: 600px) {
border-radius: 12px 12px 0 0;
}
height: 128px;
border-radius: 0px 12px 0px 0px;
flex: 0 1 26%;
}
height: 90px;
flex: 0 1 30%;
display: flex;
justify-content: center;
align-items: center;
background: #e1fccf;
gap: 21px;
gap: 10px;
&:last-child {
flex-direction: column;
gap: 0;
}
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;
}
}
}
// .report__job-title
&__job-title {
font-weight: 500;
@ -646,22 +610,17 @@ $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;
@ -669,26 +628,20 @@ $maxWidthContainer: 1123;
color: #000000;
}
// .report__status-text
&__status-text {
font-weight: 400;
font-size: 12px;
line-height: 200%;
font-weight: 500;
font-size: 15px;
color: #000000;
width: 50%;
}
// .report__status
&__status {
background: #1458dd;
border-radius: 44px;
border-radius: 5px;
font-weight: 500;
font-size: 16px;
line-height: 200%;
color: #ffffff;
padding: 7px 34px;
padding: 7px 14px;
max-width: 154px;
}
}
@ -696,19 +649,19 @@ $maxWidthContainer: 1123;
.alert-result {
display: flex;
align-items: center;
@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);
@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);
background: #fff;
gap: 30px;
gap: 10px;
border-radius: 10px;
@media (max-width: 900px) {
flex-wrap: wrap;
}
&__column {
display: flex;
@include adaptiv-value("gap", 44, 14, 1);
@include adaptiv-value("gap", 20, 20, 1);
align-items: center;
@media (max-width: 900px) {
flex: 1 1 auto;

5
src/hooks/useFormValidation.js
View File

@ -6,7 +6,8 @@ export const useFormValidation = (
apiEndpoint,
fields,
showNotificationError,
showNotificationTrue
showNotificationTrue,
isPartner
) => {
// Состояние формы, содержащее значения полей
const [formData, setFormData] = useState(fields);
@ -84,7 +85,7 @@ export const useFormValidation = (
e.preventDefault();
// Проверка валидации формы
if (validateForm()) {
let newformData = { ...formData };
let newformData = { ...formData, is_partner: isPartner ? 1 : 0 };
delete newformData.secondPassword;
try {

12
src/pages/PartnerСategories/PartnerСategories.jsx
View File

@ -39,7 +39,7 @@ export const PartnerCategories = () => {
setLoader(true);
apiRequest("/project/my-employee").then((el) => {
setLoader(false);
setStaff(el.managerEmployees);
setStaff(el?.managerEmployees);
});
}, []);
@ -161,7 +161,8 @@ export const PartnerCategories = () => {
<Loader style={"green"} height={80} width={80} />
) : (
<div className="partner-categories__items">
{staff.map((card) => {
{Boolean(staff) ? (
staff.map((card) => {
return (
<PartnerPersonCard
key={card.id}
@ -170,7 +171,12 @@ export const PartnerCategories = () => {
userId={card.user_id}
/>
);
})}
})
) : (
<span className="partnerCategories__empty">
У вас нет нанятого персонала
</span>
)}
{/*{personalInfoItems.map((item, index) => {*/}
{/* return (*/}
{/* <Link*/}

5
src/pages/PartnerСategories/partnerСategories.scss
View File

@ -20,6 +20,11 @@
//row-gap: 24px;
//column-gap: 21px;
}
&__empty {
font-size: 18px;
font-weight: 500;
margin-top: 20px;
}
.item {
display: flex;

4
src/pages/ProfileCandidate/ProfileCandidate.js
View File

@ -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>

22
src/pages/ProjectTracker/ProjectTracker.js
View File

@ -43,6 +43,7 @@ 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";
@ -528,7 +529,9 @@ export const ProjectTracker = () => {
</div>
)}
{projectBoard.projectUsers?.length > 3 && (
<span className="count-persons">+1</span>
<span className="count-persons">
+{projectBoard.projectUsers?.length - 3}
</span>
)}
<span
className="add-person"
@ -897,12 +900,6 @@ export const ProjectTracker = () => {
className="tasks__board__item__description"
></p>
<div className="tasks__board__item__executor">
<span>
{task.executor?.fio
? task.executor?.fio
: "Исполнитель не назначен"}
</span>
{task.executor?.avatar && (
<img
src={
task.executor?.avatar
@ -911,7 +908,10 @@ export const ProjectTracker = () => {
}
alt="avatar"
/>
)}
<span>
{task.executor?.fio ||
"Исполнитель не назначен"}
</span>
</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__dead-line">
<p>Срок исполнения:</p>
<img src={calendarIcon} alt="calendar" />
<span>
{getCorrectDate(task.dead_line)}
</span>
@ -1001,7 +1001,9 @@ export const ProjectTracker = () => {
</div>
{acceptModalOpen && (
<AcceptModal
title={"В колонке ещё есть задачи, Вы точно хотите удалить её ?"}
title={
"В колонке ещё есть задачи, Вы действительно хотите удалить её ?"
}
closeModal={closeAcceptModal}
agreeHandler={() => deleteColumn(currentColumnDelete)}
/>

10
src/pages/Quiz/PassingTests.js
View File

@ -10,7 +10,6 @@ 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";
@ -43,12 +42,12 @@ export const PassingTests = () => {
{
title: "Зачем?",
description:
"Тесты itguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя."
"Тесты ITguild предназначены для того, чтобы подтверждать навыки, которые вы указали у себя."
},
{
title: "Почему именно тестирование?",
description:
"Тесты itguild заменяют первое техническое собеседование по любой вакансии."
"Тесты ITguild заменяют первое техническое собеседование по любой вакансии."
},
{
title: "Какие тесты нужно проходить?",
@ -138,11 +137,6 @@ export const PassingTests = () => {
)}
</div>
<Footer />
{/*<Prompt*/}
{/* when={showPrompt}*/}
{/* message="Unsaved changes detected, continue?"*/}
{/* beforeUnload={true}*/}
{/*/>*/}
</div>
);
};

6
src/pages/Quiz/quiz-page.scss
View File

@ -20,12 +20,12 @@
&__block {
background: #e1fccf;
border-radius: 12px 12px 0px 0px;
border-radius: 12px;
font-weight: 400;
font-size: 18px;
font-size: 23px;
line-height: 178%;
color: #000000;
padding: 20px 51px;
padding: 20px;
margin: 0 0 16px 0;
}

2
src/pages/Statistics/Statistics.jsx
View File

@ -191,7 +191,7 @@ const Statistics = () => {
</div>
<div className="add-person">
<span className="add-person__button">+</span>
<p>Добавить участников</p>
<p>Добавить участника</p>
</div>
</div>
</div>

6
src/pages/Tracker/Tracker.jsx
View File

@ -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 downloadExel from "assets/images/downloadExel.svg";
import downloadExcel from "assets/images/downloadExcel.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={downloadExel} alt="#" />
<p>Скачать Exel отчет</p>
<img src={downloadExcel} alt="#" />
<p>Скачать Excel-отчет</p>
</div>
</div>
</div>

21
src/pages/Tracker/tracker.scss
View File

@ -43,7 +43,7 @@
max-width: 1160px;
width: 100%;
background: #e1fccf;
border-radius: 12px;
border-radius: 12px 12px 0 0;
margin: 0 auto;
position: relative;
height: 60px;
@ -124,8 +124,7 @@
&__content {
width: 100%;
background: #ffffff;
padding: 30px 0;
margin-bottom: 10px;
padding: 20px 0;
&__wrapper {
max-width: 1160px;
@ -354,7 +353,7 @@
border: 1px solid #e3e2e2;
padding: 2px 6px;
position: relative;
max-width: 220px;
max-width: 190px;
width: 100%;
@media (max-width: 915px) {
@ -830,9 +829,7 @@
max-height: 100px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
span {
@ -868,6 +865,7 @@
column-gap: 10px;
align-items: center;
pointer-events: none;
margin-top: 5px;
&__more {
cursor: pointer;
@ -898,7 +896,7 @@
display: flex;
align-items: center;
column-gap: 5px;
margin-bottom: 8px;
margin-top: 3px;
p {
font-weight: 500;
@ -927,7 +925,6 @@
display: flex;
align-items: center;
column-gap: 5px;
margin-bottom: 8px;
p {
font-weight: 500;
@ -939,12 +936,16 @@
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;
@ -967,7 +968,7 @@
flex-wrap: wrap;
column-gap: 6px;
row-gap: 3px;
margin: 5px 0 8px;
margin: 3px 0;
.tag-item {
padding: 3px 10px;

18
src/pages/ViewReport/ViewReport.jsx
View File

@ -1,6 +1,9 @@
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 {
@ -20,6 +23,7 @@ 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));
@ -32,6 +36,7 @@ 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);
@ -41,6 +46,7 @@ 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) {
@ -127,7 +133,17 @@ export const ViewReport = () => {
</Link>
{localStorage.getItem("role_status") !== "18" && (
<div className="view-report__bar">
<button className="view-report__bar__edit">Редактировать</button>
<Link
to="/profile/calendar/report"
onClick={() => dispatch(setEditReport(reportInfo))}
className={
taskText.length
? "view-report__bar__edit"
: "view-report__bar__edit disable"
}
>
Редактировать
</Link>
{deleteLoader ? (
<Loader style={"green"} />
) : (

9
src/pages/ViewReport/viewReport.scss
View File

@ -73,9 +73,18 @@
}
&__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 {

17
src/redux/reportSlice.js
View File

@ -4,7 +4,8 @@ const initialState = {
dateSelected: "",
reportDate: "",
requestDates: "",
sendRequest: ""
sendRequest: "",
editReport: ""
};
export const reportSlice = createSlice({
@ -22,12 +23,20 @@ export const reportSlice = createSlice({
},
setSendRequest: (state, action) => {
state.sendRequest = action.payload;
},
setEditReport: (state, action) => {
state.editReport = action.payload;
}
}
});
export const { dateSelected, setReportDate, setRequestDate, setSendRequest } =
reportSlice.actions;
export const {
dateSelected,
setReportDate,
setRequestDate,
setSendRequest,
setEditReport
} = reportSlice.actions;
export const selectDate = (state) => state.report.dateSelected;
@ -37,4 +46,6 @@ 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;