Merge pull request #51 from jenkinsci/relative-values

fix wrong calculation for `relative` and `dual` -`displayType`
jenkinsci · Sep 8, 2022 · fda191c · fda191c
2 parents d3143c7 + 8eacc8f
commit fda191c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/io/jenkins/plugins/reporter/model/ItemTableModel.java b/src/main/java/io/jenkins/plugins/reporter/model/ItemTableModel.java
@@ -136,12 +136,12 @@ public Map<String, String> getColors() {
             return report.getResult().getColors();
         }
 
-        public String label(Integer value) {
+        public String label(String id, Integer value) {
             if (item.getResult().size() == 1) {
                 return item.getLabel(report, value, value / (double) model.getItem().getTotal() * 100);
             }
 
-            return item.getLabel(report, value, value / (double) item.getTotal() * 100);
+            return item.getLabel(report, value, value / (double) model.getItem().getResult().get(id) * 100);
         }
 
         public String tooltip(String id, double percentage) {

diff --git a/src/main/resources/io/jenkins/plugins/reporter/ItemViewModel/index.jelly b/src/main/resources/io/jenkins/plugins/reporter/ItemViewModel/index.jelly
@@ -84,7 +84,7 @@
                                             </td>
 
                                             <j:forEach var="i" items="${row.item.result}">
-                                                <td class="text-end">${row.label(i.value)}</td>
+                                                <td class="text-end">${row.label(i.key, i.value)}</td>
                                             </j:forEach>
 
                                             <td>
@@ -99,8 +99,7 @@
                                                                   data-bs-toggle="tooltip" data-bs-placement="left" 
                                                                   title="${row.tooltip(id, percentage)}">.</span>
                                                         </j:if>
-
-
+
                                                     </j:forEach>
                                                 </div>
                                             </td>