diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java index a1264da5..98b48df8 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java @@ -140,23 +140,18 @@ public class FormatHelper { * the same as longDate */ public static String daysTil(final long timestamp) { - long minutesLeft = (timestamp * 1000 - System.currentTimeMillis()) / ( 1000 * 60 ); - long hoursLeft = minutesLeft / 60; - long daysLeft = hoursLeft / 24; + long minutesLeft = (timestamp * 1000 - System.currentTimeMillis()) / (1000 * 60); if (minutesLeft <= 0) return "-"; - if (daysLeft > 14) { - return longDate(timestamp); - } else if (daysLeft >= 1) { - return new String(daysLeft + " Tag(e)"); - } else if (hoursLeft > 0) { - return new String(hoursLeft + " Stunde(n)"); - } else if (minutesLeft > 0){ + if (minutesLeft < 60) return new String(minutesLeft + " Minute(n)"); - } else { - return "-"; - } - + long hoursLeft = minutesLeft / 60; + if (hoursLeft < 24) + return new String(hoursLeft + " Stunde(n)"); + long daysLeft = hoursLeft / 24; + if (daysLeft < 14) + return new String(daysLeft + " Tag(e)"); + return longDate(timestamp); } /** |