From 6c432011135bf7d129a940a400b598250163d4a6 Mon Sep 17 00:00:00 2001 From: Vladimir Eliezer Tokarev Date: Sat, 9 Jul 2016 13:10:53 +0300 Subject: [PATCH] Created the Advanced Search class --- .../PollingStationDashboardController.java | 3 ++ .../AdvancedSearchController.java | 9 ++++++ .../advancedSearch/AdvancedSearchHandler.java | 16 ++++++++++ .../advancedSearch/AdvancedSearchLoader.java | 8 +++++ .../dashboard/polling_station_dashboard.fxml | 32 ++++++++++++------- 5 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchController.java create mode 100644 polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchHandler.java create mode 100644 polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchLoader.java diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/PollingStationDashboardController.java b/polling-station-gui/src/main/java/polling_station_dashboard/PollingStationDashboardController.java index 795f5f3..eba8bf5 100644 --- a/polling-station-gui/src/main/java/polling_station_dashboard/PollingStationDashboardController.java +++ b/polling-station-gui/src/main/java/polling_station_dashboard/PollingStationDashboardController.java @@ -32,4 +32,7 @@ public class PollingStationDashboardController { { this.eventHandlerMap.Handle(mousePressed); } + + @FXML + private void ExpandAdvanceSearch(MouseEvent mousePressed) { this.eventHandlerMap.Handle(mousePressed);} } diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchController.java b/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchController.java new file mode 100644 index 0000000..b543f9f --- /dev/null +++ b/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchController.java @@ -0,0 +1,9 @@ +package polling_station_dashboard.search.advancedSearch; + +/** + * Created by dasha on 7/9/2016. + * AdvancedSearchController controls the behavior of the adnvaced search panel + * for example searching by tag type + */ +public class AdvancedSearchController { +} diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchHandler.java b/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchHandler.java new file mode 100644 index 0000000..6a8f7ad --- /dev/null +++ b/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchHandler.java @@ -0,0 +1,16 @@ +package polling_station_dashboard.search.advancedSearch; + +import javafx.event.Event; +import javafx.event.EventHandler; + +/** + * Created by dasha on 7/9/2016. + * AdvancedSearchHandler handles the event that being passed from the polling station dashboard + */ +public class AdvancedSearchHandler implements EventHandler { + + @Override + public void handle(Event event) { + + } +} diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchLoader.java b/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchLoader.java new file mode 100644 index 0000000..686c902 --- /dev/null +++ b/polling-station-gui/src/main/java/polling_station_dashboard/search/advancedSearch/AdvancedSearchLoader.java @@ -0,0 +1,8 @@ +package polling_station_dashboard.search.advancedSearch; + +/** + * Created by dasha on 7/9/2016. + * AdvancedSearchLoader loads the advanced search panel + */ +public class AdvancedSearchLoader { +} diff --git a/polling-station-gui/src/main/resources/view/dashboard/polling_station_dashboard.fxml b/polling-station-gui/src/main/resources/view/dashboard/polling_station_dashboard.fxml index 9e688b0..6d539e5 100644 --- a/polling-station-gui/src/main/resources/view/dashboard/polling_station_dashboard.fxml +++ b/polling-station-gui/src/main/resources/view/dashboard/polling_station_dashboard.fxml @@ -2,6 +2,7 @@ + @@ -24,21 +25,25 @@ - -