diff --git a/bin/application/Main.class b/bin/application/Main.class index aa3bcae..7e0b408 100644 Binary files a/bin/application/Main.class and b/bin/application/Main.class differ diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 8ac5848..96fcfd8 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -5,6 +5,7 @@ + @@ -14,230 +15,268 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 8a325ad..a3bbdb6 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 633a89c..8c288dd 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/src/application/Main.java b/src/application/Main.java index 67a50a8..cde511a 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -42,6 +42,7 @@ public class Main extends Application { this.primaryStage = primaryStage; mainWindow(); + //this.primaryStage.setResizable(false); } private void mainWindow() @@ -52,8 +53,8 @@ public class Main extends Application AnchorPane pane = loader.load(); // Test //Test - // primaryStage.setWidth(1536); - // primaryStage.setHeight(864); + primaryStage.setWidth(1366); + primaryStage.setHeight(732); primaryStage.setTitle("jFxKasse"); // Title der Stage mwc = loader.getController(); @@ -82,6 +83,7 @@ public class Main extends Application private void firstStart() throws Exception { + if (mwc.loadSettings()) { // Wenn XML gefunden dbc.verbindeDatenbank(); // Verbindet mit der Datenbank-Datei diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 984e6e6..96fcfd8 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -15,263 +15,268 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 3a2116d..1f56096 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -13,6 +13,7 @@ import javafx.scene.control.TreeTableColumn; import javafx.scene.control.TreeTableView; import javafx.scene.control.TextField; import javafx.scene.control.TreeItem; +import javafx.scene.control.TitledPane; import java.awt.Desktop; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -59,7 +60,29 @@ public class MainWindowController private TreeTableColumn columnPosition; @FXML - private TreeTableColumn idSpalte = new TreeTableColumn<>( + private TreeTableColumn idSpalte01 = new TreeTableColumn<>( + ""); + + @FXML + private TreeTableView jobsTreeTable; + + @FXML + private TreeTableColumn columnValue; + + @FXML + private TreeTableColumn columnState; + + @FXML + private TreeTableColumn columnPositions; + + @FXML + private TreeTableColumn columnTime; + + @FXML + private TreeTableColumn columnNumber; + + @FXML + private TreeTableColumn idSpalte02 = new TreeTableColumn<>( ""); @FXML @@ -149,6 +172,15 @@ public class MainWindowController @FXML private Button btnLock; + @FXML + private Button btnReprintJob; + + @FXML + private Button bntCancelJob; + + @FXML + private Button btnCalcStats; + @FXML private Label labelAllPrize; @@ -158,25 +190,28 @@ public class MainWindowController @FXML private Label labelTime; + @FXML + private Label lableJobCount; + + @FXML + private Label labelAvgJob; + + @FXML + private Label lableAllValue; + + @FXML + private TitledPane titlePaneStats; + private Main main; private DBController dbc; - private String filepathXMLWin = "C:/ProgramData/PWMaster/config.xml"; // Pfad - // wo - // die - // XML - // liegt + // Pfad wo die XML liegt + private String filepathXMLWin = "C:/ProgramData/PWMaster/config.xml"; private String filepathXMLLinux = System.getProperty("user.home") + "/bin/PWMaster/config.xml"; // Pfad wo die XML liegt - private boolean showPasswort = false; - - private String schluessel; - - private String base32Secret; - private int id; @FXML @@ -216,6 +251,24 @@ public class MainWindowController dialog.showAndWait(); } + @FXML + public void btnCalcStatsAction(ActionEvent event) + { + System.out.println("Button!"); + } + + @FXML + public void btnReprintJobAction(ActionEvent event) + { + System.out.println("Button!"); + } + + @FXML + public void bntCancelJobAction(ActionEvent event) + { + System.out.println("Button!"); + } + @FXML public void btnLockAction(ActionEvent event) { @@ -389,7 +442,7 @@ public class MainWindowController public void fuelleTablle() { // Lädt die Datenbank in die Tabelle - dbc.setSchluessel(schluessel); + //dbc.setSchluessel(schluessel); for (int i = 0; i < dbc.ladeTabelle().size(); i++) { tableData helpTableData = new tableData( dbc.ladeTabelle().get(i).getID(), @@ -406,13 +459,13 @@ public class MainWindowController tableCurrentOrder.setEditable(false); // Setzt die Textfelder - idSpalte.setCellValueFactory( + idSpalte01.setCellValueFactory( cellData -> cellData.getValue().getValue().idProperty().asObject()); columnQuantity.setCellValueFactory( cellData -> cellData.getValue().getValue().datumProperty()); columnPosition.setCellValueFactory( cellData -> cellData.getValue().getValue().kontoProperty()); - tableCurrentOrder.getColumns().add(idSpalte); + tableCurrentOrder.getColumns().add(idSpalte01); tableCurrentOrder.getColumns().get(2).setVisible(false); tableCurrentOrder.getSelectionModel().selectedItemProperty() .addListener(new ChangeListener() { @@ -423,8 +476,8 @@ public class MainWindowController // last = selected; //for auto-play int selected = tableCurrentOrder.getSelectionModel() .getSelectedIndex(); // get selected item - id = idSpalte.getCellData(selected); // Ausgewählte Spalte - showPasswort = false; + id = idSpalte01.getCellData(selected); // Ausgewählte Spalte + try { // Setzt den entschlüsselten Inhalt in die Textfelder // tf01.setText("Verschlüsseltes Passwort von " + @@ -501,10 +554,7 @@ public class MainWindowController } } - public String getSchluesselXML() - { // Gibt den Schlüssel zurück für die Main - return schluessel; - } + public void starteDB() { // Startet die Datenbank @@ -517,8 +567,4 @@ public class MainWindowController dbc.verbindeDatenbank(); } - public String getbase32Secret() - { // Gibt den base32Secret zurück für die Main - return base32Secret; - } }