From 1639bf31fe5225ceeffc996c7e2c4ddcd004a7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Wed, 24 Aug 2022 08:42:13 +0200 Subject: [PATCH] corrected calculation times --- build.gradle | 2 +- .../de/jottyfan/timetrack/spring/done/SummaryBean.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 7f4c527..df03d62 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = 'de.jottyfan' -version = '1.2.6' +version = '1.2.7' sourceCompatibility = '11' ext['spring-framework.version'] = '5.3.18' diff --git a/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java b/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java index 7deda5b..975affd 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java +++ b/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java @@ -168,9 +168,10 @@ public class SummaryBean implements Serializable { public String getOverdue() { Duration overdue = getTotalTime().minus(maxDayWorktime); int minutes = overdue.toMinutesPart(); - boolean negative = minutes < 0; - minutes = negative ? (-1 * minutes) : minutes; - String result = String.format("%02d:%02d", overdue.toHours(), minutes); - return negative ? "-" + result : result; + int hours = overdue.toHoursPart(); + boolean negative = overdue.isNegative(); + minutes = minutes < 0 ? (-1 * minutes) : minutes; + hours = hours < 0 ? (-1 * hours) : hours; + return String.format("%s%02d:%02d", negative ? "-" : "", hours, minutes); } }