apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trackerTask #17

Merged
nik.polishuk merged 2 commits from trackerTask into main 2024-02-09 18:01:52 +03:00
Conversation 0 Commits 2 Files Changed 12 +94 -60
9 changed files with 94 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d2ccf91eb - Show all commits

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

@ -10,19 +10,19 @@ 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 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 [isPartner, setIsPartner] = useState(false);
const fields = {
username: "",
email: "",
password: "",
secondPassword: "",
secondPassword: ""
};
const closeModal = () => {
setActive(false);
@ -125,10 +125,13 @@ export const ModalRegistration = ({ active, setActive }) => {
</div>
</div>
</div>
<div className="input_checkbox" onClick={() => setIsPartner(!isPartner)}>
<div
className="input_checkbox"
onClick={() => setIsPartner(!isPartner)}
>
<p>Партнер:</p>
<span className={isPartner ? "checkbox--active" : ""}>
{isPartner ? <img src={accept} alt='accept' /> : ""}
{isPartner ? <img src={accept} alt="accept" /> : ""}
</span>
</div>

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

@ -7,9 +7,9 @@ import { Link, Navigate } from "react-router-dom";
import { getProfileInfo } from "@redux/outstaffingSlice";
import {
getRequestDates,
setEditReport,
setReportDate,
setRequestDate,
setEditReport
setRequestDate
} from "@redux/reportSlice";
import { urlForLocal } from "@utils/helper";
@ -103,8 +103,8 @@ export const ProfileCalendar = () => {
<button
className="calendar__btn"
onClick={() => {
dispatch(setReportDate(""))
dispatch(setEditReport(""))
dispatch(setReportDate(""));
dispatch(setEditReport(""));
}}
>
Заполнить отчет

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

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

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

@ -3,11 +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, getEditReport } from "@redux/reportSlice";
import { getEditReport, getReportDate } from "@redux/reportSlice";
import { setEditReport } from "@redux/reportSlice";
import { useDispatch } from "react-redux";
import { apiRequest } from "@api/request";
@ -37,10 +37,9 @@ const ReportForm = () => {
}
const navigate = useNavigate();
const reportDate = useSelector(getReportDate);
const editReport = useSelector(getEditReport)
const editReport = useSelector(getEditReport);
const dispatch = useDispatch();
useEffect(() => {
initListeners();
}, []);
@ -48,15 +47,23 @@ 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 || editReport
? new Date(reportDate ? reportDate._d : editReport.created_at)
: 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(
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) => [
@ -118,7 +125,7 @@ const ReportForm = () => {
navigate("/profile/calendar");
}, 1000);
setIsFetching(false);
clearParams()
clearParams();
});
};
@ -148,17 +155,17 @@ const ReportForm = () => {
navigate("/profile/calendar");
}, 1000);
setIsFetching(false);
clearParams()
dispatch(setEditReport(""))
clearParams();
dispatch(setEditReport(""));
});
}
};
const clearParams = () => {
setInputs(() => []);
setTroublesInputValue("");
setScheduledInputValue("");
setInputs(() => [{ task: "", hours_spent: "", minutes_spent: 0 }]);
}
};
return (
<section className="report-form">
@ -173,7 +180,8 @@ const ReportForm = () => {
]}
/>
<h2 className="summary__title">
Ваши отчеты - <span>{editReport ? "редактировать отчет" : "добавить отчет"}</span>
Ваши отчеты -{" "}
<span>{editReport ? "редактировать отчет" : "добавить отчет"}</span>
</h2>
<div>
<div className="report__head">
@ -187,12 +195,14 @@ const ReportForm = () => {
<div className="report-form__content">
<div className="report-form__block">
<div className="report-form__block-title">
<h2>{editReport ? "Редактирование отчета за день" : "Добавление отчета за день"}</h2>
<h2>
{editReport
? "Редактирование отчета за день"
: "Добавление отчета за день"}
</h2>
<h3>Дата заполнения отчета:</h3>
</div>
<div
className="report-form__block-img"
>
<div className="report-form__block-img">
<img
className="report-form__calendar-icon"
src={calendarIcon}
@ -340,9 +350,9 @@ const ReportForm = () => {
className="report-form__footer-btn"
onClick={() => {
if (editReport) {
handleEditReport()
handleEditReport();
} else {
handler()
handler();
}
}}
>

1
src/hooks/useFormValidation.js
View File

@ -12,7 +12,6 @@ export const useFormValidation = (
// Состояние формы, содержащее значения полей
const [formData, setFormData] = useState(fields);
// Состояние ошибок валидации
const [validationErrors, setValidationErrors] = useState({});

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

@ -161,7 +161,8 @@ export const PartnerCategories = () => {
<Loader style={"green"} height={80} width={80} />
) : (
<div className="partnerCategories__items">
{Boolean(staff) ? 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>}
})
) : (
<span className="partnerCategories__empty">
У вас нет нанятого персонала
</span>
)}
{/*{personalInfoItems.map((item, index) => {*/}
{/* return (*/}
{/* <Link*/}

2
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";
@ -54,7 +55,6 @@ import tasks from "assets/icons/trackerTasks.svg";
import accept from "assets/images/accept.png";
import archive from "assets/images/archiveIcon.png";
import avatarMok from "assets/images/avatarMok.png";
import calendarIcon from "assets/icons/calendar.svg";
import { getCorrectDate } from "../../components/Calendar/calendarHelper";

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

@ -1,9 +1,10 @@
import React, { useEffect, useState } from "react";
import { useDispatch } from "react-redux";
import { Link, useParams } from "react-router-dom";
import { apiRequest } from "@api/request";
import { setEditReport } from "@redux/reportSlice";
import { useDispatch } from "react-redux";
import { apiRequest } from "@api/request";
import {
getCorrectDate,
@ -35,7 +36,7 @@ export const ViewReport = () => {
const [currentDay] = useState(new Date());
const [loader, setLoader] = useState(false);
const [deleteLoader, setDeleteLoader] = useState(false);
const [reportInfo, setReportInfo] = useState({})
const [reportInfo, setReportInfo] = useState({});
function getReportFromDate(day) {
setLoader(true);
@ -45,7 +46,7 @@ export const ViewReport = () => {
apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then(
(res) => {
let spendTime = 0;
setReportInfo(res[0])
setReportInfo(res[0]);
setTaskId(res[0]?.id);
for (const item of res) {
if (item.difficulties) {
@ -132,7 +133,17 @@ 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>
<Link
to="/profile/calendar/report"
onClick={() => dispatch(setEditReport(reportInfo))}
className={
taskText.length
? "viewReport__bar__edit"
: "viewReport__bar__edit disable"
}
>
Редактировать
</Link>
{deleteLoader ? (
<Loader style={"green"} />
) : (

13
src/redux/reportSlice.js
View File

@ -25,13 +25,18 @@ export const reportSlice = createSlice({
state.sendRequest = action.payload;
},
setEditReport: (state, action) => {
state.editReport = action.payload
state.editReport = action.payload;
}
}
});
export const { dateSelected, setReportDate, setRequestDate, setSendRequest, setEditReport } =
reportSlice.actions;
export const {
dateSelected,
setReportDate,
setRequestDate,
setSendRequest,
setEditReport
} = reportSlice.actions;
export const selectDate = (state) => state.report.dateSelected;
@ -41,6 +46,6 @@ export const getRequestDates = (state) => state.report.requestDates;
export const getSendRequest = (state) => state.report.sendRequest;
export const getEditReport = (state) => state.report.editReport
export const getEditReport = (state) => state.report.editReport;
export default reportSlice.reducer;