apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new fixes

Browse Source
This commit is contained in:
Николай Полтщук
2023-03-01 00:28:58 +03:00
parent b568ec699e
commit 28a0c7f843
13 changed files with 141 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/ViewReport/ViewReport.js
View File

@ -12,7 +12,7 @@ import {Footer} from "../../components/Footer/Footer";
import arrow from "../../images/right-arrow.png";
import arrowSwitchDate from "../../images/arrowViewReport.png";
import {apiRequest} from "../../api/request";
import {getCorrectDate, getCreatedDate} from '../../components/Calendar/calendarHelper'
import {getCorrectDate, getCreatedDate, hourOfNum} from '../../components/Calendar/calendarHelper'
import './viewReport.scss'
@ -90,7 +90,7 @@ export const ViewReport = () => {
</Link>
<div className='viewReport__bar'>
<h3 className='viewReport__bar__date'>{getCorrectDate(reportDay)}</h3>
<p className='viewReport__bar__hours'>Вами потрачено на работу : <span>{totalHours} часов</span></p>
<p className='viewReport__bar__hours'>Вами потрачено на работу : <span>{totalHours} {hourOfNum(totalHours)}</span></p>
{/*<div className='viewReport__bar__progressBar'>*/}
{/* <span></span>*/}
{/*</div>*/}
@ -128,7 +128,7 @@ export const ViewReport = () => {
<td>
<div className='viewReport__done__hours__item'>
<span>{task.hours}</span>
<p className='hours'>часов на задачу</p>
<p className='hours'>{hourOfNum(task.hours)} на задачу</p>
</div>
</td>
</tr>

2
src/pages/ViewReport/viewReport.scss
View File

@ -82,7 +82,7 @@
&__hours {
font-weight: 400;
font-size: 12px;
font-size: 15px;
line-height: 32px;
color: #000000;