From e867b34cb7ab0252dc69746aee1333bd7945ac36 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 24 Feb 2016 14:38:47 +0100 Subject: [PATCH] display if background task processing crossed midnight --- .../main/js/apps/background-tasks/components/Task.js | 6 +++--- .../js/apps/background-tasks/components/TaskDate.js | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js b/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js index c8bbf919a95..ad384d12529 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js @@ -41,9 +41,9 @@ export default function Task ({ task, index, tasks, component, onCancelTask, onF - - - + + + diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.js b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.js index 5c8759cfa9e..568b65df97b 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.js @@ -20,9 +20,17 @@ import moment from 'moment'; import React from 'react'; -export default function TaskDate ({ date, format }) { +export default function TaskDate ({ date, baseDate, format }) { + const m = moment(date); + const baseM = moment(baseDate); + const diff = (date && baseDate) ? m.diff(baseM, 'days') : 0; + return ( + {diff > 0 && ( + {`(+${diff})`} + )} + {date ? moment(date).format(format) : ''} ); -- 2.39.5