Merge branch 'main' of https://git.itguild.info/apuc/guild_front

debag-conflict

src/pages/ViewReport/ViewReport.jsx

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

src/pages/ViewReport/viewReport.scss

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