From f088f0254040e1fc802689b2f1797501b0346ff2 Mon Sep 17 00:00:00 2001 From: Polina Kostukevich Date: Fri, 30 Aug 2024 14:48:47 +0300 Subject: [PATCH] fix: hide additional info in order dashboard --- .../components/timeline/timeline.jsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/pages/dashboard/components/timeline/timeline.jsx b/src/pages/dashboard/components/timeline/timeline.jsx index c026fa3b3..d6f5bb4f0 100644 --- a/src/pages/dashboard/components/timeline/timeline.jsx +++ b/src/pages/dashboard/components/timeline/timeline.jsx @@ -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(() => { @@ -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), @@ -308,7 +309,7 @@ export const Timeline = ({ data, startDate, algorithm, startTime, endTime }) => {currentReport.extra && currentReport.extra.length > 0 ? ( -
+
Additional: