diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 29be91e..104d634 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -2,6 +2,7 @@ + @@ -10,6 +11,7 @@ + @@ -48,10 +50,10 @@ - + - - + + @@ -90,7 +92,7 @@ - + @@ -197,6 +199,37 @@ + + + + + + + + + + + diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index f690b72..8a325ad 100644 Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 980d1d5..633a89c 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 29be91e..104d634 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -2,6 +2,7 @@ + @@ -10,6 +11,7 @@ + @@ -48,10 +50,10 @@ - + - - + + @@ -90,7 +92,7 @@ - + @@ -197,6 +199,37 @@ + + + + + + + + + + + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index eca24d7..3a2116d 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -50,13 +50,13 @@ public class MainWindowController private AnchorPane mainAnchorpane; @FXML - private TreeTableView mainTreeTable; + private TreeTableView tableCurrentOrder; @FXML - private TreeTableColumn datumSpalte; + private TreeTableColumn columnQuantity; @FXML - private TreeTableColumn kontoSpalte; + private TreeTableColumn columnPosition; @FXML private TreeTableColumn idSpalte = new TreeTableColumn<>( @@ -140,6 +140,24 @@ public class MainWindowController @FXML private Button gridButton25; + @FXML + private Button btnDeleteSelectedPosition; + + @FXML + private Button btnPrintBill; + + @FXML + private Button btnLock; + + @FXML + private Label labelAllPrize; + + @FXML + private Label labelJobCounter; + + @FXML + private Label labelTime; + private Main main; private DBController dbc; @@ -198,6 +216,24 @@ public class MainWindowController dialog.showAndWait(); } + @FXML + public void btnLockAction(ActionEvent event) + { + System.out.println("Button!"); + } + + @FXML + public void btnDeleteSelectedPositionAction(ActionEvent event) + { + System.out.println("Button!"); + } + + @FXML + public void btnPrintBillAction(ActionEvent event) + { + System.out.println("Button!"); + } + @FXML public void gridButton01Action(ActionEvent event) { @@ -365,27 +401,27 @@ public class MainWindowController public void initUI() { - mainTreeTable.setRoot(root); - mainTreeTable.setShowRoot(false); - mainTreeTable.setEditable(false); + tableCurrentOrder.setRoot(root); + tableCurrentOrder.setShowRoot(false); + tableCurrentOrder.setEditable(false); // Setzt die Textfelder idSpalte.setCellValueFactory( cellData -> cellData.getValue().getValue().idProperty().asObject()); - datumSpalte.setCellValueFactory( + columnQuantity.setCellValueFactory( cellData -> cellData.getValue().getValue().datumProperty()); - kontoSpalte.setCellValueFactory( + columnPosition.setCellValueFactory( cellData -> cellData.getValue().getValue().kontoProperty()); - mainTreeTable.getColumns().add(idSpalte); - mainTreeTable.getColumns().get(2).setVisible(false); - mainTreeTable.getSelectionModel().selectedItemProperty() + tableCurrentOrder.getColumns().add(idSpalte); + tableCurrentOrder.getColumns().get(2).setVisible(false); + tableCurrentOrder.getSelectionModel().selectedItemProperty() .addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, Object oldVal, Object newVal) { // last = selected; //for auto-play - int selected = mainTreeTable.getSelectionModel() + int selected = tableCurrentOrder.getSelectionModel() .getSelectedIndex(); // get selected item id = idSpalte.getCellData(selected); // Ausgewählte Spalte showPasswort = false;