diff --git a/.gitignore b/.gitignore index 2f7896d..8b8c81d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ target/ +dependency-reduced-pom.xml diff --git a/.vscode/eclipse-formatter.xml b/.vscode/eclipse-formatter.xml new file mode 100644 index 0000000..f57441a --- /dev/null +++ b/.vscode/eclipse-formatter.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vscode/settings.json b/.vscode/settings.json index 30ac6c3..53b3455 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,12 @@ "java.configuration.updateBuildConfiguration": "automatic", "java.compile.nullAnalysis.mode": "automatic", "editor.formatOnSave": true, - "files.encoding": "utf8" + "files.encoding": "utf8", + + // Java formatter: point to workspace-local Eclipse formatter profile + "java.format.settings.url": ".vscode/eclipse-formatter.xml", + "java.format.settings.profile": "jFxKasse", + "[java]": { + "editor.defaultFormatter": "redhat.java" + } } \ No newline at end of file diff --git a/src/main/java/com/jFxKasse/application/JavaFX11Main.java b/src/main/java/com/jFxKasse/application/JavaFX11Main.java index 57af2b3..7c6bdca 100644 --- a/src/main/java/com/jFxKasse/application/JavaFX11Main.java +++ b/src/main/java/com/jFxKasse/application/JavaFX11Main.java @@ -2,11 +2,9 @@ package com.jFxKasse.application; import com.jFxKasse.application.Main; -public class JavaFX11Main -{ +public class JavaFX11Main { - public static void main(String[] args) - { - Main.main(args); + public static void main(String[] args) { + Main.main(args); } } diff --git a/src/main/java/com/jFxKasse/application/Main.java b/src/main/java/com/jFxKasse/application/Main.java index 4f609e5..dc25953 100644 --- a/src/main/java/com/jFxKasse/application/Main.java +++ b/src/main/java/com/jFxKasse/application/Main.java @@ -53,8 +53,7 @@ public class Main extends Application { private void mainWindow() { try { - FXMLLoader loader = new FXMLLoader( - getClass().getResource("/fxml/MainWindow.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MainWindow.fxml")); AnchorPane pane = loader.load(); primaryStage.setTitle("jFxKasse"); // Window title @@ -66,21 +65,20 @@ public class Main extends Application { firstStart(); // Check if this is the first run Scene scene = new Scene(pane); - scene.getStylesheets().add( - Main.class.getResource("/css/application.css").toExternalForm()); + scene.getStylesheets().add(Main.class.getResource("/css/application.css").toExternalForm()); primaryStage.setScene(scene); primaryStage.show(); // Show the stage // Attach the KeyController kc = new KeyController(scene, mwc); - Timeline timeline = new Timeline( - new KeyFrame(Duration.seconds(1), ev -> { - mwc.updateTimeLabel(); // Update time label on UI - })); + Timeline timeline = new Timeline(new KeyFrame(Duration.seconds(1), ev -> { + mwc.updateTimeLabel(); // Update time label on UI + })); timeline.setCycleCount(Animation.INDEFINITE); timeline.play(); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); } } @@ -89,7 +87,8 @@ public class Main extends Application { if (osName.contains("Windows")) { System.out.println("FCK Windows"); filepath = userHome + "/Documents/jFxKasse/"; - } else { + } + else { filepath = userHome + "/jFxKasse/"; } launch(args); @@ -107,13 +106,13 @@ public class Main extends Application { dbc.setDbname(xmlc.getDatabaseName()); // Pass database name try { dbc.connectDatabase(); // Establish DB connection - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); - showErrorDialog("Datenbankfehler", - "Die Datenbank konnte nicht geöffnet werden.", + showErrorDialog("Datenbankfehler", "Die Datenbank konnte nicht geöffnet werden.", "Datei: " + xmlc.getDatabaseName() + ".db\n\n" - + "Bitte prüfen Sie, ob die Datei vorhanden und nicht beschädigt ist.\n" - + "Fehlermeldung: " + e.getMessage()); + + "Bitte prüfen Sie, ob die Datei vorhanden und nicht beschädigt ist.\n" + + "Fehlermeldung: " + e.getMessage()); return; } mwc.fillTablePositionen(); // Fill TreeTable 'Positions' @@ -123,7 +122,8 @@ public class Main extends Application { mwc.loadGridButtons(); mwc.getSelectedCat(); // Load DB entries in ChoiceBox mwc.createNewJob(); - } else { + } + else { // config.xml NOT found — first start of app System.out.println("no XML found!"); xmlc.initXML(); // Set default values in memory @@ -132,23 +132,21 @@ public class Main extends Application { try { xmlc.saveSettings(); // Persist defaults immediately so next start is normal System.out.println("Default config.xml written."); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); - showErrorDialog("Konfigurationsfehler", - "Die Konfigurationsdatei konnte nicht geschrieben werden.", - "Pfad: " + filepath + "config.xml\n\n" - + "Bitte prüfen Sie die Schreibrechte.\n" - + "Fehlermeldung: " + e.getMessage()); + showErrorDialog("Konfigurationsfehler", "Die Konfigurationsdatei konnte nicht geschrieben werden.", + "Pfad: " + filepath + "config.xml\n\n" + "Bitte prüfen Sie die Schreibrechte.\n" + + "Fehlermeldung: " + e.getMessage()); } mwc.blockUI(true); // Disable UI elements that need a DB - mwc.blockUnlock(); // Show first-start hint, disable lock button + mwc.blockUnlock(); // Show first-start hint, disable lock button } } /** Shows a modal error alert dialog on the JavaFX thread. */ private void showErrorDialog(String title, String header, String content) { - javafx.scene.control.Alert alert = new javafx.scene.control.Alert( - javafx.scene.control.Alert.AlertType.ERROR); + javafx.scene.control.Alert alert = new javafx.scene.control.Alert(javafx.scene.control.Alert.AlertType.ERROR); alert.setTitle(title); alert.setHeaderText(header); alert.setContentText(content); diff --git a/src/main/java/com/jFxKasse/application/PrintJob.java b/src/main/java/com/jFxKasse/application/PrintJob.java index 67acf5d..2fa792a 100644 --- a/src/main/java/com/jFxKasse/application/PrintJob.java +++ b/src/main/java/com/jFxKasse/application/PrintJob.java @@ -20,19 +20,16 @@ public class PrintJob { private TimeDate timedate = new TimeDate(); - public void printJob(int jobID, XMLController xmlc, DBController dbc, - PrinterController pc) { + public void printJob(int jobID, XMLController xmlc, DBController dbc, PrinterController pc) { - if ((xmlc.getPrintername().equals("Drucker auswählen") - || xmlc.getPrintername() == null)) { + if ((xmlc.getPrintername().equals("Drucker auswählen") || xmlc.getPrintername() == null)) { // No printer selected System.out.println("No printer configured!"); // creates a dialog Dialog> dialog = new Dialog<>(); dialog.setTitle("Kein Drucker"); - dialog.setHeaderText("Es ist kein Drucker einestellt.\n" - + "In den Einstellungen einen Drucker auswählen."); + dialog.setHeaderText("Es ist kein Drucker einestellt.\n" + "In den Einstellungen einen Drucker auswählen."); dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK); @@ -41,30 +38,29 @@ public class PrintJob { grid.setVgap(10); grid.setPadding(new Insets(20, 150, 10, 10)); - grid.add(new Label("Tipp:\n" - + "Es kann ein virtueller Drucker installiert werden: \n\n" - + "www.cups-pdf.de"), 0, 0); + grid.add( + new Label( + "Tipp:\n" + "Es kann ein virtueller Drucker installiert werden: \n\n" + "www.cups-pdf.de"), + 0, 0); dialog.getDialogPane().setContent(grid); dialog.setResizable(true); dialog.showAndWait(); - } else { + } + else { // Printer selected pc.selectPrinter(xmlc.getPrintername()); /* Single bill or split by category */ if (xmlc.getCategorySplitted()) { // Split the bills - PrintDataSplitted pdsplitted = new PrintDataSplitted( - xmlc.getLinebreak(), xmlc.getOffsetHeader(), - xmlc.getOffsetFooter(), - timedate.getSystemTime() + " " + timedate.getSystemDate(), + PrintDataSplitted pdsplitted = new PrintDataSplitted(xmlc.getLinebreak(), xmlc.getOffsetHeader(), + xmlc.getOffsetFooter(), timedate.getSystemTime() + " " + timedate.getSystemDate(), xmlc.getHeader(), xmlc.getFooter()); - pdsplitted.setData(Integer.toString(jobID), dbc.getTime_Job(jobID), - dbc.getQuantity_Job(jobID), dbc.getName_Job(jobID), - dbc.getValue_Job(jobID), dbc.getCategory_Job(jobID), + pdsplitted.setData(Integer.toString(jobID), dbc.getTime_Job(jobID), dbc.getQuantity_Job(jobID), + dbc.getName_Job(jobID), dbc.getValue_Job(jobID), dbc.getCategory_Job(jobID), dbc.getJobValue_Job(jobID)); System.out.println("Printing job ..."); @@ -75,16 +71,15 @@ public class PrintJob { pc.printString(printString.get(i)); } - } else { + } + else { // Single bill - PrintDataSimple pds = new PrintDataSimple(xmlc.getLinebreak(), - xmlc.getOffsetHeader(), xmlc.getOffsetFooter(), - timedate.getSystemTime() + " " + timedate.getSystemDate(), + PrintDataSimple pds = new PrintDataSimple(xmlc.getLinebreak(), xmlc.getOffsetHeader(), + xmlc.getOffsetFooter(), timedate.getSystemTime() + " " + timedate.getSystemDate(), xmlc.getHeader(), xmlc.getFooter()); - pds.setData(Integer.toString(jobID), dbc.getTime_Job(jobID), - dbc.getQuantity_Job(jobID), dbc.getName_Job(jobID), - dbc.getValue_Job(jobID), dbc.getCategory_Job(jobID), + pds.setData(Integer.toString(jobID), dbc.getTime_Job(jobID), dbc.getQuantity_Job(jobID), + dbc.getName_Job(jobID), dbc.getValue_Job(jobID), dbc.getCategory_Job(jobID), dbc.getJobValue_Job(jobID)); System.out.println("Printing job ..."); pc.printString(pds.getPrintString()); diff --git a/src/main/java/com/jFxKasse/application/TimeDate.java b/src/main/java/com/jFxKasse/application/TimeDate.java index 4aa49bc..ac488de 100644 --- a/src/main/java/com/jFxKasse/application/TimeDate.java +++ b/src/main/java/com/jFxKasse/application/TimeDate.java @@ -4,18 +4,15 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -public class TimeDate -{ - public String getSystemTime() - { +public class TimeDate { + public String getSystemTime() { DateFormat dateFormat = new SimpleDateFormat("HH:mm"); Date date = new Date(); String time = dateFormat.format(date); return time; } - public String getSystemDate() - { + public String getSystemDate() { DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy"); Date date = new Date(); String dateStr = dateFormat.format(date); diff --git a/src/main/java/com/jFxKasse/controller/DBController.java b/src/main/java/com/jFxKasse/controller/DBController.java index ac0c521..e7a0ffc 100644 --- a/src/main/java/com/jFxKasse/controller/DBController.java +++ b/src/main/java/com/jFxKasse/controller/DBController.java @@ -20,9 +20,9 @@ public class DBController { public void main() { try { - connection = DriverManager - .getConnection("jdbc:sqlite:" + DB_PATH + dbname + ".db"); - } catch (SQLException e) { + connection = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH + dbname + ".db"); + } + catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -41,11 +41,11 @@ public class DBController { try { if (connection != null) return; - connection = DriverManager - .getConnection("jdbc:sqlite:" + DB_PATH + dbname + ".db"); + connection = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH + dbname + ".db"); if (!connection.isClosed()) System.out.println("DB connection established"); - } catch (SQLException e) { + } + catch (SQLException e) { throw new RuntimeException(e); } Runtime.getRuntime().addShutdownHook(new Thread() { @@ -56,7 +56,8 @@ public class DBController { if (connection.isClosed()) System.out.println(); } - } catch (SQLException e) { + } + catch (SQLException e) { e.printStackTrace(); } } @@ -67,7 +68,8 @@ public class DBController { File varTmpDir = new File(pPfad); if (!varTmpDir.exists()) { return false; - } else { + } + else { return true; } } @@ -76,10 +78,10 @@ public class DBController { int catInPos = 0; try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT posid, cat FROM positionen " - + "WHERE posid = " + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT posid, cat FROM positionen " + "WHERE posid = " + pID + ";"); catInPos = rs.getInt("cat"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); @@ -89,10 +91,11 @@ public class DBController { } try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery("SELECT catid, catname FROM category " - + "WHERE catid = " + catInPos + ";"); + ResultSet rs = stmt + .executeQuery("SELECT catid, catname FROM category " + "WHERE catid = " + catInPos + ";"); return rs.getString("catname"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "keine Kategorie"; @@ -106,26 +109,25 @@ public class DBController { try { Statement stmt = connection.createStatement(); stmt.executeUpdate("DROP TABLE IF EXISTS positionen;"); - stmt.executeUpdate( - "CREATE TABLE positionen (posid, name, value, cat, color);"); - } catch (SQLException e) { + stmt.executeUpdate("CREATE TABLE positionen (posid, name, value, cat, color);"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } // Create 25 demo/default data entries for (int i = 0; i < 25; i++) { - fillPositionen_Positionen(i + 1, "Noch frei", (float) 0.00, 6, - "#ad0000"); + fillPositionen_Positionen(i + 1, "Noch frei", (float) 0.00, 6, "#ad0000"); } } - public void fillPositionen_Positionen(int pID, String pName, float pValue, - int pCat, String pColor) { // Create new entry in table + public void fillPositionen_Positionen(int pID, String pName, float pValue, int pCat, String pColor) { // Create new + // entry in + // table System.out.println("Creating new positionen entry"); try { - PreparedStatement ps = connection.prepareStatement( - "INSERT INTO positionen VALUES (?, ?, ?, ?, ?);"); + PreparedStatement ps = connection.prepareStatement("INSERT INTO positionen VALUES (?, ?, ?, ?, ?);"); ps.setInt(1, pID); // primary ps.setString(2, pName); ps.setFloat(3, pValue); @@ -136,7 +138,8 @@ public class DBController { connection.setAutoCommit(false); ps.executeBatch(); // SQL execution connection.setAutoCommit(true); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -145,10 +148,10 @@ public class DBController { public String getName_Positionen(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT posid, name FROM positionen WHERE posid = " + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT posid, name FROM positionen WHERE posid = " + pID + ";"); return rs.getString("name"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "Error 404"; @@ -158,11 +161,10 @@ public class DBController { public String getValue_Positionen(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT posid, value FROM positionen WHERE posid = " + pID - + ";"); + ResultSet rs = stmt.executeQuery("SELECT posid, value FROM positionen WHERE posid = " + pID + ";"); return rs.getString("value"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "Error 404"; @@ -172,11 +174,11 @@ public class DBController { public int getCat_Positionen(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT catid, cat FROM positionen WHERE catid = " + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT catid, cat FROM positionen WHERE catid = " + pID + ";"); System.out.println("getCarTet: " + rs.getInt("cat")); return rs.getInt("cat"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return 0; @@ -186,11 +188,10 @@ public class DBController { public String getColor_Positionen(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT posid, color FROM positionen WHERE posid = " + pID - + ";"); + ResultSet rs = stmt.executeQuery("SELECT posid, color FROM positionen WHERE posid = " + pID + ";"); return rs.getString("color"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "Error 404"; @@ -200,9 +201,9 @@ public class DBController { public void setName_Positionen(int pID, String pName) { try { Statement stmt = connection.createStatement(); - stmt.executeUpdate("UPDATE positionen SET name = '" + pName - + "'WHERE posid =" + pID + ";"); - } catch (SQLException e) { + stmt.executeUpdate("UPDATE positionen SET name = '" + pName + "'WHERE posid =" + pID + ";"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -211,9 +212,9 @@ public class DBController { public void setValue_Positionen(int pID, String pValue) { try { Statement stmt = connection.createStatement(); - stmt.executeUpdate("UPDATE positionen SET value = '" + pValue - + "'WHERE posid =" + pID + ";"); - } catch (SQLException e) { + stmt.executeUpdate("UPDATE positionen SET value = '" + pValue + "'WHERE posid =" + pID + ";"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -222,9 +223,9 @@ public class DBController { public void setCat_Positionen(int pID, int pCat) { try { Statement stmt = connection.createStatement(); - stmt.executeUpdate("UPDATE positionen SET cat = '" + pCat - + "'WHERE posid =" + pID + ";"); - } catch (SQLException e) { + stmt.executeUpdate("UPDATE positionen SET cat = '" + pCat + "'WHERE posid =" + pID + ";"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -233,9 +234,9 @@ public class DBController { public void setColor_Positionen(int pID, String pColor) { try { Statement stmt = connection.createStatement(); - stmt.executeUpdate("UPDATE positionen SET color = '" + pColor - + "'WHERE posid =" + pID + ";"); - } catch (SQLException e) { + stmt.executeUpdate("UPDATE positionen SET color = '" + pColor + "'WHERE posid =" + pID + ";"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -248,15 +249,16 @@ public class DBController { ResultSet rs = stmt.executeQuery("SELECT * FROM positionen;"); while (rs.next()) { try { - daten.add(new tableDataPositionen(rs.getInt("posid"), - rs.getString("name"), rs.getString("value"), + daten.add(new tableDataPositionen(rs.getInt("posid"), rs.getString("name"), rs.getString("value"), rs.getString("cat"), rs.getString("color"))); - } catch (Exception e) { + } + catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } } - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -276,7 +278,8 @@ public class DBController { System.out.println(" "); } - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -289,7 +292,8 @@ public class DBController { Statement stmt = connection.createStatement(); stmt.executeUpdate("DROP TABLE IF EXISTS category;"); stmt.executeUpdate("CREATE TABLE category (catid, catname);"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -305,9 +309,9 @@ public class DBController { public void setName_Category(int pID, String pName) { try { Statement stmt = connection.createStatement(); - stmt.executeUpdate("UPDATE category SET catname = '" + pName - + "'WHERE catid =" + pID + ";"); - } catch (SQLException e) { + stmt.executeUpdate("UPDATE category SET catname = '" + pName + "'WHERE catid =" + pID + ";"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -317,15 +321,15 @@ public class DBController { System.out.println("Creating new category entry"); try { - PreparedStatement ps = connection - .prepareStatement("INSERT INTO category VALUES (?, ?);"); + PreparedStatement ps = connection.prepareStatement("INSERT INTO category VALUES (?, ?);"); ps.setInt(1, pID); // primary ps.setString(2, pName); ps.addBatch(); connection.setAutoCommit(false); ps.executeBatch(); // SQL execution connection.setAutoCommit(true); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -335,11 +339,10 @@ public class DBController { public String getName_Category(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT catid, catname FROM category WHERE catid = " + pID - + ";"); + ResultSet rs = stmt.executeQuery("SELECT catid, catname FROM category WHERE catid = " + pID + ";"); return rs.getString("catname"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "Error 404"; @@ -354,7 +357,8 @@ public class DBController { stmt.executeUpdate("DROP TABLE IF EXISTS jobs;"); stmt.executeUpdate( "CREATE TABLE jobs (jobid, time, positionen_quantity, positionen_name, positionen_value, positionen_cat, state, jobvalue);"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -363,10 +367,10 @@ public class DBController { public int getLatestJobNumber_Job() { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid from jobs ORDER BY jobid DESC LIMIT 1;"); + ResultSet rs = stmt.executeQuery("SELECT jobid from jobs ORDER BY jobid DESC LIMIT 1;"); return rs.getInt("jobid"); - } catch (SQLException e) { + } + catch (SQLException e) { // System.err.println("Couldn't handle DB-Query"); // e.printStackTrace(); @@ -377,10 +381,10 @@ public class DBController { public String getTime_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, time FROM jobs WHERE jobid = " + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, time FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("time"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -390,11 +394,10 @@ public class DBController { public String getQuantity_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, positionen_quantity FROM jobs WHERE jobid = " - + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, positionen_quantity FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("positionen_quantity"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -404,11 +407,10 @@ public class DBController { public String getName_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, positionen_name FROM jobs WHERE jobid = " + pID - + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, positionen_name FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("positionen_name"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -418,11 +420,10 @@ public class DBController { public String getValue_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, positionen_value FROM jobs WHERE jobid = " + pID - + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, positionen_value FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("positionen_value"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -432,11 +433,10 @@ public class DBController { public String getCategory_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, positionen_cat FROM jobs WHERE jobid = " + pID - + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, positionen_cat FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("positionen_cat"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -446,10 +446,10 @@ public class DBController { public String getState_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, state FROM jobs WHERE jobid = " + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, state FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("state"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -459,10 +459,10 @@ public class DBController { public String getJobValue_Job(int pID) { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT jobid, jobvalue FROM jobs WHERE jobid = " + pID + ";"); + ResultSet rs = stmt.executeQuery("SELECT jobid, jobvalue FROM jobs WHERE jobid = " + pID + ";"); return rs.getString("jobvalue"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "404"; @@ -472,11 +472,12 @@ public class DBController { public String getAllJobValue_Job() { try { Statement stmt = connection.createStatement(); - ResultSet rs = stmt.executeQuery( - "SELECT state, jobvalue, SUM(jobvalue) AS ALLVALUE FROM jobs WHERE state = " - + '"' + "verbucht" + '"' + ";"); + ResultSet rs = stmt + .executeQuery("SELECT state, jobvalue, SUM(jobvalue) AS ALLVALUE FROM jobs WHERE state = " + '"' + + "verbucht" + '"' + ";"); return rs.getString("ALLVALUE"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "0"; @@ -487,10 +488,10 @@ public class DBController { try { Statement stmt = connection.createStatement(); ResultSet rs = stmt.executeQuery( - "SELECT count(*) AS JOBCOUNT FROM jobs WHERE state = " + '"' - + "verbucht" + '"' + ";"); + "SELECT count(*) AS JOBCOUNT FROM jobs WHERE state = " + '"' + "verbucht" + '"' + ";"); return rs.getString("JOBCOUNT"); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); return "0"; @@ -500,9 +501,9 @@ public class DBController { public void setStatus_Jobs(int pID, String pStatus) { try { Statement stmt = connection.createStatement(); - stmt.executeUpdate("UPDATE jobs SET state = '" + pStatus - + "'WHERE jobid =" + pID + ";"); - } catch (SQLException e) { + stmt.executeUpdate("UPDATE jobs SET state = '" + pStatus + "'WHERE jobid =" + pID + ";"); + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } @@ -520,30 +521,29 @@ public class DBController { String tablePosition = rs.getString("positionen_name"); - tableDataJob data = new tableDataJob(rs.getInt("jobid"), - rs.getString("time"), tablePosition, rs.getString("state"), - rs.getString("jobvalue")); + tableDataJob data = new tableDataJob(rs.getInt("jobid"), rs.getString("time"), tablePosition, + rs.getString("state"), rs.getString("jobvalue")); tmp.add(data); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } } - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } return tmp; } - public void fillJobs_Jobs(int pID, String pTime, String pPositionen_quantity, - String pPositionen_name, String pPositionen_value, - String pPositionen_cat, String pState, String pJobvalue) { + public void fillJobs_Jobs(int pID, String pTime, String pPositionen_quantity, String pPositionen_name, + String pPositionen_value, String pPositionen_cat, String pState, String pJobvalue) { System.out.println("Creating new job entry"); try { - PreparedStatement ps = connection.prepareStatement( - "INSERT INTO jobs VALUES (?, ?, ?, ?, ?, ?, ?, ?);"); + PreparedStatement ps = connection.prepareStatement("INSERT INTO jobs VALUES (?, ?, ?, ?, ?, ?, ?, ?);"); ps.setInt(1, pID); // primary ps.setString(2, pTime); ps.setString(3, pPositionen_quantity); @@ -556,7 +556,8 @@ public class DBController { connection.setAutoCommit(false); ps.executeBatch(); // SQL execution connection.setAutoCommit(true); - } catch (SQLException e) { + } + catch (SQLException e) { System.err.println("Couldn't handle DB-Query"); e.printStackTrace(); } diff --git a/src/main/java/com/jFxKasse/controller/KeyController.java b/src/main/java/com/jFxKasse/controller/KeyController.java index 6fc67c6..6dfd8ca 100644 --- a/src/main/java/com/jFxKasse/controller/KeyController.java +++ b/src/main/java/com/jFxKasse/controller/KeyController.java @@ -5,18 +5,15 @@ import javafx.scene.Scene; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; -public class KeyController -{ +public class KeyController { private MainWindowController mwc; - public KeyController(Scene scene, MainWindowController mwc) - { + public KeyController(Scene scene, MainWindowController mwc) { this.mwc = mwc; scene.setOnKeyPressed(new EventHandler() { @Override - public void handle(KeyEvent keyEvent) - { + public void handle(KeyEvent keyEvent) { switch (mwc.getActiveTab()) { case 0: handleTabNewJob(keyEvent); @@ -42,10 +39,8 @@ public class KeyController } - private void handleTabNewJob(KeyEvent key) - { - if ((key.getCode() == KeyCode.ENTER) - && (!mwc.btnPrintBill.isDisabled())) { + private void handleTabNewJob(KeyEvent key) { + if ((key.getCode() == KeyCode.ENTER) && (!mwc.btnPrintBill.isDisabled())) { mwc.btnPrintBillAction(null); } @@ -53,8 +48,7 @@ public class KeyController mwc.btnLockAction(null); } - if ((key.getCode() == KeyCode.DELETE) - && (!mwc.btnDeleteSelectedPosition.isDisabled())) { + if ((key.getCode() == KeyCode.DELETE) && (!mwc.btnDeleteSelectedPosition.isDisabled())) { mwc.btnDeleteSelectedPositionAction(null); } @@ -62,15 +56,12 @@ public class KeyController } - private void handleTabJobs(KeyEvent key) - { - if ((key.getCode() == KeyCode.ENTER) - && (!mwc.btnReprintJob.isDisabled())) { + private void handleTabJobs(KeyEvent key) { + if ((key.getCode() == KeyCode.ENTER) && (!mwc.btnReprintJob.isDisabled())) { mwc.btnReprintJobAction(null); } - if ((key.getCode() == KeyCode.DELETE) - && (!mwc.btnCancelJob.isDisabled())) { + if ((key.getCode() == KeyCode.DELETE) && (!mwc.btnCancelJob.isDisabled())) { mwc.btnCancelJobAction(null); } @@ -79,23 +70,18 @@ public class KeyController } } - private void handleTabPosEdit(KeyEvent key) - { - if ((key.getCode() == KeyCode.ENTER) - && (!mwc.btnSaveEntry.isDisabled())) { + private void handleTabPosEdit(KeyEvent key) { + if ((key.getCode() == KeyCode.ENTER) && (!mwc.btnSaveEntry.isDisabled())) { mwc.btnSaveEntryAction(null); } - if ((key.getCode() == KeyCode.DELETE) - && (!mwc.btnClearEntry.isDisabled())) { + if ((key.getCode() == KeyCode.DELETE) && (!mwc.btnClearEntry.isDisabled())) { mwc.btnClearEntryAction(null); } } - private void handleTabSettings(KeyEvent key) - { - if ((key.getCode() == KeyCode.ENTER) - && (!mwc.btnSavePrinter.isDisabled())) { + private void handleTabSettings(KeyEvent key) { + if ((key.getCode() == KeyCode.ENTER) && (!mwc.btnSavePrinter.isDisabled())) { mwc.btnSavePrinterAction(null); } @@ -103,18 +89,17 @@ public class KeyController mwc.btnSaveCatAction(null); } - if ((key.getCode() == KeyCode.ENTER) - && (!mwc.btnCreateNewDatabase.isDisabled())) { + if ((key.getCode() == KeyCode.ENTER) && (!mwc.btnCreateNewDatabase.isDisabled())) { try { mwc.btnCreateNewDatabaseAction(null); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); } } } - void handelGridButtons(KeyEvent key) - { + void handelGridButtons(KeyEvent key) { switch (key.getCode()) { case Q: diff --git a/src/main/java/com/jFxKasse/controller/MainWindowController.java b/src/main/java/com/jFxKasse/controller/MainWindowController.java index 65db077..7472352 100644 --- a/src/main/java/com/jFxKasse/controller/MainWindowController.java +++ b/src/main/java/com/jFxKasse/controller/MainWindowController.java @@ -68,8 +68,7 @@ public class MainWindowController { private TreeTableColumn columnPosition; @FXML - private TreeTableColumn idSpalte01 = new TreeTableColumn<>( - "tableCurrentOrder"); + private TreeTableColumn idSpalte01 = new TreeTableColumn<>("tableCurrentOrder"); @FXML private TreeTableView jobsTreeTable; @@ -90,8 +89,7 @@ public class MainWindowController { private TreeTableColumn columnJobNumber; @FXML - private TreeTableColumn idSpalte02 = new TreeTableColumn<>( - "jobsTreeTable"); + private TreeTableColumn idSpalte02 = new TreeTableColumn<>("jobsTreeTable"); @FXML private TreeTableView entryTreeTable; @@ -372,16 +370,13 @@ public class MainWindowController { private int selectedJobId; @FXML - TreeItem rootCurrentJob = new TreeItem<>( - new tableDataCurrentOrder("0", 0)); + TreeItem rootCurrentJob = new TreeItem<>(new tableDataCurrentOrder("0", 0)); @FXML - TreeItem rootJobs = new TreeItem<>( - new tableDataJob(0, "0", "0", "0", "0")); + TreeItem rootJobs = new TreeItem<>(new tableDataJob(0, "0", "0", "0", "0")); @FXML - TreeItem rootPositionen = new TreeItem<>( - new tableDataPositionen(0, "0", "0", "0", "0")); + TreeItem rootPositionen = new TreeItem<>(new tableDataPositionen(0, "0", "0", "0", "0")); @FXML public void ueberbtnAction(ActionEvent event) { // Opens the 'About' dialog @@ -398,16 +393,13 @@ public class MainWindowController { grid.setVgap(10); grid.setPadding(new Insets(20, 150, 10, 10)); - grid.add(new Label( - "Einfaches Kassensystem für kleine bis mittel große Veranstaltungen mit Bon-Drucker\n" - + "\nUnter Lizenz GPL-3.0 abrufbar auf https://git.mosad.xyz/localhorst/jFxKasse\n" - + "\nDatenbank: sqlite.org - Public Domain" - + " \nUI Design01: eclipse.org/efxclipse/install.html - Eclipse Public License 1.0" - + " \nUI Design02: http://www.jfoenix.com/ - Apache License 2.0" - + " \nUI - Datenbank Integration: basierend auf Project-HomeFlix - github.com/Seil0/Project-HomeFlix - GPLv3 \n" - + " \nMaintainer: mail@hendrikschutter.com" - + " \n(c) 2026 Hendrik Schutter"), - 0, 0); + grid.add(new Label("Einfaches Kassensystem für kleine bis mittel große Veranstaltungen mit Bon-Drucker\n" + + "\nUnter Lizenz GPL-3.0 abrufbar auf https://git.mosad.xyz/localhorst/jFxKasse\n" + + "\nDatenbank: sqlite.org - Public Domain" + + " \nUI Design01: eclipse.org/efxclipse/install.html - Eclipse Public License 1.0" + + " \nUI Design02: http://www.jfoenix.com/ - Apache License 2.0" + + " \nUI - Datenbank Integration: basierend auf Project-HomeFlix - github.com/Seil0/Project-HomeFlix - GPLv3 \n" + + " \nMaintainer: mail@hendrikschutter.com" + " \n(c) 2026 Hendrik Schutter"), 0, 0); dialog.getDialogPane().setContent(grid); dialog.setResizable(true); @@ -422,7 +414,8 @@ public class MainWindowController { File file = new File(Main.filepath); Desktop desktop = Desktop.getDesktop(); desktop.open(file); - } else { + } + else { Runtime.getRuntime().exec("xdg-open " + Main.filepath); } } @@ -442,7 +435,8 @@ public class MainWindowController { try { // saveSettings(getDatabaseName()); xmlc.saveSettings(); - } catch (Exception e) { + } + catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -500,7 +494,8 @@ public class MainWindowController { float avgJobValue = ((float) allValue / allActiveJobs); setJobStatLabel(allActiveJobs, avgJobValue, allValue); - } else { + } + else { setJobStatLabel(allActiveJobs, 0, 0); } titlePaneStats.setVisible(true); @@ -510,8 +505,7 @@ public class MainWindowController { public void btnSavePrinterAction(ActionEvent event) { System.out.println("btnSavePrinterAction"); - xmlc.setPrintername( - printerChoise.getSelectionModel().getSelectedItem().toString()); + xmlc.setPrintername(printerChoise.getSelectionModel().getSelectedItem().toString()); xmlc.setLinebreak(linesSpinner.getValue()); xmlc.setOffsetHeader(offsetHeaderSpinner.getValue()); xmlc.setOffsetFooter(offsetFooterSpinner.getValue()); @@ -521,7 +515,8 @@ public class MainWindowController { try { xmlc.saveSettings(); - } catch (Exception e) { + } + catch (Exception e) { // TODO Auto-generated catch block // e.printStackTrace(); } @@ -543,7 +538,8 @@ public class MainWindowController { if (lockState) { btnLock.setText("Kasse entsperren"); - } else { + } + else { btnLock.setText("Kasse sperren"); } } @@ -564,12 +560,11 @@ public class MainWindowController { @FXML public void btnDeleteSelectedPositionAction(ActionEvent event) { currentJob.deletePosName(currentOrderPosName); - rootCurrentJob.getChildren().remove(0, - rootCurrentJob.getChildren().size()); + rootCurrentJob.getChildren().remove(0, rootCurrentJob.getChildren().size()); for (int i = 0; i < currentJob.getCurrentJobPositionen().size(); i++) { - rootCurrentJob.getChildren().add(new TreeItem( - currentJob.getCurrentJobPositionen().get(i))); + rootCurrentJob.getChildren() + .add(new TreeItem(currentJob.getCurrentJobPositionen().get(i))); } setJobPrizeLabel(currentJob.getJobValue()); @@ -596,18 +591,13 @@ public class MainWindowController { setJobPrizeLabel(0); - currentJob.setJobtime( - timedate.getSystemTime() + " " + timedate.getSystemDate()); + currentJob.setJobtime(timedate.getSystemTime() + " " + timedate.getSystemDate()); - rootCurrentJob.getChildren().remove(0, - rootCurrentJob.getChildren().size()); + rootCurrentJob.getChildren().remove(0, rootCurrentJob.getChildren().size()); - dbc.fillJobs_Jobs(currentJob.getJobnumber(), currentJob.getJobtime(), - currentJob.createPosQuantityDBString(), - currentJob.createPosNameDBString(), - currentJob.createPosValueDBString(), - currentJob.createPosCatDBString(), "verbucht", - String.valueOf(currentJob.getJobValue())); + dbc.fillJobs_Jobs(currentJob.getJobnumber(), currentJob.getJobtime(), currentJob.createPosQuantityDBString(), + currentJob.createPosNameDBString(), currentJob.createPosValueDBString(), + currentJob.createPosCatDBString(), "verbucht", String.valueOf(currentJob.getJobValue())); pj.printJob(currentJob.getJobnumber(), xmlc, dbc, pc); @@ -753,25 +743,21 @@ public class MainWindowController { @FXML public void fillTablePositionen() { // Load positions into the TreeTableView - rootPositionen.getChildren().remove(0, - rootPositionen.getChildren().size()); + rootPositionen.getChildren().remove(0, rootPositionen.getChildren().size()); for (int i = 0; i < dbc.ladeTabellePositionen().size(); i++) { - float fValue = Float - .valueOf(dbc.ladeTabellePositionen().get(i).getValue()); + float fValue = Float.valueOf(dbc.ladeTabellePositionen().get(i).getValue()); String strValue = String.format("%.02f", fValue); strValue.replace('.', ','); - tableDataPositionen helpTableData = new tableDataPositionen( - dbc.ladeTabellePositionen().get(i).getID(), + tableDataPositionen helpTableData = new tableDataPositionen(dbc.ladeTabellePositionen().get(i).getID(), dbc.ladeTabellePositionen().get(i).getName(), (strValue + "€"), dbc.getCategoryNameFromPositionen(i + 1), getColorNames(dbc.ladeTabellePositionen().get(i).getColor())); - rootPositionen.getChildren() - .add(new TreeItem(helpTableData)); + rootPositionen.getChildren().add(new TreeItem(helpTableData)); } } @@ -791,8 +777,7 @@ public class MainWindowController { btnOpenFolder.setFocusTraversable(false); ueberbtn.setFocusTraversable(false); isPrintBtnDisabled = true; - btnPrintBill - .setStyle("-fx-background-color: #2ac8fc; -fx-text-fill: black;"); + btnPrintBill.setStyle("-fx-background-color: #2ac8fc; -fx-text-fill: black;"); btnLock.setFocusTraversable(false); initPositionen(); initCurrentOrderTreeTableView(); @@ -805,7 +790,8 @@ public class MainWindowController { for (int i = 1; i < 5; i++) { if (dbc.getName_Category(i).equals("Standard")) { - } else { + } + else { cats.add(dbc.getName_Category(i)); } } @@ -813,18 +799,16 @@ public class MainWindowController { cats.add(dbc.getName_Category(5)); catChoise.setItems(cats); - catChoise.getSelectionModel().selectedIndexProperty() - .addListener(new ChangeListener() { - @Override - public void changed(ObservableValue ov, - Number value, Number new_value) { - try { - selectedCatName = catChoise.getItems().get((int) new_value) - .toString(); - } catch (Exception e) { - } - } - }); + catChoise.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue ov, Number value, Number new_value) { + try { + selectedCatName = catChoise.getItems().get((int) new_value).toString(); + } + catch (Exception e) { + } + } + }); for (int i = 1; i < 6; i++) { if (dbc.getName_Category(i).equals(selectedCatName)) { @@ -837,8 +821,7 @@ public class MainWindowController { public void fillPrinterSettings() { System.out.println("Fill printer Settings"); - ObservableList printers = FXCollections - .observableArrayList(pc.getAvailablePrinters()); + ObservableList printers = FXCollections.observableArrayList(pc.getAvailablePrinters()); printers.add("Drucker auswählen"); printerChoise.setItems(printers); @@ -861,20 +844,17 @@ public class MainWindowController { } SpinnerValueFactory valueFactoryLines = // - new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 99, - xmlc.getLinebreak()); + new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 99, xmlc.getLinebreak()); linesSpinner.setValueFactory(valueFactoryLines); SpinnerValueFactory valueFactoryHeader = // - new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 99, - xmlc.getOffsetHeader()); + new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 99, xmlc.getOffsetHeader()); offsetHeaderSpinner.setValueFactory(valueFactoryHeader); SpinnerValueFactory valueFactoryFooter = // - new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 99, - xmlc.getOffsetFooter()); + new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 99, xmlc.getOffsetFooter()); offsetFooterSpinner.setValueFactory(valueFactoryFooter); @@ -899,72 +879,56 @@ public class MainWindowController { entryTreeTable.setShowRoot(false); entryTreeTable.setEditable(false); - columnPosnumber - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); - columnPositionsEdit - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnPosnumber.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnPositionsEdit.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); columnPrize.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); columnCat.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); columnColor.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); - ObservableList color = FXCollections.observableArrayList("Rot", - "Orange", "Braun", "Weiß", "Gelb", "Gr\u00fcn", "Blau", "Indigo"); + ObservableList color = FXCollections.observableArrayList("Rot", "Orange", "Braun", "Weiß", "Gelb", + "Gr\u00fcn", "Blau", "Indigo"); colorChoise.setItems(color); - colorChoise.getSelectionModel().selectedIndexProperty() - .addListener(new ChangeListener() { - @Override - public void changed(ObservableValue ov, - Number value, Number new_value) { - selectedColorName = colorChoise.getItems() - .get((int) new_value).toString(); - } - }); + colorChoise.getSelectionModel().selectedIndexProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue ov, Number value, Number new_value) { + selectedColorName = colorChoise.getItems().get((int) new_value).toString(); + } + }); - columnPosnumber.setCellValueFactory( - cellData -> cellData.getValue().getValue().idProperty().asObject()); + columnPosnumber.setCellValueFactory(cellData -> cellData.getValue().getValue().idProperty().asObject()); - columnPositionsEdit.setCellValueFactory( - cellData -> cellData.getValue().getValue().nameProperty()); + columnPositionsEdit.setCellValueFactory(cellData -> cellData.getValue().getValue().nameProperty()); - columnPrize.setCellValueFactory( - cellData -> cellData.getValue().getValue().valueProperty()); + columnPrize.setCellValueFactory(cellData -> cellData.getValue().getValue().valueProperty()); - columnCat.setCellValueFactory( - cellData -> cellData.getValue().getValue().catProperty()); + columnCat.setCellValueFactory(cellData -> cellData.getValue().getValue().catProperty()); - columnColor.setCellValueFactory( - cellData -> cellData.getValue().getValue().colorProperty()); + columnColor.setCellValueFactory(cellData -> cellData.getValue().getValue().colorProperty()); - entryTreeTable.getSelectionModel().selectedItemProperty() - .addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Object oldVal, - Object newVal) { - int selected = entryTreeTable.getSelectionModel() - .getSelectedIndex(); // Get selected item + entryTreeTable.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Object oldVal, Object newVal) { + int selected = entryTreeTable.getSelectionModel().getSelectedIndex(); // Get selected item - try { - idPositionen = columnPosnumber.getCellData(selected); - tftNewPosition - .setText(dbc.getName_Positionen(idPositionen)); - tftNewValue.setText(dbc.getValue_Positionen(idPositionen)); - colorChoise.getSelectionModel().select( - getColorID(dbc.getColor_Positionen(idPositionen))); + try { + idPositionen = columnPosnumber.getCellData(selected); + tftNewPosition.setText(dbc.getName_Positionen(idPositionen)); + tftNewValue.setText(dbc.getValue_Positionen(idPositionen)); + colorChoise.getSelectionModel().select(getColorID(dbc.getColor_Positionen(idPositionen))); - catChoise.getSelectionModel().select( - dbc.getCategoryNameFromPositionen(idPositionen)); + catChoise.getSelectionModel().select(dbc.getCategoryNameFromPositionen(idPositionen)); - } catch (Exception e) { - // TODO Auto-generated catch block - // e.printStackTrace(); - } - } - }); + } + catch (Exception e) { + // TODO Auto-generated catch block + // e.printStackTrace(); + } + } + }); tftNewValue.textProperty().addListener(new ChangeListener() { @Override - public void changed(ObservableValue observable, - String oldValue, String newValue) { + public void changed(ObservableValue observable, String oldValue, String newValue) { if (!newValue.matches("\\d{0,4}([\\.]\\d{0,2})?")) { tftNewValue.setText(oldValue); } @@ -973,22 +937,19 @@ public class MainWindowController { final Tooltip tooltipName = new Tooltip(); tooltipName.setText("Name der neuen Position"); - tooltipName.setStyle("-fx-font: normal bold 20 Cantarell; " - + "-fx-base: #AE3522; " + "-fx-text-fill: orange;"); + tooltipName.setStyle("-fx-font: normal bold 20 Cantarell; " + "-fx-base: #AE3522; " + "-fx-text-fill: orange;"); tftNewPosition.setTooltip(tooltipName); final Tooltip tooltipValue = new Tooltip(); + tooltipValue.setText("Preis der neuen Position.\nPunkt als Trennzeichen!"); tooltipValue - .setText("Preis der neuen Position.\nPunkt als Trennzeichen!"); - tooltipValue.setStyle("-fx-font: normal bold 20 Cantarell; " - + "-fx-base: #AE3522; " + "-fx-text-fill: orange;"); + .setStyle("-fx-font: normal bold 20 Cantarell; " + "-fx-base: #AE3522; " + "-fx-text-fill: orange;"); tftNewValue.setTooltip(tooltipValue); labelNewValue.setTooltip(tooltipValue); } - public void setMain(Main main, DBController dbc, XMLController xmlc, - PrinterController pc) { + public void setMain(Main main, DBController dbc, XMLController xmlc, PrinterController pc) { this.main = main; this.dbc = dbc; this.xmlc = xmlc; @@ -997,92 +958,88 @@ public class MainWindowController { public void setDBLabel() throws Exception { if (xmlc.loadSettings() == true) { - labelDBStatus.setText( - "Geladene Datenbank: " + xmlc.getDatabaseName() + ".db"); + labelDBStatus.setText("Geladene Datenbank: " + xmlc.getDatabaseName() + ".db"); btnCreateNewDatabase.setDisable(true); tftNewDBName.setDisable(true); - labelDBName.setTooltip(new Tooltip( - "Um eine neue Datenbank zu erzeugen muss die vorherige config.xml und " - + xmlc.getDatabaseName() - + ".db gelöscht werden! Anwendung danach neustarten!")); - labelDBStatus.setTooltip(new Tooltip( - "Um eine neue Datenbank zu erzeugen muss die vorherige config.xml und " - + xmlc.getDatabaseName() - + ".db gelöscht werden! Anwendung danach neustarten!")); - } else { + labelDBName.setTooltip(new Tooltip("Um eine neue Datenbank zu erzeugen muss die vorherige config.xml und " + + xmlc.getDatabaseName() + ".db gelöscht werden! Anwendung danach neustarten!")); + labelDBStatus.setTooltip(new Tooltip("Um eine neue Datenbank zu erzeugen muss die vorherige config.xml und " + + xmlc.getDatabaseName() + ".db gelöscht werden! Anwendung danach neustarten!")); + } + else { labelDBStatus.setText("Keine Datenbank gefunden!"); } } private String getColorCodes(String pColorName) { switch (pColorName) { - case "Rot": - return "#ad0000"; - case "Orange": - return "#FF4500"; - case "Braun": - return "#8B4513"; - case "Weiß": - return "#FAF0E6"; - case "Gelb": - return "#FFD700"; - case "Gr\u00fcn": - return "#556B2F"; - case "Blau": - return "#00BFFF"; - case "Indigo": - return "#4B0082"; + case "Rot": + return "#ad0000"; + case "Orange": + return "#FF4500"; + case "Braun": + return "#8B4513"; + case "Weiß": + return "#FAF0E6"; + case "Gelb": + return "#FFD700"; + case "Gr\u00fcn": + return "#556B2F"; + case "Blau": + return "#00BFFF"; + case "Indigo": + return "#4B0082"; - default: - return "#FFFFFF"; + default: + return "#FFFFFF"; } } private String getColorNames(String pColorCode) { switch (pColorCode) { - case "#ad0000": - return "Rot"; - case "#FF4500": - return "Orange"; - case "#8B4513": - return "Braun"; - case "#FAF0E6": - return "Weiß"; - case "#FFD700": - return "Gelb"; - case "#556B2F": - return "Gr\u00fcn"; - case "#00BFFF": - return "Blau"; - case "#4B0082": - return "Indigo"; + case "#ad0000": + return "Rot"; + case "#FF4500": + return "Orange"; + case "#8B4513": + return "Braun"; + case "#FAF0E6": + return "Weiß"; + case "#FFD700": + return "Gelb"; + case "#556B2F": + return "Gr\u00fcn"; + case "#00BFFF": + return "Blau"; + case "#4B0082": + return "Indigo"; - default: - return "Farbe"; + default: + return "Farbe"; } } private Integer getColorID(String pColorCode) { switch (pColorCode) { - case "#ad0000": - return 0; - case "#FF4500": - return 1; - case "#8B4513": - return 2; - case "#FAF0E6": - return 3; - case "#FFD700": - return 4; - case "#556B2F": - return 5; - case "#00BFFF": - return 6; - case "#4B0082": - return 7; + case "#ad0000": + return 0; + case "#FF4500": + return 1; + case "#8B4513": + return 2; + case "#FAF0E6": + return 3; + case "#FFD700": + return 4; + case "#556B2F": + return 5; + case "#00BFFF": + return 6; + case "#4B0082": + return 7; - default: - return 0; + default: + return 0; } } @@ -1138,17 +1095,19 @@ public class MainWindowController { getButtonByID(i).setFocusTraversable(false); if ((getColorID(dbc.getColor_Positionen(i + 1)) == 0) || (getColorID(dbc.getColor_Positionen(i + 1)) == 7)) { - getButtonByID(i).setStyle("-fx-background-color: " - + dbc.getColor_Positionen(i + 1) + "; -fx-text-fill: white;"); - } else { - getButtonByID(i).setStyle("-fx-background-color: " - + dbc.getColor_Positionen(i + 1) + "; -fx-text-fill: black;"); + getButtonByID(i).setStyle( + "-fx-background-color: " + dbc.getColor_Positionen(i + 1) + "; -fx-text-fill: white;"); + } + else { + getButtonByID(i).setStyle( + "-fx-background-color: " + dbc.getColor_Positionen(i + 1) + "; -fx-text-fill: black;"); } } for (int i = 0; i < 25; i++) { if (dbc.getName_Positionen(i + 1).equals("Noch frei")) { getButtonByID(i).setVisible(false); - } else { + } + else { getButtonByID(i).setVisible(true); } } @@ -1156,58 +1115,58 @@ public class MainWindowController { 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; + 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; } } @@ -1218,20 +1177,18 @@ public class MainWindowController { return; } - currentJob.addPosition(dbc.getName_Positionen(pID), - Float.parseFloat(dbc.getValue_Positionen(pID)), + currentJob.addPosition(dbc.getName_Positionen(pID), Float.parseFloat(dbc.getValue_Positionen(pID)), dbc.getCategoryNameFromPositionen(pID)); btnPrintBill.setDisable(false); isPrintBtnDisabled = false; tapPosEdit.setDisable(true); - rootCurrentJob.getChildren().remove(0, - rootCurrentJob.getChildren().size()); + rootCurrentJob.getChildren().remove(0, rootCurrentJob.getChildren().size()); for (int i = 0; i < currentJob.getCurrentJobPositionen().size(); i++) { - rootCurrentJob.getChildren().add(new TreeItem( - currentJob.getCurrentJobPositionen().get(i))); + rootCurrentJob.getChildren() + .add(new TreeItem(currentJob.getCurrentJobPositionen().get(i))); } setJobPrizeLabel(currentJob.getJobValue()); @@ -1241,88 +1198,71 @@ public class MainWindowController { } private void initCurrentOrderTreeTableView() { - columnQuantity - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); - columnPosition - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnQuantity.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnPosition.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); tableCurrentOrder.setRoot(rootCurrentJob); tableCurrentOrder.setShowRoot(false); tableCurrentOrder.setEditable(false); - columnQuantity.setCellValueFactory(cellData -> cellData.getValue() - .getValue().quantityProperty().asObject()); + columnQuantity.setCellValueFactory(cellData -> cellData.getValue().getValue().quantityProperty().asObject()); - columnPosition.setCellValueFactory( - cellData -> cellData.getValue().getValue().positionProperty()); + columnPosition.setCellValueFactory(cellData -> cellData.getValue().getValue().positionProperty()); - tableCurrentOrder.getSelectionModel().selectedItemProperty() - .addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Object oldVal, - Object newVal) { - int selected = tableCurrentOrder.getSelectionModel() - .getSelectedIndex(); // Get selected item + tableCurrentOrder.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Object oldVal, Object newVal) { + int selected = tableCurrentOrder.getSelectionModel().getSelectedIndex(); // Get selected item - if (columnPosition.getCellData(selected) != null) { - currentOrderPosName = columnPosition.getCellData(selected); // Selected position - btnDeleteSelectedPosition.setDisable(false); - } - } - }); + if (columnPosition.getCellData(selected) != null) { + currentOrderPosName = columnPosition.getCellData(selected); // Selected position + btnDeleteSelectedPosition.setDisable(false); + } + } + }); } private void initJobTreeTableView() { - columnJobNumber - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnJobNumber.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); columnTime.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); - columnPositions - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnPositions.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); columnState.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); - columnJobValue - .setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); + columnJobValue.setStyle("-fx-alignment: CENTER; -fx-font: 17px Cantarell;"); jobsTreeTable.setRoot(rootJobs); jobsTreeTable.setShowRoot(false); jobsTreeTable.setEditable(false); - columnJobNumber.setCellValueFactory(cellData -> cellData.getValue() - .getValue().numberProperty().asObject()); + columnJobNumber.setCellValueFactory(cellData -> cellData.getValue().getValue().numberProperty().asObject()); - columnTime.setCellValueFactory( - cellData -> cellData.getValue().getValue().timeProperty()); + columnTime.setCellValueFactory(cellData -> cellData.getValue().getValue().timeProperty()); - columnPositions.setCellValueFactory( - cellData -> cellData.getValue().getValue().positionProperty()); + columnPositions.setCellValueFactory(cellData -> cellData.getValue().getValue().positionProperty()); - columnState.setCellValueFactory( - cellData -> cellData.getValue().getValue().statusProperty()); + columnState.setCellValueFactory(cellData -> cellData.getValue().getValue().statusProperty()); - columnJobValue.setCellValueFactory( - cellData -> cellData.getValue().getValue().valueProperty()); + columnJobValue.setCellValueFactory(cellData -> cellData.getValue().getValue().valueProperty()); - jobsTreeTable.getSelectionModel().selectedItemProperty() - .addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Object oldVal, - Object newVal) { - selectedJobId = jobsTreeTable.getSelectionModel() - .getSelectedIndex(); // Get selected item + jobsTreeTable.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Object oldVal, Object newVal) { + selectedJobId = jobsTreeTable.getSelectionModel().getSelectedIndex(); // Get selected item - if (dbc.getState_Job(selectedJobId + 1).equals("storniert")) { - btnCancelJob.setDisable(true); - btnReprintJob.setDisable(true); - } else { - btnCancelJob.setDisable(false); - btnReprintJob.setDisable(false); - } - } - }); + if (dbc.getState_Job(selectedJobId + 1).equals("storniert")) { + btnCancelJob.setDisable(true); + btnReprintJob.setDisable(true); + } + else { + btnCancelJob.setDisable(false); + btnReprintJob.setDisable(false); + } + } + }); } @FXML @@ -1331,8 +1271,7 @@ public class MainWindowController { for (int i = 0; i < dbc.loadTableJobs_Job().size(); i++) { - float fValue = Float - .valueOf(dbc.loadTableJobs_Job().get(i).getValue()); + float fValue = Float.valueOf(dbc.loadTableJobs_Job().get(i).getValue()); String strValue = String.format("%.02f", fValue); @@ -1340,12 +1279,10 @@ public class MainWindowController { strValue = (strValue + "€"); - String strJobDescription = createJobDescription( - dbc.loadTableJobs_Job().get(i).getPosition(), + String strJobDescription = createJobDescription(dbc.loadTableJobs_Job().get(i).getPosition(), dbc.getQuantity_Job(dbc.loadTableJobs_Job().get(i).getNumber())); - tableDataJob tmp = new tableDataJob( - dbc.loadTableJobs_Job().get(i).getNumber(), + tableDataJob tmp = new tableDataJob(dbc.loadTableJobs_Job().get(i).getNumber(), dbc.loadTableJobs_Job().get(i).getTime(), strJobDescription, dbc.loadTableJobs_Job().get(i).getStatus(), strValue); @@ -1360,8 +1297,7 @@ public class MainWindowController { public void createNewJob() { currentJob = new Job(dbc.getLatestJobNumber_Job() + 1); - labelJobCounter.setText("Auftragsnummer: " - + String.valueOf(dbc.getLatestJobNumber_Job() + 1)); + labelJobCounter.setText("Auftragsnummer: " + String.valueOf(dbc.getLatestJobNumber_Job() + 1)); } private static String createJobDescription(String pNames, String pQuantities) { @@ -1403,8 +1339,7 @@ public class MainWindowController { labelAllValue.setText("Gesamt: " + str + "€"); - titlePaneStats.setText("Statistik - " + timedate.getSystemTime() + " " - + timedate.getSystemDate()); + titlePaneStats.setText("Statistik - " + timedate.getSystemTime() + " " + timedate.getSystemDate()); } public void updateTimeLabel() { diff --git a/src/main/java/com/jFxKasse/controller/PrinterController.java b/src/main/java/com/jFxKasse/controller/PrinterController.java index ea44dd9..1405b02 100644 --- a/src/main/java/com/jFxKasse/controller/PrinterController.java +++ b/src/main/java/com/jFxKasse/controller/PrinterController.java @@ -93,7 +93,8 @@ public class PrinterController implements Printable { bytes = text.getBytes(StandardCharsets.UTF_8); Doc doc = new SimpleDoc(bytes, flavor, null); job.print(doc, null); - } catch (Exception e) { + } + catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -105,8 +106,8 @@ public class PrinterController implements Printable { } /* - * User (0,0) is typically outside the imageable area, so we must - * translate by the X and Y values in the PageFormat to avoid clipping + * User (0,0) is typically outside the imageable area, so we must translate by + * the X and Y values in the PageFormat to avoid clipping */ Graphics2D g2d = (Graphics2D) g; g2d.translate(pf.getImageableX(), pf.getImageableY()); @@ -121,7 +122,8 @@ public class PrinterController implements Printable { try { Doc doc = new SimpleDoc(bytes, flavor, null); job.print(doc, null); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/jFxKasse/controller/XMLController.java b/src/main/java/com/jFxKasse/controller/XMLController.java index 37d9d7f..104ee06 100644 --- a/src/main/java/com/jFxKasse/controller/XMLController.java +++ b/src/main/java/com/jFxKasse/controller/XMLController.java @@ -47,7 +47,8 @@ public class XMLController { if (this.categorySplitted) { categorySplitted = "true"; - } else { + } + else { categorySplitted = "false"; } @@ -64,7 +65,8 @@ public class XMLController { outputStream = new FileOutputStream(filePath); props.storeToXML(outputStream, "jFxKasse settings"); outputStream.close(); - } catch (IOException e) { + } + catch (IOException e) { } } @@ -78,21 +80,22 @@ public class XMLController { try { this.linebreak = Integer.valueOf(props.getProperty("linebreak")); - } catch (Exception e) { + } + catch (Exception e) { this.linebreak = 28; } try { - this.offsetHeader = Integer - .valueOf(props.getProperty("offsetHeader")); - } catch (Exception e) { + this.offsetHeader = Integer.valueOf(props.getProperty("offsetHeader")); + } + catch (Exception e) { this.offsetHeader = 1; } try { - this.offsetFooter = Integer - .valueOf(props.getProperty("offsetFooter")); - } catch (Exception e) { + this.offsetFooter = Integer.valueOf(props.getProperty("offsetFooter")); + } + catch (Exception e) { this.offsetFooter = 2; } @@ -102,16 +105,19 @@ public class XMLController { try { if (props.getProperty("categorySplitted").equals("true")) { this.categorySplitted = true; - } else { + } + else { this.categorySplitted = false; } - } catch (Exception e) { + } + catch (Exception e) { this.categorySplitted = false; } inputStream.close(); return true; - } catch (IOException e) { + } + catch (IOException e) { e.printStackTrace(); return false; } diff --git a/src/main/java/com/jFxKasse/datatypes/Category.java b/src/main/java/com/jFxKasse/datatypes/Category.java index f934db2..ef5e155 100644 --- a/src/main/java/com/jFxKasse/datatypes/Category.java +++ b/src/main/java/com/jFxKasse/datatypes/Category.java @@ -1,32 +1,25 @@ package com.jFxKasse.datatypes; -public class Category -{ +public class Category { private String categoryName; private String positionsString = "\n"; - public Category(String categoryName) - { + public Category(String categoryName) { this.categoryName = categoryName; } - public String getCategoryName() - { + public String getCategoryName() { return categoryName; } - public void addPosition(int quantity, String name, String value, - PrintData pd) - { + public void addPosition(int quantity, String name, String value, PrintData pd) { for (int i = 0; i < quantity; i++) { - positionsString = positionsString - + pd.setRight(pd.breakLines(name), value + " €") + "\n"; + positionsString = positionsString + pd.setRight(pd.breakLines(name), value + " €") + "\n"; } } - public String getPositionsString() - { + public String getPositionsString() { return positionsString; } } diff --git a/src/main/java/com/jFxKasse/datatypes/Job.java b/src/main/java/com/jFxKasse/datatypes/Job.java index ecf50bb..8c7ccd9 100644 --- a/src/main/java/com/jFxKasse/datatypes/Job.java +++ b/src/main/java/com/jFxKasse/datatypes/Job.java @@ -46,8 +46,7 @@ public class Job { return this.jobvalue; } - public void addPosition(String pPositionenName, float pPositionenValue, - String pPositionenCat) { + public void addPosition(String pPositionenName, float pPositionenValue, String pPositionenCat) { for (int i = 0; i < positionenName.size(); i++) { if (positionenName.get(i).equals(pPositionenName)) { // Item is already in list, increase quantity @@ -71,9 +70,8 @@ public class Job { for (int i = 0; i < positionenName.size(); i++) { - System.out.println( - positionenQuantity.get(i) + " " + positionenName.get(i) + " " - + positionenValue.get(i) + " " + positionenCat.get(i)); + System.out.println(positionenQuantity.get(i) + " " + positionenName.get(i) + " " + positionenValue.get(i) + + " " + positionenCat.get(i)); } System.out.println("---------------------------------------------"); @@ -85,8 +83,7 @@ public class Job { for (int i = 0; i < positionenName.size(); i++) { - tableDataCurrentOrder tmp = new tableDataCurrentOrder( - positionenName.get(i), positionenQuantity.get(i)); + tableDataCurrentOrder tmp = new tableDataCurrentOrder(positionenName.get(i), positionenQuantity.get(i)); jobitems.add(tmp); } @@ -97,8 +94,7 @@ public class Job { jobvalue = 0; for (int i = 0; i < positionenValue.size(); i++) { - jobvalue = jobvalue - + (positionenQuantity.get(i) * positionenValue.get(i)); + jobvalue = jobvalue + (positionenQuantity.get(i) * positionenValue.get(i)); } // Round to two decimal places jobvalue = BigDecimal.valueOf(jobvalue).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue(); @@ -148,7 +144,8 @@ public class Job { if (positionenQuantity.get(i) > 1) { positionenQuantity.set(i, positionenQuantity.get(i) - 1); - } else { + } + else { positionenQuantity.remove(i); positionenName.remove(i); diff --git a/src/main/java/com/jFxKasse/datatypes/PrintData.java b/src/main/java/com/jFxKasse/datatypes/PrintData.java index 08c7cde..41e5437 100644 --- a/src/main/java/com/jFxKasse/datatypes/PrintData.java +++ b/src/main/java/com/jFxKasse/datatypes/PrintData.java @@ -38,8 +38,8 @@ public abstract class PrintData { * @param header * @param footer */ - public PrintData(int lineBreak, int headerSpace, int footerSpace, - String timeAndDatePrint, String header, String footer) { + public PrintData(int lineBreak, int headerSpace, int footerSpace, String timeAndDatePrint, String header, + String footer) { this.lineBreak = lineBreak; this.headerSpace = headerSpace; this.footerSpace = footerSpace; @@ -59,8 +59,7 @@ public abstract class PrintData { * @param positionenCategory * @param jobValue */ - public void setData(String jobID, String timeAndDateOrder, - String positionsQuantity, String positionsName, + public void setData(String jobID, String timeAndDateOrder, String positionsQuantity, String positionsName, String positionsValue, String positionsCategory, String jobValue) { this.jobID = jobID; this.timeAndDateOrder = timeAndDateOrder; @@ -85,7 +84,8 @@ public abstract class PrintData { if (data.length() > lineBreak) { // Needs to be split next = true; - } else { + } + else { // No need to split return data; } @@ -98,7 +98,8 @@ public abstract class PrintData { try { tmp = tmp + "\n" + data.substring(count, lineBreak + count); count = count + lineBreak; - } catch (Exception e) { + } + catch (Exception e) { // Data string not long enough next = false; } diff --git a/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java b/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java index c78c9cc..f703462 100644 --- a/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java +++ b/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java @@ -14,10 +14,9 @@ public class PrintDataSimple extends PrintData { * @param header * @param footer */ - public PrintDataSimple(int lineBreak, int headerSpace, int footerSpace, - String timeAndDatePrint, String header, String footer) { - super(lineBreak, headerSpace, footerSpace, timeAndDatePrint, header, - footer); + public PrintDataSimple(int lineBreak, int headerSpace, int footerSpace, String timeAndDatePrint, String header, + String footer) { + super(lineBreak, headerSpace, footerSpace, timeAndDatePrint, header, footer); } /** @@ -43,16 +42,14 @@ public class PrintDataSimple extends PrintData { /* Info */ - String info = setRight("Bestellung: ", timeAndDateOrder) + "\n" - + setRight("Druck: ", timeAndDatePrint) + "\n" + String info = setRight("Bestellung: ", timeAndDateOrder) + "\n" + setRight("Druck: ", timeAndDatePrint) + "\n" + setRight("Bestellnummer: ", jobID); /* Positionen */ String positionen = "\n"; - int posCount = positionsQuantity.length() - - positionsQuantity.replace(";", "").length() + 1; + int posCount = positionsQuantity.length() - positionsQuantity.replace(";", "").length() + 1; String[] positionQuantity = positionsQuantity.split(";"); @@ -63,8 +60,7 @@ public class PrintDataSimple extends PrintData { for (int i = 0; i < posCount; i++) { // All different posNames int quantity = Integer.parseInt(positionQuantity[i]); for (int j = 0; j < quantity; j++) { // quantities - positionen = positionen + setRight(breakLines(positionName[i]), - positionValue[i] + " €") + "\n"; + positionen = positionen + setRight(breakLines(positionName[i]), positionValue[i] + " €") + "\n"; } } @@ -83,9 +79,8 @@ public class PrintDataSimple extends PrintData { /* Build final Print String */ - printString = header + "\n" + getSeparator() + "\n" + info + "\n" - + getSeparator() + "\n" + positionen + "\n" + getSeparator() + "\n" - + price + "\n" + getSeparator() + "\n" + footer; + printString = header + "\n" + getSeparator() + "\n" + info + "\n" + getSeparator() + "\n" + positionen + "\n" + + getSeparator() + "\n" + price + "\n" + getSeparator() + "\n" + footer; } } diff --git a/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java b/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java index 393933d..64c31b2 100644 --- a/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java +++ b/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java @@ -19,10 +19,9 @@ public class PrintDataSplitted extends PrintData { * @param header * @param footer */ - public PrintDataSplitted(int lineBreak, int headerSpace, int footerSpace, - String timeAndDatePrint, String header, String footer) { - super(lineBreak, headerSpace, footerSpace, timeAndDatePrint, header, - footer); + public PrintDataSplitted(int lineBreak, int headerSpace, int footerSpace, String timeAndDatePrint, String header, + String footer) { + super(lineBreak, headerSpace, footerSpace, timeAndDatePrint, header, footer); } /** @@ -51,8 +50,7 @@ public class PrintDataSplitted extends PrintData { /* Info */ - String info = setRight("Bestellung: ", timeAndDateOrder) + "\n" - + setRight("Druck: ", timeAndDatePrint) + "\n" + String info = setRight("Bestellung: ", timeAndDateOrder) + "\n" + setRight("Druck: ", timeAndDatePrint) + "\n" + setRight("Bestellnummer: ", jobID); /* Splitted Bills by Category */ @@ -72,10 +70,9 @@ public class PrintDataSplitted extends PrintData { /* Build first Print String */ - firstBill = header + "\n" + getSeparator() + "\n" + info + "\n" - + getSeparator() + "\n" + setCenter("Bon wurde aufgeteilt") + "\n" - + getSeparator() + "\n" + price + "\n" + getSeparator() + "\n" - + footer; + firstBill = header + "\n" + getSeparator() + "\n" + info + "\n" + getSeparator() + "\n" + + setCenter("Bon wurde aufgeteilt") + "\n" + getSeparator() + "\n" + price + "\n" + getSeparator() + + "\n" + footer; printString.add(firstBill); @@ -85,8 +82,7 @@ public class PrintDataSplitted extends PrintData { String positions = null; - int posCount = positionsQuantity.length() - - positionsQuantity.replace(";", "").length() + 1; + int posCount = positionsQuantity.length() - positionsQuantity.replace(";", "").length() + 1; String[] positionQuantity = positionsQuantity.split(";"); String[] positionName = positionsName.split(";"); @@ -95,8 +91,7 @@ public class PrintDataSplitted extends PrintData { for (int i = 0; i < posCount; i++) { // All different posNames int quantity = Integer.parseInt(positionQuantity[i]); - insertToCategory(quantity, positionName[i], positionValue[i], - positionCategory[i]); + insertToCategory(quantity, positionName[i], positionValue[i], positionCategory[i]); } // Loops through all categories @@ -115,8 +110,7 @@ public class PrintDataSplitted extends PrintData { /* Info */ - info = setRight("Bestellung: ", timeAndDateOrder) + "\n" - + setRight("Druck: ", timeAndDatePrint) + "\n" + info = setRight("Bestellung: ", timeAndDateOrder) + "\n" + setRight("Druck: ", timeAndDatePrint) + "\n" + setRight("Bestellnummer: ", jobID); /* Positions */ @@ -132,11 +126,9 @@ public class PrintDataSplitted extends PrintData { } footer = footer + "_"; - thisBill = header + "\n" + getSeparator() + "\n" + info + "\n" - + getSeparator() + "\n" - + setCenter(categories.get(i).getCategoryName()) + "\n" - + getSeparator() + positions + "\n" + getSeparator() + "\n" - + footer; + thisBill = header + "\n" + getSeparator() + "\n" + info + "\n" + getSeparator() + "\n" + + setCenter(categories.get(i).getCategoryName()) + "\n" + getSeparator() + positions + "\n" + + getSeparator() + "\n" + footer; printString.add(thisBill); @@ -144,8 +136,7 @@ public class PrintDataSplitted extends PrintData { } - private void insertToCategory(int quantity, String name, String value, - String category) { + private void insertToCategory(int quantity, String name, String value, String category) { boolean createNewCategorie = true; for (int i = 0; i < categoryCount; i++) { if (category.equals(categories.get(i).getCategoryName())) { diff --git a/src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java b/src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java index 43be933..41a9853 100644 --- a/src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java +++ b/src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java @@ -5,46 +5,38 @@ import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -public class tableDataCurrentOrder -{ +public class tableDataCurrentOrder { private final StringProperty position = new SimpleStringProperty(); private final IntegerProperty quantity = new SimpleIntegerProperty(); - public tableDataCurrentOrder(final String pPosition, final Integer pQuantity) - { + public tableDataCurrentOrder(final String pPosition, final Integer pQuantity) { this.position.set(pPosition); this.quantity.set(pQuantity); } - public StringProperty positionProperty() - { + public StringProperty positionProperty() { return position; } - public IntegerProperty quantityProperty() - { + public IntegerProperty quantityProperty() { return quantity; } - public String getPosition() - { + public String getPosition() { return positionProperty().get(); } - public Integer getQuantity() - { + public Integer getQuantity() { return quantityProperty().get(); } - public final void setPosition(String pPosition) - { + public final void setPosition(String pPosition) { positionProperty().set(pPosition); } - public final void setQuantity(int pQuantity) - { + public final void setQuantity(int pQuantity) { quantityProperty().set(pQuantity); } } diff --git a/src/main/java/com/jFxKasse/datatypes/tableDataJob.java b/src/main/java/com/jFxKasse/datatypes/tableDataJob.java index c56a34d..424e632 100644 --- a/src/main/java/com/jFxKasse/datatypes/tableDataJob.java +++ b/src/main/java/com/jFxKasse/datatypes/tableDataJob.java @@ -5,8 +5,7 @@ import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; -public class tableDataJob -{ +public class tableDataJob { private final IntegerProperty number = new SimpleIntegerProperty(); @@ -18,9 +17,8 @@ public class tableDataJob private final StringProperty value = new SimpleStringProperty(); - public tableDataJob(final Integer pNumber, final String pTime, - final String pPositionen, final String pStatus, final String pValue) - { + public tableDataJob(final Integer pNumber, final String pTime, final String pPositionen, final String pStatus, + final String pValue) { this.number.set(pNumber); this.time.set(pTime); this.positionen.set(pPositionen); @@ -29,78 +27,63 @@ public class tableDataJob } - public IntegerProperty numberProperty() - { + public IntegerProperty numberProperty() { return number; } - public StringProperty timeProperty() - { + public StringProperty timeProperty() { return time; } - public StringProperty positionProperty() - { + public StringProperty positionProperty() { return positionen; } - public StringProperty statusProperty() - { + public StringProperty statusProperty() { return status; } - public StringProperty valueProperty() - { + public StringProperty valueProperty() { return value; } - public Integer getNumber() - { + public Integer getNumber() { return numberProperty().get(); } - public String getTime() - { + public String getTime() { return timeProperty().get(); } - public String getPosition() - { + public String getPosition() { return positionProperty().get(); } - public String getStatus() - { + public String getStatus() { return statusProperty().get(); } - public String getValue() - { + public String getValue() { return valueProperty().get(); } - public final void setNumber(int pNumber) - { + public final void setNumber(int pNumber) { numberProperty().set(pNumber); } - public final void setTime(String pTime) - { + public final void setTime(String pTime) { timeProperty().set(pTime); } - public final void setPosition(String pPosition) - { + public final void setPosition(String pPosition) { positionProperty().set(pPosition); } - public final void setStatus(String pStatus) - { + public final void setStatus(String pStatus) { statusProperty().set(pStatus); } - public final void setValue(String pValue) - { + public final void setValue(String pValue) { valueProperty().set(pValue); } diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index fb54935..a287248 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -20,514 +20,523 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +