src/components/Common/Footer/Footer.jsx

@@ -34,7 +34,7 @@ export const Footer = () => {
                   <img src={tg} alt="tg" width={24} />
                 </a>
               </div>
-              <p>Присоединиться к команде</p>
+              <p>Войти в команду</p>
             </div>
             <div className="footer__info">
               <div className="footer__mail">

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -24,6 +24,7 @@ import {
   hourOfNum
 } from "@components/Calendar/calendarHelper";
 import BaseButton from "@components/Common/BaseButton/BaseButton";
+import ShortReport from "@components/ShortReport/ShortReport";
 
 import arrow from "assets/icons/arrows/arrowCalendar.png";
 import calendarIcon from "assets/icons/calendar.svg";
@@ -45,6 +46,7 @@ export const ProfileCalendarComponent = React.memo(
 
     const [calendar, setCalendar] = useState([]);
     const [month, setMonth] = useState("");
+    const [shortReport, setShortReport] = useState(false);
     const [endDate, setEndDate] = useState(null);
     const [totalRangeHours, setTotalRangeHours] = useState(0);
     const [selectedRangeDays, setSelectedRangeDays] = useState({});
@@ -94,7 +96,7 @@ export const ProfileCalendarComponent = React.memo(
             new Date(day).getMonth() + 1
           )}-${correctDay(new Date(day).getDate())}` === date.created_at
         ) {
-          return `../view/${date.created_at}`;
+          return "#";
         }
       }
       return "../../report";
@@ -140,12 +142,29 @@ export const ProfileCalendarComponent = React.memo(
 
     function onMouseRangeDays(day) {
       let selectRange = {};
-      for (let curDay in selectedRangeDays)
+      for (let curDay in selectedRangeDays) {
-        selectRange[curDay] =
+        if (day > startDate) {
-          day > startDate
+          if (
-            ? new Date(curDay) > startDate && new Date(curDay) < day
+            day > startDate &&
-            : new Date(curDay) < startDate && new Date(curDay) > day;
+            new Date(curDay) > startDate &&
-
+            new Date(curDay) < day
+          ) {
+            selectRange[curDay] = true;
+          } else {
+            selectRange[curDay] = false;
+          }
+        } else {
+          if (
+            day < startDate &&
+            new Date(curDay) < startDate &&
+            new Date(curDay) > day
+          ) {
+            selectRange[curDay] = true;
+          } else {
+            selectRange[curDay] = false;
+          }
+        }
+      }
       setSelectedRangeDays(selectRange);
     }
 
@@ -220,15 +239,18 @@ export const ProfileCalendarComponent = React.memo(
               week.map((day) => (
                 <button
                   onClick={() => {
-                    if (startRangeDays) rangeDays(day);
+                    if (startRangeDays) {
-                    else {
+                      rangeDays(day);
+                    } else {
                       dispatch(setReportDate(day));
+                      setShortReport(true);
                       dispatch(setSendRequest(true));
                     }
                   }}
                   onMouseEnter={() => {
-                    if (startRangeDays && startDate && !endDate)
+                    if (startRangeDays && startDate && !endDate) {
                       onMouseRangeDays(day);
+                    }
                   }}
                   key={day}
                   className={
@@ -273,15 +295,15 @@ export const ProfileCalendarComponent = React.memo(
                 ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
                 : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
               : activePeriod
-                ? "Выберите диапазон на календаре"
+              ? "Выберите диапазон на календаре"
-                : "Выбрать диапазон"}
+              : "Выбрать диапазон"}
           </span>
           <span>
             {totalRangeHours
               ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
               : endDate
-                ? "0 часов"
+              ? "0 часов"
-                : ""}
+              : ""}
           </span>
           {endDate && (
             <BaseButton
@@ -296,6 +318,7 @@ export const ProfileCalendarComponent = React.memo(
             </BaseButton>
           )}
         </div>
+        {shortReport && <ShortReport />}
       </div>
     );
   }

src/components/ReportForm/ReportForm.jsx

@@ -170,7 +170,7 @@ const ReportForm = () => {
             />
             <div className="report-form__task-list">
               <img src={ellipse} alt="" />
-              <span>Какие задачи выполнены?</span>
+              <span>Какие задачи были выполнены?</span>
             </div>
           </div>
 

src/components/ReportForm/reportForm.scss

@@ -166,7 +166,7 @@
         }
 
         @media (max-width: 610px) {
-          margin-left: 80px;
+          margin-left: 85px;
         }
       }
     }
@@ -472,6 +472,12 @@
           max-width: 141px;
         }
       }
+
+      &-list {
+        img {
+          display: none;
+        }
+      }
     }
   }
 }

src/pages/ViewReport/ViewReport.jsx

@@ -59,12 +59,13 @@ export const ViewReport = () => {
             task: task.task,
             id: task.id
           };
-          spendTime += Math.floor(task.hours_spent);
+          if (task.hours_spent) {
-
+            spendTime += Number(task.hours_spent);
+          }
           setTaskText((prevArray) => [...prevArray, taskInfo]);
         });
       }
-      setTotalHours(Math.floor(spendTime));
+      setTotalHours(spendTime);
       setLoader(false);
     });
     previousReportDay.setDate(previousReportDay.getDate() - 1);
@@ -105,7 +106,7 @@ export const ViewReport = () => {
             <img src={arrow} alt="#" />
             <p>Вернуться</p>
           </Link>
-          {/* <div className="viewReport__bar">
+          <div className="viewReport__bar">
             <h3 className="viewReport__bar__date">
               {getCorrectDate(dateReport.id)}
             </h3>
@@ -115,12 +116,16 @@ export const ViewReport = () => {
                 {totalHours} {hourOfNum(totalHours)}
               </span>
             </p>
-          </div> */}
+          </div>
         </div>
-        <div className="viewReport__switch-date">
+        <div className="viewReport__switchDate">
-          <div onClick={() => previousDay()}>
+          <div
+            onClick={() => {
+              previousDay();
+            }}
+          >
             <Link to={`../view/${getCreatedDate(previousReportDay)}`}>
-              <div className="viewReport__switch-date__prev switch-date">
+              <div className="viewReport__switchDate__prev switchDate">
                 <img src={arrowSwitchDate} alt="arrow" />
               </div>
             </Link>
@@ -135,7 +140,7 @@ export const ViewReport = () => {
             }`}
           >
             <Link to={`../view/${getCreatedDate(nextReportDay)}`}>
-              <div className={`viewReport__switch-date__next switch-date`}>
+              <div className={`viewReport__switchDate__next switchDate`}>
                 <img src={arrowSwitchDate} alt="arrow" />
               </div>
             </Link>
@@ -149,7 +154,7 @@ export const ViewReport = () => {
                 <thead>
                   <tr>
                     <th>
-                      <p>Какие задачи выполнены?</p>
+                      <p>Какие задачи были выполнены?</p>
                     </th>
                     <th>
                       <p>Время</p>
@@ -168,9 +173,9 @@ export const ViewReport = () => {
                           </td>
                           <td>
                             <div className="viewReport__done__hours__item">
-                              <span>{Math.floor(task.hours)}</span>
+                              <span>{task.hours}</span>
                               <p className="hours">
-                                {hourOfNum(Math.floor(task.hours))}
+                                {hourOfNum(task.hours)} на задачу
                               </p>
                             </div>
                           </td>

src/pages/ViewReport/viewReport.scss

@@ -139,11 +139,11 @@
     margin-bottom: 0;
   }
 
-  &__switch-date {
+  &__switchDate {
     display: flex;
-    margin: 20px 0;
+    margin: 30px 0;
     justify-content: center;
-    column-gap: 30px;
+    column-gap: 140px;
     align-items: center;
 
     @media (max-width: 500px) {
@@ -158,7 +158,7 @@
       color: #000000;
     }
 
-    .switch-date {
+    .switchDate {
       width: 48px;
       height: 48px;
       background: #8DC63F;
@@ -396,11 +396,15 @@
   &__item {
     display: flex;
     flex-direction: column;
-    row-gap: 10px;
+    row-gap: 22px;
     background: #FFFFFF;
     border-radius: 12px;
-    margin: 20px 0;
+    margin: 25px 0;
-    padding: 15px;
+    padding: 25px 35px;
+
+    @media (max-width: 650px) {
+      padding: 15px 20px;
+    }
 
     h3 {
       font-weight: 500;
@@ -416,9 +420,11 @@
     p {
       font-weight: 400;
       font-size: 15px;
+      line-height: 20px;
 
       @media (max-width: 650px) {
-        font-size: 13px;
+        font-size: 10px;
+        line-height: 18px;
       }
     }
   }