Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fixed PeriodHelper shift for days

This commit is contained in:
Robert von Burg 2021-06-11 11:36:44 +02:00
parent ad3a22a170
commit 51c6d74955
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
View File

@ -214,8 +214,9 @@ public class PeriodHelper {
return date;
ZonedDateTime result = date.plusWeeks(shiftWeeks);
if (!result.isBefore(end))
return date.plusWeeks(shiftWeeks - 1);
if (result.isBefore(end))
return result;
return date.plusWeeks(shiftWeeks - 1);
}
// see if we are shifting simply by single days
@ -237,7 +238,10 @@ public class PeriodHelper {
if (shiftDays < 1)
return date;
return date.plusDays(shiftDays);
ZonedDateTime result = date.plusDays(shiftDays);
if (result.isBefore(end))
return result;
return date.plusDays(shiftDays - 1);
}
if (!period.isZero())