From bd0d6970b6cf046c898569c8f0acbee88dfd642a Mon Sep 17 00:00:00 2001 From: Gabriel Castro Date: Fri, 18 Jan 2019 11:35:40 -0500 Subject: [PATCH] feat(job-details): show raw progress when not numeric --- src/server/views/helpers/handlebars.js | 4 +++ .../views/partials/dashboard/jobDetails.hbs | 28 +++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/server/views/helpers/handlebars.js b/src/server/views/helpers/handlebars.js index 33b42eb4..5d664b20 100644 --- a/src/server/views/helpers/handlebars.js +++ b/src/server/views/helpers/handlebars.js @@ -23,6 +23,10 @@ const helpers = { return new Handlebars.SafeString(JSON.stringify(...args)); }, + isNumber(operand) { + return parseInt(operand, 10).toString() === String(operand); + }, + adjustedPage(currentPage, pageSize, newPageSize) { const firstId = (currentPage - 1) * pageSize; return _.ceil(firstId / newPageSize) + 1; diff --git a/src/server/views/partials/dashboard/jobDetails.hbs b/src/server/views/partials/dashboard/jobDetails.hbs index a0ffe046..19e43b09 100644 --- a/src/server/views/partials/dashboard/jobDetails.hbs +++ b/src/server/views/partials/dashboard/jobDetails.hbs @@ -49,19 +49,23 @@ {{#unless this.queue.IS_BEE}}
Progress
-
-
- {{ this._progress }}% +{{#if (isNumber this._progress)}} +
+
+ {{ this._progress }}% +
-
+{{else}} +
{{json this._progress true}}
+{{/if}} {{/unless}} {{#if this.returnvalue}}