From a4029cb71d24a508995e412812f021684fedb408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Henke?= Date: Wed, 6 Jul 2022 15:07:38 +0200 Subject: [PATCH] eucansharetimes --- .../timetrack/spring/done/SummaryBean.java | 14 ++++++++++++++ src/main/resources/static/css/style.css | 5 +++++ src/main/resources/templates/done/list.html | 14 +++++++++----- 3 files changed, 28 insertions(+), 5 deletions(-) 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 88c8dc7..240c73a 100644 --- a/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java +++ b/src/main/java/de/jottyfan/timetrack/spring/done/SummaryBean.java @@ -24,6 +24,20 @@ public class SummaryBean implements Serializable { this.maxDayWorktime = maxDayWorktime; } + public String getBillingTime(String key) { + Duration duration = Duration.ZERO; + for (DoneBean bean : list) { + if (key == null && bean.getBilling() == null) { + duration = duration.plus(bean.getTimeDiffDuration()); + } else if (bean.getBilling() != null && bean.getBilling().getShortcut().equals(key)) { + duration = duration.plus(bean.getTimeDiffDuration()); + } + } + int minutes = duration.toMinutesPart(); + int minutesPercent = Float.valueOf((5f / 3f) * minutes).intValue(); + return String.format("%d,%d h", duration.toHoursPart(), minutesPercent); + } + /** * @return the start */ diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index e5be4ca..fe789fc 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -153,6 +153,11 @@ body { text-align: right; } +.distfat { + margin-left: 8px; + font-weight: bolder; +} + .prompt { margin: 4px; padding: 4px !important; diff --git a/src/main/resources/templates/done/list.html b/src/main/resources/templates/done/list.html index f19760b..e99abd5 100644 --- a/src/main/resources/templates/done/list.html +++ b/src/main/resources/templates/done/list.html @@ -25,8 +25,6 @@