From ab7c12b3f6f181a797712f068d388abff92712a0 Mon Sep 17 00:00:00 2001 From: Vladimir ELazar Tokarev Date: Sat, 11 Jun 2016 14:53:57 +0300 Subject: [PATCH] Created the voter edit panel this panel gives the ability to add or eddit existing user --- .../src/pictures/[Originals]/profile.png | Bin 0 -> 18828 bytes voting-station-gui/src/pictures/profile.png | Bin 0 -> 3115 bytes .../StatusLog/fxml/status_log.fxml | 2 +- .../StatusLog/java/StatusLogController.java | 2 +- .../StatusLog/java/StatusLogLoader.java | 2 +- .../StatusLog/java/StatusLogUpdate.java | 2 +- .../PollingStationDashboardController.java | 8 +- .../java/PollingStationDashboardLoader.java | 2 +- .../settings/java/settingsLoader.java | 2 - .../settings/settings.fxml | 2 +- .../voterEdit/fxml/voter_edit.fxml | 165 ++++++++++++++++++ .../voterEdit/java/VoterEditController.java | 7 + .../voterEdit/java/VoterEditLoader.java | 7 + 13 files changed, 189 insertions(+), 12 deletions(-) create mode 100644 voting-station-gui/src/pictures/[Originals]/profile.png create mode 100644 voting-station-gui/src/pictures/profile.png create mode 100644 voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml create mode 100644 voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditController.java create mode 100644 voting-station-gui/src/polling_station_dashboard/voterEdit/java/VoterEditLoader.java diff --git a/voting-station-gui/src/pictures/[Originals]/profile.png b/voting-station-gui/src/pictures/[Originals]/profile.png new file mode 100644 index 0000000000000000000000000000000000000000..79716911300194cb6140afc2148640445423fe17 GIT binary patch literal 18828 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�CSm_B4OHi(MmHlFe|&JjLxEEv3OD#StyqbD2?%(( zcHUa(>T#QaBzRknsN*18jul>jpZv&(J<|pGPsj%dm9*D@>`!DV(Act}>DjI6@onpf zdOx)020OVy=I_->;!M*&7wKKa&*9ULq{@uT8&^Iwjeeb_N7OR?Qt;T9h9aupwBnFV z6&p5;w18hU;rPOxPDy1KSm4~Y0=#uWnNOn~@i-a8jg2Xgif zTD~AmDl3DcBz*9?u5$LPmWzpX1wOU%$R-D0|B>n3f`J(NkzGgkXrLU(URPF+}iy$r|pGhq%%t+?0C^4&>xu96&eJVq7 z#d667?1Jewm8Mym&@nNcp-|^F(aMTg6|$>7Yw?Fc1*8L#Rk-=JxhFcK`n-4$?@}?K>t8g8oc5j%ZI5c7UsP3o~N`=#?N9R6X`t(L=?f<_0oRGu; z??^rB{&?xaTZK~i9Rb7N(z+23R}Gz=xM||}uL4y^Vb9|z`3R&%2qnDkUf|w!sAsV^ zBxtVY>yjBZVclOV4oixkG>t@lw8%}@JL(EaZ@ZxB^p=6xHx=+JOGelwtNu*)*m~ms DG??Vh literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/pictures/profile.png b/voting-station-gui/src/pictures/profile.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac604793bca8e45dd8c676740907792570598cd GIT binary patch literal 3115 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 FV1o3~AbJ1* literal 0 HcmV?d00001 diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml b/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml index 6cdbb56..eb1a5b0 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/fxml/status_log.fxml @@ -7,7 +7,7 @@ - +
diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java index 625e432..aeda2d5 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java @@ -1,4 +1,4 @@ -package polling_station_dashboard.StatusLog.java; +package polling_station_dashboard.statusLog.java; import javafx.fxml.FXML; import javafx.stage.Stage; diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java index 5753f6e..1824bfe 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java @@ -1,4 +1,4 @@ -package polling_station_dashboard.StatusLog.java; +package polling_station_dashboard.statusLog.java; import javafx.fxml.FXMLLoader; import javafx.scene.layout.GridPane; diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java index e032d72..ed977d0 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java @@ -1,4 +1,4 @@ -package polling_station_dashboard.StatusLog.java; +package polling_station_dashboard.statusLog.java; /** * Created by Vladimir Eliezer Tokarev on 04/06/2016. diff --git a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java index 0884fe6..b2cf658 100644 --- a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java +++ b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardController.java @@ -5,7 +5,7 @@ import javafx.scene.control.Button; import javafx.scene.layout.GridPane; import javafx.scene.layout.Pane; import javafx.stage.Stage; -import polling_station_dashboard.StatusLog.java.StatusLogUpdate; +import polling_station_dashboard.statusLog.java.StatusLogUpdate; import polling_station_dashboard.settings.java.SettingsUpdate; /** @@ -58,18 +58,18 @@ public class PollingStationDashboardController implements StatusLogUpdate, Setti } private void addStatusLog() { - Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog"); + Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog"); statusLog.getChildren().add(this.statusLog); } private void removeStatusLog(){ - Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog"); + Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog"); statusLog.getChildren().remove(this.statusLog); } private void SetStatusLogSize(int expansionWidth) { currentStage.setWidth(currentStage.getWidth() + expansionWidth); - Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog"); + Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog"); statusLog.setPrefWidth(expansionWidth); } diff --git a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java index baf782e..ddcb355 100644 --- a/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java +++ b/voting-station-gui/src/polling_station_dashboard/java/PollingStationDashboardLoader.java @@ -4,7 +4,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; -import polling_station_dashboard.StatusLog.java.StatusLogLoader; +import polling_station_dashboard.statusLog.java.StatusLogLoader; import polling_station_dashboard.settings.java.settingsLoader; import java.io.IOException; diff --git a/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java index f5bf59d..d89057f 100644 --- a/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java +++ b/voting-station-gui/src/polling_station_dashboard/settings/java/settingsLoader.java @@ -3,8 +3,6 @@ package polling_station_dashboard.settings.java; import javafx.fxml.FXMLLoader; import javafx.scene.layout.GridPane; import javafx.stage.Stage; -import polling_station_dashboard.StatusLog.java.StatusLogController; -import polling_station_dashboard.StatusLog.java.StatusLogUpdate; import java.io.IOException; diff --git a/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml b/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml index aa6b371..a37f6a2 100644 --- a/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml +++ b/voting-station-gui/src/polling_station_dashboard/settings/settings.fxml @@ -7,7 +7,7 @@ - + diff --git a/voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml b/voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml new file mode 100644 index 0000000..dc42ded --- /dev/null +++ b/voting-station-gui/src/polling_station_dashboard/voterEdit/fxml/voter_edit.fxml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +