From 20a8ee0745b0c46da84a52ec5a366b57be91027b Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Mon, 21 Sep 2020 13:29:29 +0200 Subject: [PATCH] Dashboard: be more precise in percentage to avoid to display 'done' with few jobs remaining --- dashboard/generate.py | 2 +- dashboard/templates/repository.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dashboard/generate.py b/dashboard/generate.py index fd19a30e..4b11715b 100644 --- a/dashboard/generate.py +++ b/dashboard/generate.py @@ -96,7 +96,7 @@ class Fetcher(object): unresolvable = 0 if building + failed + succeeded == 0: return {'building': -1} - return { 'building': 1000 - int(building * 1000 / (building + failed + succeeded + broken)), + return { 'building': 10000 - int(building * 10000 / (building + failed + succeeded + broken)), 'failed': failed, 'broken': broken, 'unresolvable': unresolvable } diff --git a/dashboard/templates/repository.html b/dashboard/templates/repository.html index 1e6c859f..4965a297 100644 --- a/dashboard/templates/repository.html +++ b/dashboard/templates/repository.html @@ -1,7 +1,7 @@ {% set progress = project.build_summary(repository) %} {% if progress['building'] >= 0 %} - {% if progress['building'] < 1000 %} - {{ progress['building'] / 10}}% done + {% if progress['building'] < 10000 %} + {{ progress['building'] / 100}}% done {% else %} done {% endif %}