From 0fd2b0235a0f1642a0ee008dccf553ae9a770fce Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 1 Jul 2017 16:14:20 +0200
Subject: [PATCH] Fixed Filter
---
.../budgetmaster/ui/FilterController.java | 12 ++----------
.../budgetmaster/ui/PaymentController.java | 4 ++--
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/ui/FilterController.java b/src/de/deadlocker8/budgetmaster/ui/FilterController.java
index 49b2a1505..504610f91 100644
--- a/src/de/deadlocker8/budgetmaster/ui/FilterController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/FilterController.java
@@ -31,14 +31,12 @@ public class FilterController
private Stage stage;
private Controller controller;
- private PaymentController paymentController;
private FilterSettings filterSetttings;
- public void init(Stage stage, Controller controller, PaymentController paymentController, FilterSettings filterSettings)
+ public void init(Stage stage, Controller controller, FilterSettings filterSettings)
{
this.stage = stage;
this.controller = controller;
- this.paymentController = paymentController;
this.filterSetttings = filterSettings;
FontIcon iconCancel = new FontIcon(FontIconType.TIMES);
@@ -124,16 +122,10 @@ public class FilterController
name = null;
}
- // get new unfiltered list from server
- controller.refresh(new FilterSettings());
-
FilterSettings newFilterSettings = new FilterSettings(isIncomeAllowed, isPaymentAllowed, isNoRepeatingAllowed, isMonthlyRepeatingAllowed, isRepeatingEveryXDaysAllowed, allowedCategoryIDs, name);
-
controller.setFilterSettings(newFilterSettings);
- controller.getPaymentHandler().filter(newFilterSettings);
-
+ controller.refresh(newFilterSettings);
stage.close();
- paymentController.getController().refreshAllTabs();
}
public void reset()
diff --git a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
index c4b7cc52c..d7e8ec416 100644
--- a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java
@@ -258,8 +258,8 @@ public class PaymentController implements Refreshable
newStage.getIcons().add(controller.getIcon());
newStage.setResizable(false);
FilterController newController = fxmlLoader.getController();
- newController.init(newStage, controller, this, controller.getFilterSettings());
- newStage.show();
+ newController.init(newStage, controller, controller.getFilterSettings());
+ newStage.showAndWait();
}
catch(IOException e)
{
--
GitLab