From 00d9773b44fec5d31baac1d4c688cb6a7e7d7f6c Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Tue, 11 Jul 2023 21:37:32 +0200 Subject: [PATCH] (control) Better looking progress bar --- .../java/nu/marginalia/control/model/ProcessHeartbeat.java | 4 ++-- .../src/main/resources/templates/control/processes.hdb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/model/ProcessHeartbeat.java b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/model/ProcessHeartbeat.java index ddbe0d35..e072a2e2 100644 --- a/code/services-satellite/control-service/src/main/java/nu/marginalia/control/model/ProcessHeartbeat.java +++ b/code/services-satellite/control-service/src/main/java/nu/marginalia/control/model/ProcessHeartbeat.java @@ -5,7 +5,7 @@ public record ProcessHeartbeat( String processBase, String uuid, double lastSeenMillis, - int progress, + Integer progress, String status ) { public boolean isMissing() { @@ -17,7 +17,7 @@ public record ProcessHeartbeat( public String progressStyle() { if ("RUNNING".equals(status) && progress > 0) { return """ - background: linear-gradient(90deg, #ccc %d%%, #ccc %d%%, #fff %d%%) + background: linear-gradient(90deg, #fff 0%%, #ccc %d%%, #fff %d%%) """.formatted(progress, progress, progress); } return ""; diff --git a/code/services-satellite/control-service/src/main/resources/templates/control/processes.hdb b/code/services-satellite/control-service/src/main/resources/templates/control/processes.hdb index 1ab85c66..3f6e08eb 100644 --- a/code/services-satellite/control-service/src/main/resources/templates/control/processes.hdb +++ b/code/services-satellite/control-service/src/main/resources/templates/control/processes.hdb @@ -24,7 +24,7 @@ {{processId}} {{uuid}} {{status}} - {{progress}} + {{#if progress}}{{progress}}%{{/if}} {{#unless isStopped}}{{lastSeenMillis}}{{/unless}} {{/each}}