From c62ae06d20310795e21a9ef5f9a2e0e04628953e Mon Sep 17 00:00:00 2001
From: MaxOvs19 <gshk3669@gmail.com>
Date: Thu, 18 May 2023 19:52:37 +0300
Subject: [PATCH] Bugs fixed

---
 .../ProfileCalendar/ProfileCalendarComponent.js     | 13 ++++---------
 src/components/ShortReport/ShortReport.jsx          |  3 +++
 src/pages/ViewReport/ViewReport.jsx                 |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.js b/src/components/ProfileCalendar/ProfileCalendarComponent.js
index 1e57cea5..f3397f75 100644
--- a/src/components/ProfileCalendar/ProfileCalendarComponent.js
+++ b/src/components/ProfileCalendar/ProfileCalendarComponent.js
@@ -24,10 +24,10 @@ import "./../Calendar/calendarComponent.scss";
 export const ProfileCalendarComponent = React.memo(
   ({ value, setValueHandler, reports, totalHours }) => {
     const dispatch = useDispatch();
+
     const [currentDay] = useState(moment());
     const [calendar, setCalendar] = useState([]);
     const [month, setMonth] = useState("");
-    const [dayReport, setDayReport] = useState("");
     const [shortReport, setShortReport] = useState(false);
 
     useEffect(() => {
@@ -146,20 +146,15 @@ export const ProfileCalendarComponent = React.memo(
                 <button
                   onClick={() => {
                     dispatch(setReportDate(day));
+                    setShortReport(true);
+                    dispatch(setSendRequest(true));
                   }}
                   key={day}
                   className={dayStyles(day)}
                   name={day.format("dddd")}
                   id="btn"
                 >
-                  <Link
-                    to={correctRoute(day)}
-                    onClick={() => {
-                      setShortReport(true);
-                      setDayReport(day);
-                      dispatch(setSendRequest(true));
-                    }}
-                  >
+                  <Link to={correctRoute(day)}>
                     <img
                       className={"calendar__icon"}
                       src={calendarIcon}
diff --git a/src/components/ShortReport/ShortReport.jsx b/src/components/ShortReport/ShortReport.jsx
index d8bcc3fd..84eedd60 100644
--- a/src/components/ShortReport/ShortReport.jsx
+++ b/src/components/ShortReport/ShortReport.jsx
@@ -13,6 +13,7 @@ import {
 } from "../../redux/reportSlice";
 import { useDispatch, useSelector } from "react-redux";
 import { Link } from "react-router-dom";
+import { Loader } from "../Loader/Loader";
 
 import "./shortReport.scss";
 
@@ -34,6 +35,7 @@ export const ShortReport = ({}) => {
     setTaskText([]);
     setDifficulties([]);
     setTomorrowTask([]);
+    setTotalHours(0);
     apiRequest(
       `reports/find-by-date?user_card_id=${localStorage.getItem(
         "cardId"
@@ -95,6 +97,7 @@ export const ShortReport = ({}) => {
           </p>
         </div>
       </div>
+      {loader && <Loader style="green" />}
       {Boolean(taskText.length) && (
         <div className="viewReport__content">
           <div className="table__container">
diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx
index dde62a4b..df84fca4 100644
--- a/src/pages/ViewReport/ViewReport.jsx
+++ b/src/pages/ViewReport/ViewReport.jsx
@@ -45,9 +45,7 @@ export const ViewReport = () => {
         "cardId"
       )}&date=${day}`
     ).then((res) => {
-      console.log(res);
       let spendTime = 0;
-
       for (const item of res) {
         if (item.difficulties) {
           setDifficulties((prevArray) => [...prevArray, item.difficulties]);