diff --git a/src/main/java/com/utopiaindustries/service/DashboardService.java b/src/main/java/com/utopiaindustries/service/DashboardService.java index 119d0bd..791a15d 100644 --- a/src/main/java/com/utopiaindustries/service/DashboardService.java +++ b/src/main/java/com/utopiaindustries/service/DashboardService.java @@ -131,6 +131,7 @@ public class DashboardService { progress.put("ALTER", (float) alterationPieceFinish); progress.put("Reject", (float) rejectFinishedItem); progress.put("wash", (float) washFinishedItem); + progress.put("finishingValueForBarChart", (float) approved + alterationPieceFinish + rejectFinishedItem + washFinishedItem + packagingItems); progress.put("packaging", (float) packagingItems); progress.put("totalPackaging", (float) packagingItemIDs.size()); diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index 2d83c35..7fca950 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -157,7 +157,7 @@ th:data-title="${detail.get('articleName')} + ' (' + ${date} + ')'" th:data-dates="${date}" th:data-stitching="${phases.get('Stitching')?.intValue() ?: 0}" - th:data-finishing="${phases.get('finishing')?.intValue() ?: 0}" + th:data-finishing="${phases.get('finishingValueForBarChart')?.intValue() ?: 0}" th:data-packaging="${phases.get('packaging')?.intValue() ?: 0}" th:data-totalProduction="${detail.get('Shift Target')}" th:data-fontSize="35">