partner reg, fix employers bug, edit report

src/pages/PartnerСategories/PartnerСategories.jsx

@@ -161,16 +161,22 @@ 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>}
+            {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>
+            )}
             {/*{personalInfoItems.map((item, index) => {*/}
             {/*  return (*/}
             {/*    <Link*/}

src/pages/ProjectTracker/ProjectTracker.js

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

src/pages/ViewReport/ViewReport.jsx

@@ -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"} />
               ) : (