From 5c9d54dabf3bb242bed22ba581dde82d6d7a34aa Mon Sep 17 00:00:00 2001 From: localhorst Date: Fri, 7 Dec 2018 11:25:45 +0100 Subject: [PATCH] ui fixes and bill layout improvements --- pom.xml | 2 +- .../controller/MainWindowController.java | 18 ++++++++++-------- src/main/java/com/jFxKasse/datatypes/Job.java | 3 +++ .../jFxKasse/datatypes/PrintDataSimple.java | 2 +- .../jFxKasse/datatypes/PrintDataSplitted.java | 4 ++-- src/main/resources/fxml/MainWindow.fxml | 14 +++++++------- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 01c7fce..8ed09e7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com jFxKasse - 0.3.0 + 0.3.1 jFxKasse diff --git a/src/main/java/com/jFxKasse/controller/MainWindowController.java b/src/main/java/com/jFxKasse/controller/MainWindowController.java index 288c263..ce2f253 100644 --- a/src/main/java/com/jFxKasse/controller/MainWindowController.java +++ b/src/main/java/com/jFxKasse/controller/MainWindowController.java @@ -378,7 +378,7 @@ public class MainWindowController // creates a dialog Dialog> dialog = new Dialog<>(); dialog.setTitle("Über jFxKasse"); - dialog.setHeaderText("Informationen und Lizenzen - Version 0.3.0"); + dialog.setHeaderText("Informationen und Lizenzen - Version 0.3.1"); dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK); @@ -398,8 +398,8 @@ public class MainWindowController + " \n(c) 2018 Hendrik Schutter"), 0, 0); - dialog.getDialogPane().setContent(grid); // Setzt die GridPane auf die - dialog.setResizable(true); // DialogPane + dialog.getDialogPane().setContent(grid); + dialog.setResizable(true); dialog.showAndWait(); } @@ -837,8 +837,11 @@ public class MainWindowController public void changed(ObservableValue ov, Number value, Number new_value) { - selectedCatName = catChoise.getItems().get((int) new_value) - .toString(); + try { + selectedCatName = catChoise.getItems().get((int) new_value) + .toString(); + } catch (Exception e) { + } } }); @@ -964,9 +967,8 @@ public class MainWindowController int selected = entryTreeTable.getSelectionModel() .getSelectedIndex(); // get selected item - idPositionen = columnPosnumber.getCellData(selected); try { - + idPositionen = columnPosnumber.getCellData(selected); tftNewPosition .setText(dbc.getName_Positionen(idPositionen)); tftNewValue.setText(dbc.getValue_Positionen(idPositionen)); @@ -978,7 +980,7 @@ public class MainWindowController } catch (Exception e) { // TODO Auto-generated catch block - e.printStackTrace(); + // e.printStackTrace(); } } }); diff --git a/src/main/java/com/jFxKasse/datatypes/Job.java b/src/main/java/com/jFxKasse/datatypes/Job.java index c7ede7c..418a604 100644 --- a/src/main/java/com/jFxKasse/datatypes/Job.java +++ b/src/main/java/com/jFxKasse/datatypes/Job.java @@ -1,5 +1,6 @@ package com.jFxKasse.datatypes; +import java.math.BigDecimal; import java.util.ArrayList; public class Job @@ -109,6 +110,8 @@ public class Job jobvalue = jobvalue + (positionenQuantity.get(i) * positionenValue.get(i)); } + //Round to two decimals + jobvalue = BigDecimal.valueOf(jobvalue).setScale(2, BigDecimal.ROUND_HALF_UP).floatValue(); } public String createPosQuantityDBString() diff --git a/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java b/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java index 98e264b..9abc9fc 100644 --- a/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java +++ b/src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java @@ -35,7 +35,7 @@ public class PrintDataSimple extends PrintData protected void generatePrintString() { /* Header */ - String header = "\n"; + String header = " "; for (int i = 1; i < headerSpace; i++) { header = header + "\n"; } diff --git a/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java b/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java index fa37054..e8318cc 100644 --- a/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java +++ b/src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java @@ -43,7 +43,7 @@ public class PrintDataSplitted extends PrintData String firstBill; /* Header */ - String header = "\n"; + String header = "-"; for (int i = 1; i < headerSpace; i++) { header = header + "\n"; } @@ -107,7 +107,7 @@ public class PrintDataSplitted extends PrintData String thisBill; /* Header */ - header = "\n"; + header = " "; for (int o = 1; o < headerSpace; o++) { header = header + "\n"; } diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index 7155222..abb42fc 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -131,7 +131,7 @@ - + @@ -247,13 +247,13 @@ - + - +