Skip to content

Commit

Permalink
Merge pull request #628 from 5sControl/622-4h-in-orders-view-time-rep…
Browse files Browse the repository at this point in the history
…orts-are-incorrectly-displayed-when-displaying-several-days

fix: hide additional info in order dashboard
  • Loading branch information
pkostukevich authored Aug 30, 2024
2 parents 11a1e0c + f088f02 commit f17902e
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/pages/dashboard/components/timeline/timeline.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ export const Timeline = ({ data, startDate, algorithm, startTime, endTime }) =>
const hours = duration.hours();
const minutes = duration.minutes();
const seconds = duration.seconds();
return `${days ? days + 'days' : ''} ${hours ? hours + 'h' : ''} ${minutes ? minutes + 'min' : ''
} ${seconds ? seconds + 'sec' : ''}`;
return `${days ? days + 'days' : ''} ${hours ? hours + 'h' : ''} ${
minutes ? minutes + 'min' : ''
} ${seconds ? seconds + 'sec' : ''}`;
};

useEffect(() => {
Expand All @@ -128,15 +129,15 @@ export const Timeline = ({ data, startDate, algorithm, startTime, endTime }) =>
id: dat.id,
start: moment(dat.start_tracking).isSame(moment(new Date(startDate)), 'day')
? moment
.utc(dat.start_tracking)
.utcOffset(moment().utcOffset())
.format('YYYY-MM-DD HH:mm:ss')
.utc(dat.start_tracking)
.utcOffset(moment().utcOffset())
.format('YYYY-MM-DD HH:mm:ss')
: moment(startDate).format(`YYYY-MM-DD ${startTime}`),
stop: moment(dat.stop_tracking).isSame(moment(new Date(startDate)), 'day')
? moment
.utc(dat.stop_tracking)
.utcOffset(moment().utcOffset())
.format('YYYY-MM-DD HH:mm:ss')
.utc(dat.stop_tracking)
.utcOffset(moment().utcOffset())
.format('YYYY-MM-DD HH:mm:ss')
: moment(startDate).format(`YYYY-MM-DD ${endTime}`),
violation_found: dat.violation_found ? 'red' : 'green',
algorithm: parsingAlgorithmName(dat.algorithm.name),
Expand Down Expand Up @@ -308,7 +309,7 @@ export const Timeline = ({ data, startDate, algorithm, startTime, endTime }) =>
</div>

{currentReport.extra && currentReport.extra.length > 0 ? (
<div className={styles.fullscreen__footer_text}>
<div style={{ display: 'none' }} className={styles.fullscreen__footer_text}>
<span> Additional:&nbsp;</span>
<span
className={styles.link}
Expand Down

0 comments on commit f17902e

Please sign in to comment.