From 1c6c5ba72e22e9ec07bda536dcd2c973261e9cda Mon Sep 17 00:00:00 2001
From: hendrik <hendrik@localhost>
Date: Sat, 31 Mar 2018 02:00:12 +0200
Subject: [PATCH] complete UI in 'Positionen'

---
 bin/application/Main.class                   | Bin 3527 -> 3431 bytes
 bin/application/MainWindow.fxml              |  71 +++++++++++++++---
 bin/application/MainWindowController$1.class | Bin 1865 -> 1865 bytes
 bin/application/MainWindowController.class   | Bin 15477 -> 16215 bytes
 src/application/Main.java                    |   4 +-
 src/application/MainWindow.fxml              |  71 +++++++++++++++---
 src/application/MainWindowController.java    |  74 ++++++++++++++++---
 7 files changed, 186 insertions(+), 34 deletions(-)

diff --git a/bin/application/Main.class b/bin/application/Main.class
index 7e0b408b878e829e88444f8d734357da05557c00..74c07522d5f629e78354c7857e39eee28f64b8e6 100644
GIT binary patch
delta 1357
zcmY*ZdsGxv82`<_W_G%O40Z&eLc)%1%Ko98lMq?)5M&_|2_eV^c31{>XK;2_)+kBr
zWlwb~qqn`Vv=Y<-rHq~yz3u(5e>?ei=k#Bv?=D%VGv|Kyo8P_P>vz9<PZ$2SRG$Cq
z<S77a@av@fhbLRY)dHk}x^$zOOlpqkUE!p?%Zln4)}ul|R!p<2O~ba#cwDnYGzci(
z+g!Xj2my@@egtIHqluvz*E_#^uNl38VI#5y$bGt%v|DY}vSldP#L&iJUqaOlZqm-M
znF9gc(CxMc4s|lz#39y~(kR*{wTGmLZUM@Gx=rm%hm*aUp@mzyl+lGP3|Y8EK>muz
z`3=rN-y*3CJq*2wI&;3taG!u2b!aHA_o}vT8fCr7q>O$Hh|nn%w+kDZ9d6qgVHiZ*
z3Hd_-14ANAr_+C#cPlJsm%k)nGo-N1Ipn{*EX}YzQ%kbn9F{SH+eO?aATQ%9t{Sm$
zZMs(*;?Wp(IG(_K;68@?aj$bGP%hPD55r#Ub8^H2-y;l<IxEHe?)?}S@wk9R|2b*h
zp0u?D!xMN?fY(gf0xrzd8P?5ki=`XHuBEAoN(oO>^g&HGwBpT8k>Z%vmolQ7u}sFZ
zI3VIV=YW`B`aEg`h(p{iZb*2Me#~T<p(cpR{dk#S0tcP5;@b7E3h+mCBbAnM7_W<X
z?f+TX<RQlJ1}r)}ZEH%6Cq+!2r;<{u)A^|#b-JaZCC3E>Q%TJ#>o<9v!<c56!3k%N
zRK9!)v;6#OB)mm^7VgoFa7%lWN<~{Trtmhy9NuxxNtMwlyvOi9;?$_NNkvlvGLB%D
zi_;7rVIQTO7>w$cgn4R*>I&k=j9F@;Mzz&{y@q+ye##JpEa7tjo@kV}-Ioks;f%98
zSXKHB!?*lob2aK+-h*VX89k~o$T|9+;RpP9^jxq=2wn*veZW0V&IK2ZDpfAlg|2W>
zJBRw?*bq8KgTxXSk<c_+7SvV_ySQ;->X=1W$I5Bk+`P(#stAhaqRd6?1QH&!)1FHR
zPx9Ht@C2j?xxaOiDgbt1Cv}|{1*A7452L_p%4Q9*xf;1Br-cfX;3}*_71m-M$!k%A
z>(Gd5x}CLj&FZj)F1ShM52Jw`Zon9=-i;<K%{&f%UK<KgL~||@6ygpFT>y<jkHJG8
zF2yd~NlA>sSBSgFR3HNoxt>3<Q^bgm)HdpQmE{S$ofIn>eE<*A1`mH9NIpcmkBml;
z0|-HSN<4&&E|Bx^II>71{+tOUrtp~Zl#6GS7iRF1@`{T?;|R^-2vIoIp&TP{2JSRY
zDsQ?t<>K9Ge8AcIuzdmw-==)bk<tvr{nPkF`OL)^|AbhWzV^=GJEtP6fB8@NnG)-y
Wlom8zR{*}nmDv{){!6Bavws7IfnE^+

delta 1389
zcmY*ZX;c+u7=Gq%bMKrFg%K0fw4<0v$^D^LLL4Yo1w_59mg&G9E(4djcxPBFjm)Cm
ziZ3iQTP&r$+y;~&+q9s4&o<k%{&!CQI=$Z|>vZn9@Au9#@Aodx_k44H_USpw#9t@I
z0W8Pwhm=2D0bjvDJv{=PxibsvjIiAz!IN3Eq}Er^cQ)}xK>^AbR-s5jz|!q9-H5c<
zew0h_x0dvjYnG*pm`a8<sN&h~#p&x9)+0wkQbe~4W2POCMWcFLMm0Cxi<4^^yznUq
zp`M`u8~6ctLGSep8!=6S(rm;nJ7jBdTY-vA44Vb)Y1a%>Y-wa@5`fPz4ZCKQfOLjt
z0kP&zo$6F;jbvreAZn}Dr8V~ittQ>ngCSuRM9|8Rgf<CjnH3iTc-WKdkD#5wM2v6q
z<Oa7$n67nnM2#lRHezOWlVvHe&?&>FQet1w)a_u+`U-|Fbn|nbEZ<h#B;!VYk@r&f
zHf-nl-UYs1hFh?MN4!h2cQV|Tn8j*|bt~w@oigr_Fe8yGs+o~saZi)pA*wOl#mBu9
zz5#~a;Cz>Fg+GM743A<TpY)~YJkIchNR`s1#~TeZtQTpvZZ>LWTLAm<w2Y@DB>$H;
zwAHe8n(Y7%@_F(l(lb0?PV+s77i2uoH_B-lFQQ6<+z~fSJ8JszGCjnsY*T9|zV_n~
z!(klZgYwGKV-ma-hS}MpU>L_`jQqcjO&KB#C$ODPNZ-<_MJ*YxUf|1!1xpNZG~+zo
zKX=wi(o?6U$Fo~vqRuehV0aU6@e2QnMPoQ64ynqIcSuG-nlZSxu2Q2h;tIwv!7z#U
z_(6Z}(lLC%@FBWMjdm=QXh6XzP6_h~!>8CsEw{IYjkq75^J#(kX<sq~p!o5%1XnmL
z6!Z<lxA=}12l6t0U^ts#Rwo$>IsMD5VB#l+pYh9)gMqnHpc)?f0ektRa&d1e@*L!6
z9mV`q6gwytp1RsWMb>2w)}BP@7-|Ts$s#k$L0#4`uA6di5U>MnY6*`b(s21Oj5SLg
zL{&-caFFdFejGh6+C^CjzgesfZXJTZg3{l92)z<@(vJaBl^f~g*J38wWz^wv;&B;L
zu!8Wbun;S;6gjv8SK}Jwp%VF6M_xUy#U>QeO)5qVC8YFH>_i#vp^M*-)g;4m?4jt{
zlyy1XUz!_pFqhU8?7-buQlLZyw&Gsg2N$JSh+Vj!n%PY)Jb(x3Z9fGE;QA8-GWtB^
zZYF6<Y=-m@pUD>VK8!~wz$HEdWCzLj(56022c!U1bP>`!Mbe%@B#}ovJ~o8*!+261
za`3GB(g<Erk2-J$ku{3ZhEa?)sIL(?g4c)fwtCvZyAIwT#z%s+kL!k@iZJyvfn+2g
yk)Qrws9!la^G}JX<$L!Ce&lCZ%c5U#jvCuQElqi1E+0Ipxzpwmem*h8Z+`<TVra1d

diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml
index 96fcfd8..4639820 100644
--- a/bin/application/MainWindow.fxml
+++ b/bin/application/MainWindow.fxml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXColorPicker?>
+<?import com.jfoenix.controls.JFXTextField?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tab?>
@@ -23,14 +25,63 @@
 					<content>
 						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
 							<children>
-								<Button fx:id="ueberbtn" layoutX="676.0" layoutY="315.0" mnemonicParsing="false" onAction="#ueberbtnAction" text="Über" />
+								<Button fx:id="ueberbtn" layoutX="664.0" layoutY="325.0" mnemonicParsing="false" onAction="#ueberbtnAction" text="Über" />
 							</children>
 						</AnchorPane>
 					</content>
 				</Tab>
 				<Tab text="Positionen bearbeiten">
 					<content>
-						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+						<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">
+                           <columns>
+                              <TreeTableColumn fx:id="columnColor" editable="false" prefWidth="135.0" resizable="false" sortable="false" text="Farbe" />
+                              <TreeTableColumn fx:id="columnPrize" editable="false" prefWidth="117.0" resizable="false" sortable="false" text="Preis" />
+                              <TreeTableColumn fx:id="columnPositionsEdit" editable="false" prefWidth="1002.666748046875" resizable="false" sortable="false" text="Positionen" />
+                              <TreeTableColumn fx:id="columnPosnumber" editable="false" maxWidth="3000.0" prefWidth="92.333251953125" resizable="false" sortable="false" text="Nummer" />
+                           </columns>
+                        </TreeTableView>
+                        <Button fx:id="btnSaveEntry" layoutX="66.0" layoutY="620.0" mnemonicParsing="false" onAction="#btnSaveEntryAction" text="Ausgewählten Eintrag speichern">
+                           <font>
+                              <Font name="Cantarell Regular" size="17.0" />
+                           </font>
+                        </Button>
+                        <Button fx:id="btnClearEntry" layoutX="437.0" layoutY="620.0" mnemonicParsing="false" onAction="#btnClearEntryAction" text="Ausgewählten Eintrag zurücksetzten">
+                           <font>
+                              <Font name="Cantarell Regular" size="17.0" />
+                           </font>
+                        </Button>
+                        <TitledPane alignment="CENTER" animated="false" collapsible="false" contentDisplay="CENTER" layoutX="792.0" layoutY="525.0" prefHeight="163.0" prefWidth="565.0" text="Eintrag editieren">
+                          <content>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                 <children>
+                                    <Label fx:id="lableNewPosition" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="455.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" layoutX="160.0" layoutY="10.0" prefHeight="25.0" prefWidth="279.0" />
+                                    <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:">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font>
+                                    </Label>
+                                    <JFXTextField fx:id="tftNewValue" layoutX="380.0" layoutY="50.0" prefHeight="25.0" prefWidth="58.0" />
+                                    <JFXColorPicker fx:id="colorChooser" layoutX="340.0" layoutY="90.0" />
+                                    <Label fx:id="lableNewColor" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="455.0" layoutY="90.0" prefHeight="34.0" prefWidth="105.0" text="Farbe:">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font>
+                                    </Label>
+                                 </children>
+                              </AnchorPane>
+                          </content>
+                           <font>
+                              <Font name="Cantarell Regular" size="13.0" />
+                           </font>
+                        </TitledPane>
+                     </children></AnchorPane>
 					</content>
 				</Tab>
 				<Tab text="Aufträge">
@@ -39,19 +90,19 @@
 							<children>
 								<TreeTableView fx:id="jobsTreeTable" layoutX="11.0" layoutY="10.0" prefHeight="541.0" prefWidth="1346.0">
 									<columns>
-										<TreeTableColumn fx:id="columnValue" editable="false" prefWidth="90.6666259765625" text="Betrag" />
-										<TreeTableColumn fx:id="columnState" editable="false" prefWidth="91.0" text="Zustand" />
-										<TreeTableColumn fx:id="columnPositions" editable="false" prefWidth="1140.333251953125" sortable="false" text="Positionen" />
-										<TreeTableColumn fx:id="columnTime" editable="false" prefWidth="121.666748046875" text="Zeit" />
-										<TreeTableColumn fx:id="columnNumber" editable="false" prefWidth="72.333251953125" text="Nummer" />
+										<TreeTableColumn fx:id="columnValue" editable="false" prefWidth="90.6666259765625" resizable="false" text="Betrag" />
+										<TreeTableColumn fx:id="columnState" editable="false" prefWidth="91.0" resizable="false" text="Zustand" />
+										<TreeTableColumn fx:id="columnPositions" editable="false" prefWidth="981.333251953125" resizable="false" sortable="false" text="Positionen" />
+										<TreeTableColumn fx:id="columnTime" editable="false" prefWidth="99.666748046875" resizable="false" text="Zeit" />
+										<TreeTableColumn fx:id="columnNumber" editable="false" maxWidth="3000.0" prefWidth="83.6666259765625" resizable="false" text="Nummer" />
 									</columns>
 								</TreeTableView>
-								<Button fx:id="btnReprintJob" layoutX="378.0" layoutY="603.0" mnemonicParsing="false" onAction="#btnReprintJobAction" text="Ausgewählter Auftrag Drucken">
+								<Button fx:id="btnReprintJob" layoutX="378.0" layoutY="603.0" mnemonicParsing="false" onAction="#btnReprintJobAction" text="Ausgewählter Auftrag drucken">
 									<font>
 										<Font name="Cantarell Regular" size="17.0" />
 									</font>
 								</Button>
-								<TitledPane fx:id="titlePaneStats" alignment="CENTER" collapsible="false" contentDisplay="CENTER" layoutX="992.0" layoutY="561.0" prefHeight="118.0" prefWidth="365.0" text="Statistik - 30.03..2018 15:15 Uhr">
+								<TitledPane fx:id="titlePaneStats" alignment="CENTER" collapsible="false" contentDisplay="CENTER" layoutX="992.0" layoutY="561.0" prefHeight="118.0" prefWidth="365.0" text="Statistik - 30.03.2018 15:15 Uhr">
 									<content>
 										<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="59.0" prefWidth="483.0">
 											<children>
@@ -74,7 +125,7 @@
 										</AnchorPane>
 									</content>
 								</TitledPane>
-								<Button fx:id="bntCancelJob" layoutX="44.0" layoutY="603.0" mnemonicParsing="false" onAction="#bntCancelJobAction" text="Ausgewählter Auftrag stonieren">
+								<Button fx:id="bntCancelJob" layoutX="44.0" layoutY="603.0" mnemonicParsing="false" onAction="#bntCancelJobAction" text="Ausgewählter Auftrag stornieren">
 									<font>
 										<Font name="Cantarell Regular" size="17.0" />
 									</font>
diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class
index a3bbdb661d3fe7a6c95a1970ffce503576c58cbe..92c6c2cd6e9f75506b874b1a7a65d3d36763102e 100644
GIT binary patch
delta 37
rcmX@fcam>|9~%=B&*T8MbRi}o1}-LH23{b|&m_X2!K5<zBwGUjkopGB

delta 37
scmX@fcam>|9~%?n^~nKj=|YTm8MqklG4KLue#ZL@8jK$%pJZzQ0NPs%ivR!s

diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class
index 8c288dd61b6fd62c90714669aea65b14c7f40c52..d81d294cda52ce0dc71b8df950a0543cd336f2a0 100644
GIT binary patch
literal 16215
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

literal 15477
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
J)>Jw7e*rVV8NC1i

diff --git a/src/application/Main.java b/src/application/Main.java
index cde511a..a3143c6 100644
--- a/src/application/Main.java
+++ b/src/application/Main.java
@@ -53,8 +53,8 @@ public class Main extends Application
 			AnchorPane pane = loader.load();
 			// Test
 			//Test
-			primaryStage.setWidth(1366);
-			primaryStage.setHeight(732);
+			//primaryStage.setWidth(1366);
+			//primaryStage.setHeight(732);
 			primaryStage.setTitle("jFxKasse"); // Title der Stage
 
 			mwc = loader.getController();
diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml
index 96fcfd8..4639820 100644
--- a/src/application/MainWindow.fxml
+++ b/src/application/MainWindow.fxml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXColorPicker?>
+<?import com.jfoenix.controls.JFXTextField?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tab?>
@@ -23,14 +25,63 @@
 					<content>
 						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
 							<children>
-								<Button fx:id="ueberbtn" layoutX="676.0" layoutY="315.0" mnemonicParsing="false" onAction="#ueberbtnAction" text="Über" />
+								<Button fx:id="ueberbtn" layoutX="664.0" layoutY="325.0" mnemonicParsing="false" onAction="#ueberbtnAction" text="Über" />
 							</children>
 						</AnchorPane>
 					</content>
 				</Tab>
 				<Tab text="Positionen bearbeiten">
 					<content>
-						<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+						<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">
+                           <columns>
+                              <TreeTableColumn fx:id="columnColor" editable="false" prefWidth="135.0" resizable="false" sortable="false" text="Farbe" />
+                              <TreeTableColumn fx:id="columnPrize" editable="false" prefWidth="117.0" resizable="false" sortable="false" text="Preis" />
+                              <TreeTableColumn fx:id="columnPositionsEdit" editable="false" prefWidth="1002.666748046875" resizable="false" sortable="false" text="Positionen" />
+                              <TreeTableColumn fx:id="columnPosnumber" editable="false" maxWidth="3000.0" prefWidth="92.333251953125" resizable="false" sortable="false" text="Nummer" />
+                           </columns>
+                        </TreeTableView>
+                        <Button fx:id="btnSaveEntry" layoutX="66.0" layoutY="620.0" mnemonicParsing="false" onAction="#btnSaveEntryAction" text="Ausgewählten Eintrag speichern">
+                           <font>
+                              <Font name="Cantarell Regular" size="17.0" />
+                           </font>
+                        </Button>
+                        <Button fx:id="btnClearEntry" layoutX="437.0" layoutY="620.0" mnemonicParsing="false" onAction="#btnClearEntryAction" text="Ausgewählten Eintrag zurücksetzten">
+                           <font>
+                              <Font name="Cantarell Regular" size="17.0" />
+                           </font>
+                        </Button>
+                        <TitledPane alignment="CENTER" animated="false" collapsible="false" contentDisplay="CENTER" layoutX="792.0" layoutY="525.0" prefHeight="163.0" prefWidth="565.0" text="Eintrag editieren">
+                          <content>
+                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                 <children>
+                                    <Label fx:id="lableNewPosition" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="455.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" layoutX="160.0" layoutY="10.0" prefHeight="25.0" prefWidth="279.0" />
+                                    <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:">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font>
+                                    </Label>
+                                    <JFXTextField fx:id="tftNewValue" layoutX="380.0" layoutY="50.0" prefHeight="25.0" prefWidth="58.0" />
+                                    <JFXColorPicker fx:id="colorChooser" layoutX="340.0" layoutY="90.0" />
+                                    <Label fx:id="lableNewColor" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="455.0" layoutY="90.0" prefHeight="34.0" prefWidth="105.0" text="Farbe:">
+                                       <font>
+                                          <Font name="Cantarell Regular" size="18.0" />
+                                       </font>
+                                    </Label>
+                                 </children>
+                              </AnchorPane>
+                          </content>
+                           <font>
+                              <Font name="Cantarell Regular" size="13.0" />
+                           </font>
+                        </TitledPane>
+                     </children></AnchorPane>
 					</content>
 				</Tab>
 				<Tab text="Aufträge">
@@ -39,19 +90,19 @@
 							<children>
 								<TreeTableView fx:id="jobsTreeTable" layoutX="11.0" layoutY="10.0" prefHeight="541.0" prefWidth="1346.0">
 									<columns>
-										<TreeTableColumn fx:id="columnValue" editable="false" prefWidth="90.6666259765625" text="Betrag" />
-										<TreeTableColumn fx:id="columnState" editable="false" prefWidth="91.0" text="Zustand" />
-										<TreeTableColumn fx:id="columnPositions" editable="false" prefWidth="1140.333251953125" sortable="false" text="Positionen" />
-										<TreeTableColumn fx:id="columnTime" editable="false" prefWidth="121.666748046875" text="Zeit" />
-										<TreeTableColumn fx:id="columnNumber" editable="false" prefWidth="72.333251953125" text="Nummer" />
+										<TreeTableColumn fx:id="columnValue" editable="false" prefWidth="90.6666259765625" resizable="false" text="Betrag" />
+										<TreeTableColumn fx:id="columnState" editable="false" prefWidth="91.0" resizable="false" text="Zustand" />
+										<TreeTableColumn fx:id="columnPositions" editable="false" prefWidth="981.333251953125" resizable="false" sortable="false" text="Positionen" />
+										<TreeTableColumn fx:id="columnTime" editable="false" prefWidth="99.666748046875" resizable="false" text="Zeit" />
+										<TreeTableColumn fx:id="columnNumber" editable="false" maxWidth="3000.0" prefWidth="83.6666259765625" resizable="false" text="Nummer" />
 									</columns>
 								</TreeTableView>
-								<Button fx:id="btnReprintJob" layoutX="378.0" layoutY="603.0" mnemonicParsing="false" onAction="#btnReprintJobAction" text="Ausgewählter Auftrag Drucken">
+								<Button fx:id="btnReprintJob" layoutX="378.0" layoutY="603.0" mnemonicParsing="false" onAction="#btnReprintJobAction" text="Ausgewählter Auftrag drucken">
 									<font>
 										<Font name="Cantarell Regular" size="17.0" />
 									</font>
 								</Button>
-								<TitledPane fx:id="titlePaneStats" alignment="CENTER" collapsible="false" contentDisplay="CENTER" layoutX="992.0" layoutY="561.0" prefHeight="118.0" prefWidth="365.0" text="Statistik - 30.03..2018 15:15 Uhr">
+								<TitledPane fx:id="titlePaneStats" alignment="CENTER" collapsible="false" contentDisplay="CENTER" layoutX="992.0" layoutY="561.0" prefHeight="118.0" prefWidth="365.0" text="Statistik - 30.03.2018 15:15 Uhr">
 									<content>
 										<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="59.0" prefWidth="483.0">
 											<children>
@@ -74,7 +125,7 @@
 										</AnchorPane>
 									</content>
 								</TitledPane>
-								<Button fx:id="bntCancelJob" layoutX="44.0" layoutY="603.0" mnemonicParsing="false" onAction="#bntCancelJobAction" text="Ausgewählter Auftrag stonieren">
+								<Button fx:id="bntCancelJob" layoutX="44.0" layoutY="603.0" mnemonicParsing="false" onAction="#bntCancelJobAction" text="Ausgewählter Auftrag stornieren">
 									<font>
 										<Font name="Cantarell Regular" size="17.0" />
 									</font>
diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index 1f56096..f185b20 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -14,6 +14,7 @@ import javafx.scene.control.TreeTableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TitledPane;
+import com.jfoenix.controls.JFXColorPicker;
 import java.awt.Desktop;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -85,6 +86,25 @@ public class MainWindowController
 	private TreeTableColumn<tableData, Integer> idSpalte02 = new TreeTableColumn<>(
 			"");
 
+	@FXML
+	private TreeTableView<tableData> entryTreeTable;
+
+	@FXML
+	private TreeTableColumn<tableData, String> columnColor;
+
+	@FXML
+	private TreeTableColumn<tableData, String> columnPrize;
+
+	@FXML
+	private TreeTableColumn<tableData, String> columnPositionsEdit;
+
+	@FXML
+	private TreeTableColumn<tableData, String> columnPosnumber;
+
+	@FXML
+	private TreeTableColumn<tableData, Integer> idSpalte03 = new TreeTableColumn<>(
+			"");
+
 	@FXML
 	private Button ueberbtn;
 
@@ -181,6 +201,12 @@ public class MainWindowController
 	@FXML
 	private Button btnCalcStats;
 
+	@FXML
+	private Button btnSaveEntry;
+
+	@FXML
+	private Button btnClearEntry;
+
 	@FXML
 	private Label labelAllPrize;
 
@@ -199,9 +225,27 @@ public class MainWindowController
 	@FXML
 	private Label lableAllValue;
 
+	@FXML
+	private Label lableNewPosition;
+
+	@FXML
+	private Label labelNewValue;
+
+	@FXML
+	private Label lableNewColor;
+
 	@FXML
 	private TitledPane titlePaneStats;
 
+	@FXML
+	private TextField tftNewPosition;
+
+	@FXML
+	private TextField tftNewValue;
+
+	@FXML
+	private JFXColorPicker colorChooser;
+
 	private Main main;
 
 	private DBController dbc;
@@ -225,8 +269,8 @@ public class MainWindowController
 
 		// Erstellt einen Dialog
 		Dialog<Pair<String, String>> dialog = new Dialog<>();
-		dialog.setTitle("Über PWMaster");
-		dialog.setHeaderText("Informationen und Lizenzen - Version 0.5");
+		dialog.setTitle("Über jFxKasse");
+		dialog.setHeaderText("Informationen und Lizenzen - Version 0.7 - UI Techdemo");
 
 		// Erzeugt den Button
 		dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK);
@@ -238,19 +282,28 @@ public class MainWindowController
 		grid.setPadding(new Insets(20, 150, 10, 10));
 
 		grid.add(new Label("Datenbank: sqlite.org - Public Domain"
-				+ "\nBASE64Decoder: java2s.com/Code/Jar/s/DownloadsunmiscBASE64Decoderjar.htm - GPLv2"
-				+ "\nCrypo: blog.axxg.de/ - Copyright  2013 AxxG  Alexander Grösel"
-				+ " \nzwei Faktoren: github.com/j256/two-factor-auth - ISC License"
 				+ " \nUI Design: eclipse.org/efxclipse/install.html - Eclipse Public License 1.0"
 				+ " \nUI - Datenbank Integration: basierend auf Project-HomeFlix - github.com/Seil0/Project-HomeFlix - GPLv3 \n"
-				+ " \nMaintainer: hendrik.schutter@icloud.com"
-				+ " \n(c) 2017 Hendrik Schutter"), 0, 0);
+				+ " \nMaintainer: hendrik.schutter@coptersicht.de"
+				+ " \n(c) 2018 Hendrik Schutter"), 0, 0);
 
 		dialog.getDialogPane().setContent(grid); // Setzt die GridPane auf die
-																// DialogPane
+		dialog.setResizable(true);							// DialogPane
 		dialog.showAndWait();
 	}
 
+	@FXML
+	public void btnSaveEntryAction(ActionEvent event)
+	{
+		System.out.println("Button!");
+	}
+
+	@FXML
+	public void btnClearEntryAction(ActionEvent event)
+	{
+		System.out.println("Button!");
+	}
+
 	@FXML
 	public void btnCalcStatsAction(ActionEvent event)
 	{
@@ -442,7 +495,7 @@ public class MainWindowController
 	public void fuelleTablle()
 	{ // Lädt die Datenbank in die Tabelle
 
-		//dbc.setSchluessel(schluessel);
+		// dbc.setSchluessel(schluessel);
 		for (int i = 0; i < dbc.ladeTabelle().size(); i++) {
 			tableData helpTableData = new tableData(
 					dbc.ladeTabelle().get(i).getID(),
@@ -477,7 +530,6 @@ public class MainWindowController
 						int selected = tableCurrentOrder.getSelectionModel()
 								.getSelectedIndex(); // get selected item
 						id = idSpalte01.getCellData(selected); // Ausgewählte Spalte
-	
 
 						try { // Setzt den entschlüsselten Inhalt in die Textfelder
 							// tf01.setText("Verschlüsseltes Passwort von " +
@@ -554,8 +606,6 @@ public class MainWindowController
 		}
 	}
 
-	
-
 	public void starteDB()
 	{ // Startet die Datenbank
 		dbc.verbindeDatenbank();