diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java index 27cd67b4652f86cbf2a30a804560cf0022080ea8..fcf3ad8cd78ceb6a9a2f1d79f0c34ed7971061de 100644 --- a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java +++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java @@ -158,7 +158,6 @@ public class ReportGenerator document.setMargins(50, 45, 50, 70); Font headerFont = new Font(FontFamily.HELVETICA, 14, Font.BOLD); Font smallHeaderFont = new Font(FontFamily.HELVETICA, 12, Font.BOLD); - Font paragraphFont = new Font(FontFamily.HELVETICA, 12, Font.NORMAL); document.add(generateHeader()); document.add(Chunk.NEWLINE); diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/main/_de.properties index fd5fb2a3405a5283d60152c08e6be9359c0b0961..6c6a869a5ad681caeabcd043f560ac2e140054ee 100644 --- a/src/de/deadlocker8/budgetmaster/main/_de.properties +++ b/src/de/deadlocker8/budgetmaster/main/_de.properties @@ -1,7 +1,7 @@ app.name=BudgetMaster -version.code=5 -version.name=1.3.1 -version.date=12.08.17 +version.code=6 +version.name=1.3.2 +version.date=21.08.17 author=Robert Goldmann folder=Deadlocker/BudgetMaster diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties index cc0a0ccf45be1d7000a5eb8be6afcf220a9ae49c..18d434a320eb11c0e768bfc7881848efa79661f9 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/_de.properties +++ b/src/de/deadlocker8/budgetmasterserver/main/_de.properties @@ -1,5 +1,5 @@ app.name=BudgetMasterServer -version.code=5 -version.name=1.3.1 -version.date=12.08.17 +version.code=6 +version.name=1.3.2 +version.date=21.08.17 author=Robert Goldmann \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java index 65299438637232fdaf169cf2d3fe9679016fa564..c43cd7caebb5391726969ac64aa8c741a671071a 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java +++ b/src/de/deadlocker8/budgetmasterserver/server/updater/RepeatingPaymentUpdater.java @@ -20,25 +20,28 @@ public class RepeatingPaymentUpdater this.handler = handler; } + @SuppressWarnings("unlikely-arg-type") public void updateRepeatingPayments(DateTime now) { try - { + { ArrayList<RepeatingPayment> repeatingPayments = handler.getAllRepeatingPayments(); ArrayList<LatestRepeatingPayment> latest = handler.getLatestRepeatingPaymentEntries(); for(RepeatingPayment currentPayment : repeatingPayments) { + DateTime date = now; int index = latest.indexOf(currentPayment); if(currentPayment.getRepeatEndDate() != null) { DateTime endDate = DateTime.parse(currentPayment.getRepeatEndDate()); - if(endDate.isBefore(now)) - { - now = endDate; + if(endDate.isBefore(date)) + { + date = endDate; } } - ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, now); + ArrayList<DateTime> correctDates = getCorrectRepeatingDates(currentPayment, date); + if(index != -1) { LatestRepeatingPayment currentLatest = latest.get(index);