Compare commits

..

No commits in common. "ab90e59880d75745f82a79c6178612aa212ccde7" and "2f61f7f130a0ebced39ab1b097624ae30c1dfaf3" have entirely different histories.

12 changed files with 43 additions and 196 deletions

View File

@ -10,13 +10,11 @@ import ModalLayout from "@components/Common/ModalLayout/ModalLayout";
import anyMoment from "assets/icons/anyMoment.svg"; import anyMoment from "assets/icons/anyMoment.svg";
import doc from "assets/icons/doc.svg"; import doc from "assets/icons/doc.svg";
import telegramLogo from "assets/icons/tgLogo.svg"; import telegramLogo from "assets/icons/tgLogo.svg";
import accept from "assets/images/accept.png";
import "./modalRegistration.scss"; import "./modalRegistration.scss";
export const ModalRegistration = ({ active, setActive }) => { export const ModalRegistration = ({ active, setActive }) => {
const [loader, setLoader] = useState(false); const [loader, setLoader] = useState(false);
const [isPartner, setIsPartner] = useState(false);
const fields = { const fields = {
username: "", username: "",
@ -58,7 +56,7 @@ export const ModalRegistration = ({ active, setActive }) => {
fields, fields,
showNotificationError, showNotificationError,
showNotificationTrue, showNotificationTrue,
isPartner closeModal
); );
return ( return (
@ -125,15 +123,6 @@ export const ModalRegistration = ({ active, setActive }) => {
</div> </div>
</div> </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"> <div className="button-box">
{loader ? ( {loader ? (

View File

@ -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 { .button-box {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

View File

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

View File

@ -5,7 +5,6 @@ import { useDispatch } from "react-redux";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { import {
setEditReport,
setReportDate, setReportDate,
setRequestDate, setRequestDate,
setSendRequest setSendRequest
@ -236,7 +235,6 @@ export const ProfileCalendarComponent = React.memo(
else { else {
dispatch(setReportDate(day)); dispatch(setReportDate(day));
dispatch(setSendRequest(true)); dispatch(setSendRequest(true));
dispatch(setEditReport(""));
} }
}} }}
onMouseEnter={() => { onMouseEnter={() => {
@ -286,15 +284,15 @@ export const ProfileCalendarComponent = React.memo(
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
: activePeriod : activePeriod
? "Выберите диапазон на календаре" ? "Выберите диапазон на календаре"
: "Выбрать диапазон"} : "Выбрать диапазон"}
</span> </span>
<span> <span>
{totalRangeHours {totalRangeHours
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
: endDate : endDate
? "0 часов" ? "0 часов"
: ""} : ""}
</span> </span>
{endDate && ( {endDate && (
<BaseButton <BaseButton

View File

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

View File

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

View File

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

View File

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

View File

@ -43,7 +43,6 @@ import TrackerSelectColumn from "@components/TrackerSelectColumn/TrackerSelectCo
import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrow from "assets/icons/arrows/arrowCalendar.png";
import arrowDown from "assets/icons/arrows/selectArrow.png"; import arrowDown from "assets/icons/arrows/selectArrow.png";
import calendarIcon from "assets/icons/calendar.svg";
import close from "assets/icons/close.png"; import close from "assets/icons/close.png";
import commentsBoard from "assets/icons/commentsBoard.svg"; import commentsBoard from "assets/icons/commentsBoard.svg";
import del from "assets/icons/delete.svg"; import del from "assets/icons/delete.svg";
@ -55,6 +54,7 @@ import tasks from "assets/icons/trackerTasks.svg";
import accept from "assets/images/accept.png"; import accept from "assets/images/accept.png";
import archive from "assets/images/archiveIcon.png"; import archive from "assets/images/archiveIcon.png";
import avatarMok from "assets/images/avatarMok.png"; import avatarMok from "assets/images/avatarMok.png";
import calendarIcon from "assets/icons/calendar.svg";
import { getCorrectDate } from "../../components/Calendar/calendarHelper"; import { getCorrectDate } from "../../components/Calendar/calendarHelper";

View File

@ -1,9 +1,6 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useDispatch } from "react-redux";
import { Link, useParams } from "react-router-dom"; import { Link, useParams } from "react-router-dom";
import { setEditReport } from "@redux/reportSlice";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
import { import {
@ -23,7 +20,6 @@ import arrow from "assets/icons/arrows/left-arrow.png";
import "./viewReport.scss"; import "./viewReport.scss";
export const ViewReport = () => { export const ViewReport = () => {
const dispatch = useDispatch();
const params = useParams(); const params = useParams();
const [previousReportDay] = useState(new Date(params.date)); const [previousReportDay] = useState(new Date(params.date));
const [nextReportDay] = 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 [currentDay] = useState(new Date());
const [loader, setLoader] = useState(false); const [loader, setLoader] = useState(false);
const [deleteLoader, setDeleteLoader] = useState(false); const [deleteLoader, setDeleteLoader] = useState(false);
const [reportInfo, setReportInfo] = useState({});
function getReportFromDate(day) { function getReportFromDate(day) {
setLoader(true); setLoader(true);
@ -46,7 +41,6 @@ export const ViewReport = () => {
apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then( apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then(
(res) => { (res) => {
let spendTime = 0; let spendTime = 0;
setReportInfo(res[0]);
setTaskId(res[0]?.id); setTaskId(res[0]?.id);
for (const item of res) { for (const item of res) {
if (item.difficulties) { if (item.difficulties) {
@ -133,17 +127,7 @@ export const ViewReport = () => {
</Link> </Link>
{localStorage.getItem("role_status") !== "18" && ( {localStorage.getItem("role_status") !== "18" && (
<div className="viewReport__bar"> <div className="viewReport__bar">
<Link <button className="viewReport__bar__edit">Редактировать</button>
to="/profile/calendar/report"
onClick={() => dispatch(setEditReport(reportInfo))}
className={
taskText.length
? "viewReport__bar__edit"
: "viewReport__bar__edit disable"
}
>
Редактировать
</Link>
{deleteLoader ? ( {deleteLoader ? (
<Loader style={"green"} /> <Loader style={"green"} />
) : ( ) : (

View File

@ -73,18 +73,9 @@
} }
&__edit { &__edit {
color: #000000;
font-size: 15px;
font-weight: 500;
line-height: 32px;
padding: 8px 24px;
background: #E1FCCF; background: #E1FCCF;
border-radius: 44px; border-radius: 44px;
border: none; border: none;
&:hover {
color: #000000;
}
} }
&__delete { &__delete {

View File

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