diff --git a/src/main/java/de/ph87/data/series/Alignment.java b/src/main/java/de/ph87/data/series/Alignment.java index 3df0d25..91653e2 100644 --- a/src/main/java/de/ph87/data/series/Alignment.java +++ b/src/main/java/de/ph87/data/series/Alignment.java @@ -8,11 +8,11 @@ import java.util.function.*; public enum Alignment { FIVE(t -> t.truncatedTo(ChronoUnit.MINUTES).minusMinutes(t.getMinute() % 5), (t, a) -> t.plusMinutes(5 * a)), - HOUR(t -> t.truncatedTo(ChronoUnit.HOURS).minusMinutes(t.getMinute() % 5), ZonedDateTime::plusHours), + HOUR(t -> t.truncatedTo(ChronoUnit.HOURS), ZonedDateTime::plusHours), DAY(t -> t.truncatedTo(ChronoUnit.DAYS), ZonedDateTime::plusDays), - WEEK(t -> t.truncatedTo(ChronoUnit.DAYS).minusWeeks(t.getDayOfWeek().getValue() - 1), ZonedDateTime::plusWeeks), - MONTH(t -> t.truncatedTo(ChronoUnit.DAYS).minusMonths(t.getDayOfMonth() - 1), ZonedDateTime::plusMonths), - YEAR(t -> t.truncatedTo(ChronoUnit.DAYS).minusYears(t.getDayOfYear() - 1), ZonedDateTime::plusYears), + WEEK(t -> t.truncatedTo(ChronoUnit.DAYS).minusDays(t.getDayOfWeek().getValue() - 1), ZonedDateTime::plusWeeks), + MONTH(t -> t.truncatedTo(ChronoUnit.DAYS).minusDays(t.getDayOfMonth() - 1), ZonedDateTime::plusMonths), + YEAR(t -> t.truncatedTo(ChronoUnit.DAYS).minusDays(t.getDayOfYear() - 1), ZonedDateTime::plusYears), ; @NonNull