diff --git a/src/shared/common.js b/src/shared/common.js index 2f98633f3..0ccddfc76 100644 --- a/src/shared/common.js +++ b/src/shared/common.js @@ -410,19 +410,17 @@ $common.valueWithDefault = function valueWithDefault(variable, defaultValue) { * function will return a percentage rounded to the tenth decimal place. */ $common.calcProgressPercent = function calcProgressPercent(total, completed) { - if (completed >= total) { + if (total == 0 || completed == 0) { + // the absence of work does not imply progress. + return 0; + } else if (completed >= total) { // In something has already been completed (e.g. suppressed) and the completed value // is greater than the total, return 100% return 100; - } else if (total > 0) { - if (completed === 0) { - return 0; - } else { - let percentage = (completed / total) * 100; - return Math.round(percentage * 10) / 10; - } } - return 0; // the absence of work does not imply progress. + + let percentage = (completed / total) * 100; + return Math.round(percentage * 10) / 10; }; /**