From 26e474a486cd45a09227c5aca997f2fdfc903107 Mon Sep 17 00:00:00 2001 From: hendrik Date: Tue, 3 Apr 2018 00:45:22 +0200 Subject: [PATCH] added implementation for the grid button, name + color --- bin/application/Main.class | Bin 3231 -> 3272 bytes bin/application/MainWindow.fxml | 2 +- bin/application/MainWindowController$1.class | Bin 2253 -> 2253 bytes bin/application/MainWindowController.class | Bin 23802 -> 24682 bytes src/application/Main.java | 1 + src/application/MainWindow.fxml | 2 +- src/application/MainWindowController.java | 153 +++++++++++++------ 7 files changed, 109 insertions(+), 49 deletions(-) diff --git a/bin/application/Main.class b/bin/application/Main.class index 2443fb05511abf47e66cd7953b9b78ad78271ae3..72c4856156949dd19191d5bcb7839b90e333cbbf 100644 GIT binary patch delta 448 zcmZ9I%}W$<9L7Jt)tqtsm9l}h9(p+xY0!WrVjhAOw#4WXS(+iEyXe@o1G_sBR?ww` z-egXm>K0m7yH2y4TlV5hYW80AXY>aI(a-kg<$=$`_xteh+>fotjLpA`OTbBf=8Xs1 z0fPi{l1E5Ez2jQRGZ{M>_i{NmozA$GhsU^jpu@<|Bhp&N6ibljGZ2hd$yBIWps*yS}&W*93OM9rwpceAz7sCAJIGa zzv8vVlAvMdx8x0P{X2U5;ecgH9dVsi!ESTdPMhP2o4r;xtHJ`_OV-)&f9YKZ13pN$ zumpO}t&}h*u)HmwC0`cWYVSt&{$>{uHN~ygfU_a@W;pGy*0uFkaP}b`1tz19L#DT# z>X0X83jJk*{%BaDRN`fkchQxQwUEssAI}{N`E)6-602xZdWt=Mmps(d&1E(60Oz?v oAA@*YWr890shh@117b8Q@>HX*d_!C9qsXIdw;q%E0cV*s6Xjx;<&@D%g zThpe@x>v8XHg8JQ%(~{xA8 z6+TJS>1oT>v+?;GhUp~8wIusyvy@3vK#O@ zU@y=9@TGts_k0mmMYF&z>b#WJHqb|c>m<3weQd^XNpV*AO{cX)X%Wg6Gk) - + diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 5b581abe0d59a8664e9d103fffaa27a5df233f86..cc8a62e4bce195934e198c119b780e237122e32a 100644 GIT binary patch delta 35 rcmX>rcvf&jKRaXU{iFOxX+yOj!)dOgRkpOu3U4IMxCHyeA1e delta 35 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 literal 23802 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 bs%}$vsJmz?G}X20ZbTtk#9QhkMWg-?$QWE7 diff --git a/src/application/Main.java b/src/application/Main.java index 4d5a302..c142afd 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -84,6 +84,7 @@ public class Main extends Application dbc.dbname = mwc.getDatabaseName(); // handover database name dbc.connectDatabase(); // estabishing DB conection mwc.fillTablePositionen(); // fill TreeTable 'Positionen' + mwc.loadGridButtons(); } else { // config.xml NOT found, first start of app System.out.println("keine XML gefunden!"); diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 23bc238..738702e 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -358,7 +358,7 @@ - + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index def4089..e439bca 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -279,6 +279,8 @@ public class MainWindowController private String selectedColorName; private String databaseName; + + private boolean lockState = false; @FXML TreeItem rootCurrentJob = new TreeItem<>( @@ -301,7 +303,7 @@ public class MainWindowController Dialog> dialog = new Dialog<>(); dialog.setTitle("Über jFxKasse"); dialog.setHeaderText( - "Informationen und Lizenzen - Version 0.8 - UI Techdemo"); + "Informationen und Lizenzen - Version 0.9 - Techdemo"); dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK); @@ -360,6 +362,7 @@ public class MainWindowController dbc.setColor(idPositionen, getColorCodes(selectedColorName)); fillTablePositionen(); // fill TreeTable 'Positionen' + loadGridButtons(); } @@ -395,7 +398,17 @@ public class MainWindowController @FXML public void btnLockAction(ActionEvent event) { - System.out.println("Button!"); + lockState = !lockState; + + blockUI(lockState); + + + if(lockState) { + btnLock.setText("Kasse entsperren"); + }else { + btnLock.setText("Kasse sperren"); + } + } @FXML @@ -583,8 +596,9 @@ public class MainWindowController System.out.println("initUI"); tftNewDBName.setText(getDatabaseName()); initPositionen(); + + } - private void initPositionen() { @@ -665,39 +679,33 @@ public class MainWindowController }); } - public void setMain(Main main, DBController dbc) { this.main = main; this.dbc = dbc; } - - - public String getSystemDatum() - { + { java.util.Date now = new java.util.Date(); java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat( "dd.MM.yyyy"); String heutigesDatum = sdf.format(now); return heutigesDatum; } - public void saveSettings(String databasename) throws Exception - { //Save settings to config.xml + { // Save settings to config.xml OutputStream outputStream; try { props.setProperty("databasename", databasename); outputStream = new FileOutputStream(filepathXMLLinux); - props.storeToXML(outputStream, "jFxKasse settings"); + props.storeToXML(outputStream, "jFxKasse settings"); outputStream.close(); } catch (IOException e) { } } - public boolean loadSettings() throws Exception { // reads the settings from config.xml @@ -713,21 +721,16 @@ public class MainWindowController return false; } } - - public String getDatabaseName() { return databaseName; } - public void setDatabaseName(String NewDatabaseName) { databaseName = NewDatabaseName; } - - public void setDBLabel() throws Exception { @@ -748,7 +751,6 @@ public class MainWindowController labelDBStatus.setText("Keine Datenbank gefunden!"); } } - private String getColorCodes(String pColorName) { @@ -774,8 +776,6 @@ public class MainWindowController return "#FFFFFF"; } } - - private String getColorNames(String pColorCode) { @@ -801,7 +801,6 @@ public class MainWindowController return "Farbe"; } } - private Integer getColorID(String pColorCode) { @@ -827,7 +826,6 @@ public class MainWindowController return 0; } } - public void blockUI(boolean pState) { @@ -838,32 +836,11 @@ public class MainWindowController btnReprintJob.setDisable(pState); btnSaveEntry.setDisable(pState); btnCancelJob.setDisable(pState); - gridButton01.setDisable(pState); - gridButton02.setDisable(pState); - gridButton03.setDisable(pState); - gridButton04.setDisable(pState); - gridButton05.setDisable(pState); - gridButton06.setDisable(pState); - gridButton07.setDisable(pState); - gridButton08.setDisable(pState); - gridButton09.setDisable(pState); - gridButton10.setDisable(pState); - gridButton11.setDisable(pState); - gridButton12.setDisable(pState); - gridButton13.setDisable(pState); - gridButton14.setDisable(pState); - gridButton15.setDisable(pState); - gridButton16.setDisable(pState); - gridButton17.setDisable(pState); - gridButton18.setDisable(pState); - gridButton19.setDisable(pState); - gridButton20.setDisable(pState); - gridButton21.setDisable(pState); - gridButton22.setDisable(pState); - gridButton23.setDisable(pState); - gridButton24.setDisable(pState); - gridButton25.setDisable(pState); + for(int i = 0; i < 25; i++) { + getButtonByID(i).setDisable(pState); + } + tftNewPosition.setDisable(pState); tftNewValue.setDisable(pState); colorChoise.setDisable(pState); @@ -878,4 +855,86 @@ public class MainWindowController titlePaneStats.setVisible(!pState); } + public void loadGridButtons() + { + + for (int i = 0; i < 25; i++) { + + getButtonByID(i).setText(dbc.getName(i+1)); + getButtonByID(i).setStyle("-fx-background-color: "+ dbc.getColor(i+1) +";"); + + } + + for (int i = 0; i < 25; i++) { + + if(dbc.getName(i+1).equals("Noch frei")) { + getButtonByID(i).setVisible(false); + }else { + getButtonByID(i).setVisible(true); + } + + + } + + + + } + + public Button getButtonByID(int pID) { + switch (pID) { + case 0: + return gridButton01; + case 1: + return gridButton02; + case 2: + return gridButton03; + case 3: + return gridButton04; + case 4: + return gridButton05; + case 5: + return gridButton06; + case 6: + return gridButton07; + case 7: + return gridButton08; + case 8: + return gridButton09; + case 9: + return gridButton10; + case 10: + return gridButton11; + case 11: + return gridButton12; + case 12: + return gridButton13; + case 13: + return gridButton14; + case 14: + return gridButton15; + case 15: + return gridButton16; + case 16: + return gridButton17; + case 17: + return gridButton18; + case 18: + return gridButton19; + case 19: + return gridButton20; + case 20: + return gridButton21; + case 21: + return gridButton22; + case 22: + return gridButton23; + case 23: + return gridButton24; + case 24: + return gridButton25; + default: + return gridButton01; + } + } + }