code cleanup and ui fixes

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com</groupId>
 	<artifactId>jFxKasse</artifactId>
-	<version>0.2.0</version>
+	<version>0.3.0</version>
 	<name>jFxKasse</name>
 
 	<dependencies>

src/main/java/com/jFxKasse/application/PrintJob.java

@@ -1,10 +1,13 @@
 package com.jFxKasse.application;
 
+import java.util.ArrayList;
+
 import com.jFxKasse.controller.DBController;
 import com.jFxKasse.controller.PrinterController;
 import com.jFxKasse.controller.XMLController;
 
 import com.jFxKasse.datatypes.PrintDataSimple;
+import com.jFxKasse.datatypes.PrintDataSplitted;
 
 import javafx.geometry.Insets;
 import javafx.scene.control.ButtonType;
@@ -51,10 +54,28 @@ public class PrintJob
 		} else {
 			// printer selected
 			pc.selectPrinter(xmlc.getPrintername());
+			/* Single bill or splitted */
 			if (xmlc.getCategorySplitted()) {
 				// split the bills
 
-				// TODO
+				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),
+						dbc.getJobValue_Job(jobID));
+
+				System.out.println("Printing job ...");
+
+				ArrayList<String> printString = pdsplitted.getPrintStrings();
+
+				for (int i = 0; i < printString.size(); i++) {
+					pc.printString(printString.get(i));
+				}
 
 			} else {
 				// one single bills

src/main/java/com/jFxKasse/application/TimeDate.java

@@ -6,7 +6,6 @@ import java.util.Date;
 
 public class TimeDate
 {
-
 	public String getSystemTime()
 	{
 		DateFormat dateFormat = new SimpleDateFormat("HH:mm");
@@ -22,5 +21,4 @@ public class TimeDate
 		String dateStr = dateFormat.format(date);
 		return dateStr;
 	}
-
 }

src/main/java/com/jFxKasse/controller/MainWindowController.java

@@ -378,7 +378,7 @@ public class MainWindowController
 		// creates a dialog
 		Dialog<Pair<String, String>> dialog = new Dialog<>();
 		dialog.setTitle("Über jFxKasse");
-		dialog.setHeaderText("Informationen und Lizenzen - Version 0.2");
+		dialog.setHeaderText("Informationen und Lizenzen - Version 0.3.0");
 
 		dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK);
 
@@ -525,6 +525,8 @@ public class MainWindowController
 	{
 		dbc.setStatus_Jobs(selectedJobId + 1, "storniert");
 		fillTableJobs();
+		btnCancelJob.setDisable(true);
+		btnReprintJob.setDisable(true);
 	}
 
 	@FXML
@@ -583,7 +585,6 @@ public class MainWindowController
 	@FXML
 	public void btnPrintBillAction(ActionEvent event)
 	{
-
 		btnPrintBill.setDisable(true);
 		tapPosEdit.setDisable(false);
 		btnDeleteSelectedPosition.setDisable(true);
@@ -591,6 +592,9 @@ public class MainWindowController
 
 		setJobPrizeLabel(0);
 
+		currentJob.setJobtime(
+				timedate.getSystemTime() + " " + timedate.getSystemDate());
+
 		rootCurrentJob.getChildren().remove(0,
 				rootCurrentJob.getChildren().size());
 
@@ -804,6 +808,8 @@ public class MainWindowController
 		tftKat05.setDisable(true);
 		titlePaneStats.setVisible(false);
 		btnPrintBill.setDisable(true);
+		btnReprintJob.setDisable(true);
+		btnCancelJob.setDisable(true);
 		btnDeleteSelectedPosition.setDisable(true);
 		isPrintBtnDisabled = true;
 		initPositionen();
@@ -1377,8 +1383,7 @@ public class MainWindowController
 
 	public void createNewJob()
 	{
-		currentJob = new Job(dbc.getLatestJobNumber_Job() + 1,
-				timedate.getSystemTime() + " " + timedate.getSystemDate());
+		currentJob = new Job(dbc.getLatestJobNumber_Job() + 1);
 		labelJobCounter.setText("Auftragsnummer: "
 				+ String.valueOf(dbc.getLatestJobNumber_Job() + 1));
 	}

src/main/java/com/jFxKasse/controller/PrinterController.java

@@ -83,7 +83,6 @@ public class PrinterController implements Printable
 		}
 	}
 
-	
 	/**
 	 * 
 	 * @param input data as String

src/main/java/com/jFxKasse/controller/XMLController.java

@@ -9,7 +9,6 @@ import java.util.Properties;
 
 public class XMLController
 {
-
 	private String databaseName = null;
 
 	private String printername = null;

src/main/java/com/jFxKasse/datatypes/Category.java

@@ -0,0 +1,32 @@
+package com.jFxKasse.datatypes;
+
+public class Category
+{
+	private String categoryName;
+
+	private String positionsString = "\n";
+
+	public Category(String categoryName)
+	{
+		this.categoryName = categoryName;
+	}
+
+	public String getCategoryName()
+	{
+		return categoryName;
+	}
+
+	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";
+		}
+	}
+
+	public String getPositionsString()
+	{
+		return positionsString;
+	}
+}

src/main/java/com/jFxKasse/datatypes/Job.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 
 public class Job
 {
-
 	private int jobnumber;
 
 	private float jobvalue;
@@ -19,18 +18,19 @@ public class Job
 
 	private ArrayList<String> positionenCat;
 
-	public Job(int pJobnumber, String pTime)
+	public Job(int pJobnumber)
 	{
 		this.jobnumber = pJobnumber;
-		this.jobtime = pTime;
-
 		positionenQuantity = new ArrayList<Integer>();
 		positionenName = new ArrayList<String>();
 		positionenValue = new ArrayList<Float>();
 		positionenCat = new ArrayList<String>();
 
-		// System.out.println("Größe: " + positionenName.size());
+	}
 
+	public void setJobtime(String jobtime)
+	{
+		this.jobtime = jobtime;
 	}
 
 	public int getJobnumber()
@@ -54,13 +54,10 @@ public class Job
 	public void addPosition(String pPositionenName, float pPositionenValue,
 			String pPositionenCat)
 	{
-		// System.out.println("addName");
-
 		for (int i = 0; i < positionenName.size(); i++) {
 			if (positionenName.get(i).equals(pPositionenName)) {
 				// Item is already in list, increase quantity
 				positionenQuantity.set(i, positionenQuantity.get(i) + 1);
-				// System.out.println("Item exists, increasing quantity");
 				return;
 			}
 		}
@@ -75,24 +72,15 @@ public class Job
 
 	public void printJobOnConsole()
 	{
-
 		System.out.println("---------------------------------------------");
 		System.out.println("JobNummer: " + jobnumber);
 		System.out.println("---------------------------------------------");
 
-		// System.out.println("Größe: " + positionenName.size());
-
 		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("i is: " + i);
-			 * System.out.println(positionenName.get(i));
-			 * System.out.println(positionenQuantity.get(i));
-			 */
-
 		}
 
 		System.out.println("---------------------------------------------");
@@ -101,7 +89,6 @@ public class Job
 
 	public ArrayList<tableDataCurrentOrder> getCurrentJobPositionen()
 	{
-
 		ArrayList<tableDataCurrentOrder> jobitems = new ArrayList<tableDataCurrentOrder>();
 		
 		for (int i = 0; i < positionenName.size(); i++) {
@@ -110,24 +97,18 @@ public class Job
 					positionenName.get(i), positionenQuantity.get(i));
 
 			jobitems.add(tmp);
-
 		}
-
 		return jobitems;
 	}
 
 	private void calcJobValue()
 	{
-
 		jobvalue = 0;
 
 		for (int i = 0; i < positionenValue.size(); i++) {
-
 			jobvalue = jobvalue
 					+ (positionenQuantity.get(i) * positionenValue.get(i));
-
 		}
-
 	}
 
 	public String createPosQuantityDBString()

src/main/java/com/jFxKasse/datatypes/PrintData.java

@@ -13,13 +13,13 @@ public abstract class PrintData
 
 	protected String footer;
 
-	protected String positionenQuantity;
+	protected String positionsQuantity;
 
-	protected String positionenName;
+	protected String positionsName;
 
-	protected String positionenValue;
+	protected String positionsValue;
 
-	protected String positionenCategory;
+	protected String positionsCategory;
 
 	protected String jobID;
 
@@ -60,17 +60,16 @@ public abstract class PrintData
 	 * @param jobValue
 	 */
 	public void setData(String jobID, String timeAndDateOrder,
-			String positionenQuantity, String positionenName,
-			String positionenValue, String positionenCategory, String jobValue)
+			String positionsQuantity, String positionsName,
+			String positionsValue, String positionsCategory, String jobValue)
 	{
 		this.jobID = jobID;
 		this.timeAndDateOrder = timeAndDateOrder;
-		this.positionenQuantity = positionenQuantity;
-		this.positionenName = positionenName;
-		this.positionenValue = positionenValue;
-		this.positionenCategory = positionenCategory;
+		this.positionsQuantity = positionsQuantity;
+		this.positionsName = positionsName;
+		this.positionsValue = positionsValue;
+		this.positionsCategory = positionsCategory;
 		this.jobValue = jobValue;
-
 	}
 
 	/**
@@ -104,7 +103,6 @@ public abstract class PrintData
 				// data string not long enough
 				next = false;
 			}
-
 		}
 		// add the last part
 		return tmp + "\n" + data.substring(count);

src/main/java/com/jFxKasse/datatypes/PrintDataSimple.java

@@ -53,14 +53,14 @@ public class PrintDataSimple extends PrintData
 
 		String positionen = "\n";
 
-		int posCount = positionenQuantity.length()
-				- positionenQuantity.replace(";", "").length() + 1;
+		int posCount = positionsQuantity.length()
+				- positionsQuantity.replace(";", "").length() + 1;
 
-		String[] positionQuantity = positionenQuantity.split(";");
+		String[] positionQuantity = positionsQuantity.split(";");
 
-		String[] positionName = positionenName.split(";");
+		String[] positionName = positionsName.split(";");
 
-		String[] positionValue = positionenValue.split(";");
+		String[] positionValue = positionsValue.split(";");
 
 		for (int i = 0; i < posCount; i++) { // All different posNames
 			int quantity = Integer.parseInt(positionQuantity[i]);

src/main/java/com/jFxKasse/datatypes/PrintDataSplitted.java

@@ -0,0 +1,169 @@
+package com.jFxKasse.datatypes;
+
+import java.util.ArrayList;
+
+public class PrintDataSplitted extends PrintData
+{
+	private ArrayList<String> printString = new ArrayList<String>();
+
+	private ArrayList<Category> categories = new ArrayList<Category>();
+
+	private int categoryCount = 0;
+
+	/**
+	 * Constructor with all data that is not in the DB
+	 * @param lineBreak
+	 * @param headerSpace
+	 * @param footerSpace
+	 * @param timeAndDatePrint
+	 * @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);
+	}
+
+	/**
+	 * Generates the String
+	 * @return the final Array with the Print Strings
+	 */
+	public ArrayList<String> getPrintStrings()
+	{
+		generatePrintString();
+		return printString;
+	}
+
+	@Override
+	protected void generatePrintString()
+	{
+
+		String firstBill;
+
+		/* Header */
+		String header = "\n";
+		for (int i = 1; i < headerSpace; i++) {
+			header = header + "\n";
+		}
+
+		// This is the final header
+		header = header + setCenter(this.header);
+
+		/* Info */
+
+		String info = setRight("Bestellung: ", timeAndDateOrder) + "\n"
+				+ setRight("Druck: ", timeAndDatePrint) + "\n"
+				+ setRight("Bestellnummer: ", jobID);
+
+		/* Splitted Bills */
+
+		/* Price */
+
+		String price = setRight("Gesamt: ", (jobValue + " €"));
+
+		/* Footer */
+
+		String footer = setCenter(this.footer);
+
+		for (int i = 1; i < footerSpace; i++) {
+			footer = footer + "\n";
+		}
+		footer = footer + "_";
+
+		/* 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;
+
+		printString.add(firstBill);
+
+		/* first bill ends here */
+
+		/* Categories in extra bills */
+
+		String positions = null;
+
+		int posCount = positionsQuantity.length()
+				- positionsQuantity.replace(";", "").length() + 1;
+
+		String[] positionQuantity = positionsQuantity.split(";");
+		String[] positionName = positionsName.split(";");
+		String[] positionValue = positionsValue.split(";");
+		String[] positionCategory = positionsCategory.split(";");
+
+		for (int i = 0; i < posCount; i++) { // All different posNames
+			int quantity = Integer.parseInt(positionQuantity[i]);
+			insertToCategory(quantity, positionName[i], positionValue[i],
+					positionCategory[i]);
+		}
+
+		// loops through all categories
+		for (int i = 0; i < categories.size(); i++) {
+
+			String thisBill;
+
+			/* Header */
+			header = "\n";
+			for (int o = 1; o < headerSpace; o++) {
+				header = header + "\n";
+			}
+
+			// This is the final header
+			header = header + setCenter(this.header);
+
+			/* Info */
+
+			info = setRight("Bestellung: ", timeAndDateOrder) + "\n"
+					+ setRight("Druck: ", timeAndDatePrint) + "\n"
+					+ setRight("Bestellnummer: ", jobID);
+
+			/* Positions */
+
+			positions = categories.get(i).getPositionsString();
+
+			/* Footer */
+
+			footer = "\n";
+
+			for (int o = 2; o < footerSpace; o++) {
+				footer = footer + "\n";
+			}
+			footer = 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);
+
+		}
+
+	}
+
+	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())) {
+				categories.get(i).addPosition(quantity, name, value, this);
+				createNewCategorie = false;
+			}
+		}
+
+		if (createNewCategorie) {
+			// position has a new category
+			categories.add(new Category(category));
+			categories.get(categoryCount).addPosition(quantity, name, value, this);
+			categoryCount++;
+		}
+
+	}
+
+}

src/main/java/com/jFxKasse/datatypes/tableDataCurrentOrder.java

@@ -16,7 +16,6 @@ public class tableDataCurrentOrder
 	{
 		this.position.set(pPosition);
 		this.quantity.set(pQuantity);
-
 	}
 
 	public StringProperty positionProperty()

src/main/resources/fxml/MainWindow.fxml

@@ -27,7 +27,10 @@
 					<content>
 						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
 							<children>
-								<Button fx:id="ueberbtn" layoutX="84.0" layoutY="79.0" mnemonicParsing="false" onAction="#ueberbtnAction" prefHeight="0.0" prefWidth="46.0" text="Über" />
+								<Button fx:id="ueberbtn" layoutX="273.0" layoutY="448.0" mnemonicParsing="false" onAction="#ueberbtnAction" prefHeight="35.0" prefWidth="324.0" text="Informationen über jFxKasse">
+                           <font>
+                              <Font name="Cantarell Regular" size="18.0" />
+                           </font></Button>
 								<TitledPane alignment="CENTER" animated="false" collapsible="false" contentDisplay="CENTER" layoutX="790.0" layoutY="10.0" prefHeight="270.0" prefWidth="566.0" text="Datenbank Einstellungen">
 									<content>
 										<AnchorPane fx:id="paneDB" minHeight="0.0" minWidth="0.0" prefHeight="238.0" prefWidth="564.0">
@@ -37,7 +40,10 @@
 														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</Label>
-												<JFXTextField fx:id="tftNewDBName" alignment="CENTER" layoutX="25.0" layoutY="10.0" prefHeight="25.0" prefWidth="376.0" />
+												<JFXTextField fx:id="tftNewDBName" alignment="CENTER" layoutX="25.0" layoutY="10.0" prefHeight="25.0" prefWidth="376.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
 												<Label fx:id="labelDBStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="1.0" layoutY="75.0" prefHeight="34.0" prefWidth="551.0" text="Keine Datenbank gefunden!">
 													<font>
 														<Font name="Cantarell Regular" size="18.0" />
@@ -89,11 +95,26 @@
 														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</Label>
-												<JFXTextField fx:id="tftKat01" alignment="CENTER" layoutX="50.0" layoutY="5.0" prefHeight="25.0" prefWidth="376.0" />
-												<JFXTextField fx:id="tftKat02" alignment="CENTER" layoutX="50.0" layoutY="45.0" prefHeight="25.0" prefWidth="376.0" />
-												<JFXTextField fx:id="tftKat03" alignment="CENTER" layoutX="50.0" layoutY="85.0" prefHeight="25.0" prefWidth="376.0" />
-												<JFXTextField fx:id="tftKat04" alignment="CENTER" layoutX="50.0" layoutY="125.0" prefHeight="25.0" prefWidth="376.0" />
-												<JFXTextField fx:id="tftKat05" alignment="CENTER" layoutX="50.0" layoutY="165.0" prefHeight="25.0" prefWidth="376.0" />
+												<JFXTextField fx:id="tftKat01" alignment="CENTER" layoutX="50.0" layoutY="5.0" prefHeight="25.0" prefWidth="376.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
+												<JFXTextField fx:id="tftKat02" alignment="CENTER" layoutX="50.0" layoutY="45.0" prefHeight="25.0" prefWidth="376.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
+												<JFXTextField fx:id="tftKat03" alignment="CENTER" layoutX="50.0" layoutY="85.0" prefHeight="25.0" prefWidth="376.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
+												<JFXTextField fx:id="tftKat04" alignment="CENTER" layoutX="50.0" layoutY="125.0" prefHeight="25.0" prefWidth="376.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
+												<JFXTextField fx:id="tftKat05" alignment="CENTER" layoutX="50.0" layoutY="165.0" prefHeight="25.0" prefWidth="376.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
 												<Button fx:id="btnSaveCat" layoutX="200.0" layoutY="204.0" mnemonicParsing="false" onAction="#btnSaveCatAction" text="Kategorien speichern">
 													<font>
 														<Font name="Cantarell Regular" size="13.0" />
@@ -110,9 +131,12 @@
                            <content>
                               <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="327.0" prefWidth="564.0">
                                  <children>
-                                    <ChoiceBox fx:id="printerChoise" layoutX="298.0" layoutY="10.0" prefWidth="150.0" />
+                                    <ChoiceBox fx:id="printerChoise" layoutX="270.0" layoutY="10.0" prefHeight="25.0" prefWidth="178.0" />
                                     <Spinner fx:id="linesSpinner" layoutX="35.0" layoutY="10.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="92.0" />
-                                    <JFXTextField fx:id="tftheader" alignment="CENTER" layoutX="65.0" layoutY="90.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="377.0" />
+                                    <JFXTextField fx:id="tftheader" alignment="CENTER" layoutX="65.0" layoutY="90.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="377.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
                                     <JFXToggleButton fx:id="switchSeparate" layoutX="270.0" layoutY="170.0" text="Kategorien separat drucken">
                                        <font>
                                           <Font name="Cantarell Regular" size="18.0" />
@@ -155,7 +179,10 @@
                                     </Button>
                                     <Spinner fx:id="offsetHeaderSpinner" layoutX="324.0" layoutY="48.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="92.0" />
                                     <Spinner fx:id="offsetFooterSpinner" layoutX="35.0" layoutY="48.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="92.0" />
-                                    <JFXTextField fx:id="tftfooter" alignment="CENTER" layoutX="65.0" layoutY="130.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="377.0" />
+                                    <JFXTextField fx:id="tftfooter" alignment="CENTER" layoutX="65.0" layoutY="130.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="377.0">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font></JFXTextField>
                                  </children>
                               </AnchorPane>
                            </content>
@@ -171,67 +198,67 @@
 					<content>
 						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
 							<children>
-								<TreeTableView fx:id="entryTreeTable" layoutX="11.0" layoutY="10.0" prefHeight="502.0" prefWidth="1346.0">
+								<TreeTableView fx:id="entryTreeTable" layoutX="11.0" layoutY="10.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="502.0" prefWidth="1346.0">
 									<placeholder>
 										<Label text="" />
 									</placeholder>
 									<columns>
-										<TreeTableColumn fx:id="columnColor" editable="false" maxWidth="428.0" minWidth="119.333251953125" prefWidth="119.333251953125" resizable="false" sortable="false" text="Farbe" />
-										<TreeTableColumn fx:id="columnCat" editable="false" maxWidth="800.0" minWidth="94.0" prefWidth="300.0" resizable="false" sortable="false" text="Kategorie" />
-										<TreeTableColumn fx:id="columnPrize" editable="false" maxWidth="693.3333129882812" minWidth="44.33331298828125" prefWidth="140.33331298828125" resizable="false" sortable="false" text="Preis" />
-										<TreeTableColumn fx:id="columnPositionsEdit" editable="false" maxWidth="1581.6666870117188" minWidth="38.0" prefWidth="596.333251953125" resizable="false" sortable="false" text="Positionen" />
 										<TreeTableColumn fx:id="columnPosnumber" editable="false" maxWidth="1218.0" minWidth="59.0" prefWidth="165.0" resizable="false" sortable="false" text="Nummer" />
+										<TreeTableColumn fx:id="columnPositionsEdit" editable="false" maxWidth="1581.6666870117188" minWidth="38.0" prefWidth="596.333251953125" resizable="false" sortable="false" text="Positionen" />
+										<TreeTableColumn fx:id="columnPrize" editable="false" maxWidth="693.3333129882812" minWidth="44.33331298828125" prefWidth="140.33331298828125" resizable="false" sortable="false" text="Preis" />
+										<TreeTableColumn fx:id="columnCat" editable="false" maxWidth="800.0" minWidth="94.0" prefWidth="300.0" resizable="false" sortable="false" text="Kategorie" />
+										<TreeTableColumn fx:id="columnColor" editable="false" maxWidth="428.0" minWidth="119.333251953125" prefWidth="119.333251953125" resizable="false" sortable="false" text="Farbe" />
 									</columns>
 									<columnResizePolicy>
 										<TreeTableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
 									</columnResizePolicy>
 								</TreeTableView>
-								<Button fx:id="btnSaveEntry" layoutX="494.0" layoutY="631.0" mnemonicParsing="false" onAction="#btnSaveEntryAction" text="Ausgewählten Eintrag speichern">
+								<Button fx:id="btnClearEntry" layoutX="232.0" layoutY="590.0" mnemonicParsing="false" onAction="#btnClearEntryAction" text="Ausgewählten Eintrag zurücksetzten">
 									<font>
 										<Font name="Cantarell Regular" size="17.0" />
 									</font>
 								</Button>
-								<Button fx:id="btnClearEntry" layoutX="462.0" layoutY="525.0" mnemonicParsing="false" onAction="#btnClearEntryAction" text="Ausgewählten Eintrag zurücksetzten">
-									<font>
-										<Font name="Cantarell Regular" size="17.0" />
-									</font>
-								</Button>
-								<TitledPane fx:id="titledPaneEntry" alignment="CENTER" animated="false" collapsible="false" contentDisplay="CENTER" layoutX="792.0" layoutY="525.0" prefHeight="163.0" prefWidth="565.0" text="Eintrag editieren">
+								<TitledPane fx:id="titledPaneEntry" alignment="CENTER" animated="false" collapsible="false" contentDisplay="CENTER" layoutX="724.0" layoutY="525.0" prefHeight="163.0" prefWidth="633.0" text="Eintrag editieren">
 									<content>
-										<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+										<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="135.0" prefWidth="640.0">
 											<children>
-												<Label fx:id="labelNewPosition" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="455.0" layoutY="10.0" prefHeight="34.0" prefWidth="105.0" text="Position:">
+												<Label fx:id="labelNewPosition" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="516.0" layoutY="10.0" prefHeight="34.0" prefWidth="105.0" text="Position:">
 													<font>
 														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</Label>
-												<JFXTextField fx:id="tftNewPosition" alignment="CENTER" layoutX="160.0" layoutY="10.0" prefHeight="25.0" prefWidth="279.0">
+												<JFXTextField fx:id="tftNewPosition" alignment="CENTER" layoutX="307.0" layoutY="8.0" prefHeight="27.0" prefWidth="203.0">
 													<font>
 														<Font name="Cantarell Regular" size="13.0" />
 													</font>
 												</JFXTextField>
-												<Label fx:id="labelNewValue" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="442.0" layoutY="50.0" prefHeight="34.0" prefWidth="118.0" text="Preis in Euro:">
+												<Label fx:id="labelNewValue" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="504.0" layoutY="50.0" prefHeight="34.0" prefWidth="118.0" text="Preis in Euro:">
 													<font>
 														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</Label>
-												<JFXTextField fx:id="tftNewValue" alignment="CENTER" labelFloat="true" layoutX="380.0" layoutY="50.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="25.0" prefWidth="58.0">
+												<JFXTextField fx:id="tftNewValue" alignment="CENTER" labelFloat="true" layoutX="442.0" layoutY="42.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="27.0" prefWidth="66.0">
 													<font>
-														<Font name="Cantarell Regular" size="13.0" />
+														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</JFXTextField>
-												<Label fx:id="labelNewColor" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="455.0" layoutY="90.0" prefHeight="34.0" prefWidth="105.0" text="Farbe:">
+												<Label fx:id="labelNewColor" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="517.0" layoutY="90.0" prefHeight="34.0" prefWidth="105.0" text="Farbe:">
 													<font>
 														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</Label>
-												<ChoiceBox fx:id="colorChoise" layoutX="346.0" layoutY="90.0" prefHeight="25.0" prefWidth="96.0" />
-												<Label fx:id="labelSelectCat" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="204.0" layoutY="90.0" prefHeight="34.0" prefWidth="105.0" text="Kategorie:">
+												<ChoiceBox fx:id="colorChoise" layoutX="340.0" layoutY="90.0" prefHeight="25.0" prefWidth="169.0" />
+												<Label fx:id="labelSelectCat" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="185.0" layoutY="10.0" prefHeight="34.0" prefWidth="105.0" text="Kategorie:">
 													<font>
 														<Font name="Cantarell Regular" size="18.0" />
 													</font>
 												</Label>
-												<ChoiceBox fx:id="catChoise" layoutX="25.0" layoutY="90.0" prefHeight="25.0" prefWidth="180.0" />
+												<ChoiceBox fx:id="catChoise" layoutX="16.0" layoutY="10.0" prefHeight="25.0" prefWidth="180.0" />
+            								<Button fx:id="btnSaveEntry" layoutX="23.0" layoutY="86.0" mnemonicParsing="false" onAction="#btnSaveEntryAction" text="Ausgewählten Eintrag speichern">
+            									<font>
+            										<Font name="Cantarell Regular" size="17.0" />
+            									</font>
+            								</Button>
 											</children>
 										</AnchorPane>
 									</content>
@@ -247,16 +274,16 @@
 					<content>
 						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="850.0" prefWidth="1536.0">
 							<children>
-								<TreeTableView fx:id="jobsTreeTable" layoutX="11.0" layoutY="10.0" prefHeight="541.0" prefWidth="1346.0">
+								<TreeTableView fx:id="jobsTreeTable" layoutX="11.0" layoutY="10.0" nodeOrientation="LEFT_TO_RIGHT" prefHeight="541.0" prefWidth="1346.0">
 									<placeholder>
 										<Label text="" />
 									</placeholder>
 									<columns>
-										<TreeTableColumn fx:id="columnJobValue" editable="false" prefWidth="111.0" resizable="false" text="Betrag" />
-										<TreeTableColumn fx:id="columnState" editable="false" prefWidth="101.0" resizable="false" text="Zustand" />
-										<TreeTableColumn fx:id="columnPositions" editable="false" prefWidth="861.0" resizable="false" sortable="false" text="Positionen" />
-										<TreeTableColumn fx:id="columnTime" editable="false" prefWidth="159.0" resizable="false" text="Zeit" />
-										<TreeTableColumn fx:id="columnJobNumber" editable="false" maxWidth="3000.0" prefWidth="110.666748046875" resizable="false" text="Nummer" />
+										<TreeTableColumn fx:id="columnJobNumber" editable="false" maxWidth="3000.0" prefWidth="85.0" resizable="false" text="Nummer" />
+										<TreeTableColumn fx:id="columnTime" editable="false" prefWidth="160.0" resizable="false" text="Zeit" />
+										<TreeTableColumn fx:id="columnPositions" editable="false" prefWidth="856.0" resizable="false" sortable="false" text="Positionen" />
+										<TreeTableColumn fx:id="columnState" editable="false" prefWidth="116.0" resizable="false" text="Zustand" />
+										<TreeTableColumn fx:id="columnJobValue" editable="false" prefWidth="103.0" resizable="false" text="Betrag" />
 									</columns>
 								</TreeTableView>
 								<Button fx:id="btnReprintJob" layoutX="378.0" layoutY="603.0" mnemonicParsing="false" onAction="#btnReprintJobAction" text="Ausgewählter Auftrag drucken">
@@ -305,7 +332,7 @@
 					<content>
 						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="850.0" prefWidth="1536.0">
 							<children>
-								<TreeTableView fx:id="tableCurrentOrder" layoutX="15.0" layoutY="85.0" prefHeight="379.0" prefWidth="382.0">
+								<TreeTableView fx:id="tableCurrentOrder" layoutX="15.0" layoutY="85.0" prefHeight="358.0" prefWidth="382.0">
 									<placeholder>
 										<Label text="" />
 									</placeholder>
@@ -460,17 +487,17 @@
 										</JFXButton>
 									</children>
 								</GridPane>
-								<Button fx:id="btnPrintBill" contentDisplay="CENTER" defaultButton="true" graphicTextGap="1.0" layoutX="75.0" layoutY="599.0" maxHeight="88.0" minHeight="75.0" mnemonicParsing="false" onAction="#btnPrintBillAction" prefHeight="88.0" prefWidth="258.0" text="Drucken" textAlignment="CENTER" wrapText="true">
+								<Button fx:id="btnPrintBill" contentDisplay="CENTER" defaultButton="true" graphicTextGap="1.0" layoutX="75.0" layoutY="588.0" maxHeight="88.0" minHeight="75.0" mnemonicParsing="false" onAction="#btnPrintBillAction" prefHeight="88.0" prefWidth="258.0" text="Drucken" textAlignment="CENTER" wrapText="true">
 									<font>
 										<Font name="Cantarell Bold" size="48.0" />
 									</font>
 								</Button>
-								<Button fx:id="btnDeleteSelectedPosition" layoutX="43.0" layoutY="475.0" mnemonicParsing="false" onAction="#btnDeleteSelectedPositionAction" prefHeight="17.0" prefWidth="332.0" text="Ausgewählte Position löschen" textAlignment="CENTER">
+								<Button fx:id="btnDeleteSelectedPosition" layoutX="43.0" layoutY="458.0" mnemonicParsing="false" onAction="#btnDeleteSelectedPositionAction" prefHeight="17.0" prefWidth="332.0" text="Ausgewählte Position löschen" textAlignment="CENTER">
 									<font>
 										<Font name="Cantarell Regular" size="20.0" />
 									</font>
 								</Button>
-								<Label fx:id="labelAllPrize" alignment="CENTER" contentDisplay="CENTER" layoutX="10.0" layoutY="511.0" prefHeight="15.0" prefWidth="386.0" text="0,00 €" textAlignment="CENTER">
+								<Label fx:id="labelAllPrize" alignment="CENTER" contentDisplay="CENTER" layoutX="10.0" layoutY="496.0" prefHeight="15.0" prefWidth="386.0" text="0,00 €" textAlignment="CENTER">
 									<font>
 										<Font name="Cantarell Regular" size="70.0" />
 									</font>