Merge branch 'main' into webpack-5

# Conflicts:
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/hooks/useRequest.js

src/components/ProfileCalendar/ProfileCalendar.js

@@ -1,13 +1,14 @@
 import React, { useEffect, useState } from 'react'
 import {useDispatch, useSelector} from 'react-redux'
 
+import {currentMonth, getReports} from '../Calendar/calendarHelper'
 import { Link } from 'react-router-dom'
 import moment from "moment";
 
-import {currentMonth, getReports} from '../Calendar/calendarHelper'
 import {ProfileCalendarComponent} from "./ProfileCalendarComponent";
-import { Footer } from '../Footer/Footer'
+import {Loader} from "../Loader/Loader";
 import {ProfileHeader} from "../ProfileHeader/ProfileHeader";
+import { Footer } from '../Footer/Footer'
 
 import {urlForLocal} from "../../helper";
 
@@ -25,6 +26,7 @@ export const ProfileCalendar = () => {
     const [reports, setReports] = useState([]);
     const [totalHours, setTotalHours] = useState(0);
     const [requestDates, setRequestDates] = useState('');
+    const [loader, setLoader] = useState(false)
 
 
     useEffect(() => {
@@ -32,19 +34,23 @@ export const ProfileCalendar = () => {
     },[]);
 
     useEffect( () => {
+        setLoader(true)
         if (!requestDates) {
             return
         }
-        apiRequest(`/reports/reports-by-date?${requestDates}&user_id=${localStorage.getItem('id')}`)
+        apiRequest(`/reports/reports-by-date?${requestDates}&user_card_id=${localStorage.getItem('cardId')}`)
             .then((reports) => {
                 let spendTime = 0;
-                reports.map((report) => {
-                    if (report.spendTime) {
-                        spendTime += Number(report.spendTime)
-                    }
-                });
+                for (const report of reports) {
+                    report.task.map((task) => {
+                        if(task.hours_spent) {
+                            spendTime += Number(task.hours_spent)
+                        }
+                    })
+                }
                 setTotalHours(spendTime);
                 setReports(reports)
+                setLoader(false)
             })
     }, [requestDates]);
 
@@ -68,14 +74,18 @@ export const ProfileCalendar = () => {
                         }}>Заполнить отчет за день</button>
                     </Link>
                 </div>
-                <div className='row'>
-                    <div className='col-12 col-xl-12'>
-                        <ProfileCalendarComponent reportsDates={reports} />
-                        <p className='calendar__hours'>
-                            {month} : <span> {totalHours} часов </span>
-                        </p>
+                {loader ?
+                    <Loader height={80}  width={80} />
+                    :
+                    <div className='row'>
+                        <div className='col-12 col-xl-12'>
+                            <ProfileCalendarComponent reportsDates={reports} />
+                            <p className='calendar__hours'>
+                                {month} : <span> {totalHours} часов </span>
+                            </p>
+                        </div>
                     </div>
-                </div>
+                }
             </div>
             <Footer />
         </div>

src/components/ProfileCalendar/ProfileCalendarComponent.js

@@ -37,7 +37,7 @@ export const ProfileCalendarComponent = ({reportsDates}) => {
     function dayStyles(day) {
         if (value < day) return `block`
         for (const date of reportsDates) {
-            if (`${new Date(day).getFullYear()}-${correctDay(new Date(day).getMonth() + 1)}-${correctDay(new Date(day).getDate())}` === date.date) {
+            if (`${new Date(day).getFullYear()}-${correctDay(new Date(day).getMonth() + 1)}-${correctDay(new Date(day).getDate())}` === date.created_at) {
                 return `before`
             }
         }
@@ -48,8 +48,8 @@ export const ProfileCalendarComponent = ({reportsDates}) => {
 
     function correctRoute(day) {
         for (const date of reportsDates) {
-            if (`${new Date(day).getFullYear()}-${correctDay(new Date(day).getMonth() + 1)}-${correctDay(new Date(day).getDate())}` === date.date) {
-                return `../../view/report`
+            if (`${new Date(day).getFullYear()}-${correctDay(new Date(day).getMonth() + 1)}-${correctDay(new Date(day).getDate())}` === date.created_at) {
+                return `../view`
             }
         }
         return '../../report'

src/components/ProfileCalendar/profileCalendar.scss

@@ -16,6 +16,15 @@
   .summary__info {
     padding-right: 25px;
   }
+
+  .loader {
+    margin: 20px 0 50px;
+    &:hover {
+      path {
+        fill: #ffffff;
+      }
+    }
+  }
   .profile__calendar {
     margin-top: 20px;
   }