diff --git a/src/components/ReportForm/ReportForm.jsx b/src/components/ReportForm/ReportForm.jsx index 3482c29e..4aaeff09 100644 --- a/src/components/ReportForm/ReportForm.jsx +++ b/src/components/ReportForm/ReportForm.jsx @@ -170,7 +170,7 @@ const ReportForm = () => { />
- Какие задачи были выполнены? + Какие задачи выполнены?
diff --git a/src/components/ReportForm/reportForm.scss b/src/components/ReportForm/reportForm.scss index 5c185a7c..9c4a7b3c 100644 --- a/src/components/ReportForm/reportForm.scss +++ b/src/components/ReportForm/reportForm.scss @@ -166,7 +166,7 @@ } @media (max-width: 610px) { - margin-left: 85px; + margin-left: 80px; } } } @@ -472,12 +472,6 @@ max-width: 141px; } } - - &-list { - img { - display: none; - } - } } } } diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx index c89f8df9..c1e4e5e4 100644 --- a/src/pages/ViewReport/ViewReport.jsx +++ b/src/pages/ViewReport/ViewReport.jsx @@ -59,13 +59,12 @@ export const ViewReport = () => { task: task.task, id: task.id }; - if (task.hours_spent) { - spendTime += Number(task.hours_spent); - } + spendTime += Math.floor(task.hours_spent); + setTaskText((prevArray) => [...prevArray, taskInfo]); }); } - setTotalHours(spendTime); + setTotalHours(Math.floor(spendTime)); setLoader(false); }); previousReportDay.setDate(previousReportDay.getDate() - 1); @@ -106,7 +105,7 @@ export const ViewReport = () => { #

Вернуться

-
+ {/*

{getCorrectDate(dateReport.id)}

@@ -116,16 +115,12 @@ export const ViewReport = () => { {totalHours} {hourOfNum(totalHours)}

-
+
*/} -
-
{ - previousDay(); - }} - > +
+
previousDay()}> -
+
arrow
@@ -140,7 +135,7 @@ export const ViewReport = () => { }`} > -
+
arrow
@@ -154,7 +149,7 @@ export const ViewReport = () => { -

Какие задачи были выполнены?

+

Какие задачи выполнены?

Время

@@ -173,9 +168,9 @@ export const ViewReport = () => {
- {task.hours} + {Math.floor(task.hours)}

- {hourOfNum(task.hours)} на задачу + {hourOfNum(Math.floor(task.hours))}

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