From 9da746d19b50a5bf2a1e4a061cc370acc2574c3e Mon Sep 17 00:00:00 2001 From: hendrik Date: Sat, 31 Mar 2018 00:35:45 +0200 Subject: [PATCH] =?UTF-8?q?completed=20UI=20"Auftr=C3=A4ge"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/application/Main.class | Bin 3431 -> 3527 bytes bin/application/MainWindow.fxml | 491 +++++++++-------- bin/application/MainWindowController$1.class | Bin 1939 -> 1865 bytes bin/application/MainWindowController.class | Bin 14902 -> 15477 bytes src/application/Main.java | 6 +- src/application/MainWindow.fxml | 523 ++++++++++--------- src/application/MainWindowController.java | 96 +++- 7 files changed, 604 insertions(+), 512 deletions(-) diff --git a/bin/application/Main.class b/bin/application/Main.class index aa3bcae46967a9d1fa21c769432de8472e4f5541..7e0b408b878e829e88444f8d734357da05557c00 100644 GIT binary patch delta 1523 zcmY+Ec~n$&6vsaghFRYExiC_KntIYwD49RhO3eeMAS$kii2J}ihSA{-&O8)NC9`O^ z@`Z(Fi>0&|rVo@b+qATO-?L5Y-%jWBU#I&9wbPk1zk7e*dw+NN{_gLc8**}}e(Im2 z$AAg^(W(EH5%3nbEs-tQDs$|#s#wIT*YJ#;p1;^z+~Jb&xIS|fbD3usW{$~QpjgOcjeb$XnwBuFWFj6nl0FvMX6BfIixpXT zbt+h*sAj3XKeM=Hxnc$VHT1ezGG$d*;iRP#WR+sI3ws*EG1EO#qo{QOZ_JEYl`~z) zP}I4Qs%tVN&!TXRtUjcX;F|FIa9wjKRcn|=sKQ-!qO4K$W35K+*zyYwcEmH#AEiNI zlCU>>ri9jM3`^?zUi-8+Z}MY`$K6ob>y2bh%#0Y*!uTjYj}bxq-T%Ezl0_=+V$ zr7`zvj@fzsVS|s$JT;|^WMO^6&C|sjiZ^-7F85EoqL&lyCC&5mj*L-AdJN64niG~b zk~+PdQk>>J`+$GSxL!U`e8>iwMk`T~EPFXt(S6fkk-a z2Yc+(`eiLSOm!$KIK+q?N*rdmT5y&_dBIf<^N&+;m`cGa3uGDWP*u>yvOaaC3p<4S zM5Kpk_0?U(=8kiS2en|ML!m?R2+bLCN}>wB)s+snbl@+S@V9l+qDdt?X_L{)Bv16k zTq5gusc?djIi74L3Vt1KA3 zWc*E=k5-SUt7X15HK^smPO)U9%hp9A1$pEv;-*q^4oUYA52taF8d09S+X~U+m`P;2{U6oq`^Es(a|I4!$N}cMGp~@pkZ} z!@Caeckz+S>Bm(a1YN)2XBQDSzWl!ke&z7Z`4oNPhsK6Li{AEr(7#Ro*)-FCP2agFO|x^(_w9Gi_xSzJch1?o-xtX< z|C~Mp;5z&^CjaG1m#{{F)LqeEt(vB0i|%E1zk6|h1;cu*7LXRvtaWk2O2ng4Eg_;x zK*539f^0toR5N(tlTnEphFaWW|KVOcw2@&G(gnz!dcw5oEj3}uP_UVyftx)sRX4ax zBSRB6_;f?J8mhRdh2d6iVx38ivTat|X%^8YKmvqLkqU_GB@v|=km8ny|@ zSr)pu!9LUc&~PEN5bCYUE;GClGtG%^%fTQGwe)ZF}vb@G6rymh}#8ZrD8=@ zBN8m{@6dXAHikjl<(u){$8bOHwa@uhN|o5pZ~zDG3^CX92*acHaxtgv5Jp5iE?~ib zLF#v!mKI}p0#6EX$CH+TOH(+5dOTQ{&<$cYp{cPF2~Sh@9!)p2f~J~KK}73J8ez>? zEaO=m7V(^YSj<`aJjw)!z1%NqNO+Nc;%2d-#)!&8c$r}oN9`9Hf$CJz+f|VTRga-D=_|9!aRNGSyP&qXv1?e#YR3Ea3|Qu5g&Q-B%1> zLhVS^vW@^;Cya&l&Gul<7hja7;!;kpMKJWiiD6(heLjU#f&?W5E`bHszDEzK5f&mO-H?^J{xun-33q!yPs^(gvbOkc$e&=EpmY@Vh zxPi1aD8*Wo;U-k$X1bzfbl1wU6%~lnP46Qf22q7!Y{1uY`f}b86?lm;W+`}VCBaO(lM-dyxW6Dzwo>5+y z#7oL64vvl>Foom9?|8Fvf{c?xa3*kCdCS2W2k%YbL(b(#jiXTbKIM~n3y)9ZQ{{69 zUtUNtC%$n{;(Lx_j`a#61q4sV7SfuKjb@^%1%>o96`_qNZY5f`p#~~pZD^;ZFfkrM wlpY$B=3T_;Ao0)HE}) + @@ -14,230 +15,268 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 8a325ad63afd0263274b22f0ce6c56e66339e808..a3bbdb661d3fe7a6c95a1970ffce503576c58cbe 100644 GIT binary patch delta 223 zcmXYpJ8l9|3`LJ;9)m!T;S+&GMW!IoqKK0434cgdk#(SKfacXKVw5h$^w3ACfGw~B z6webb?BnZuZNtMu>3I7|fEPZpctT{KB#OJA=KI(5MAo(te952P1<$!XJ{h%kY!bA$ zv64?&do5MvL|)Dmb%t`GEmtb;txHhlQ8&%f=M`}@V2I~vq~sIQV9XnaiK>OWtIt%) eFjLKAPTkE##8Sa%WW`3QqQ~@YS}mHqo7_L|>l}vw delta 263 zcmXYry-osA5QV?ly{tf1S5ZPjr5l69f(TMj$&U*7kJ{N8LQBH~D9>=?3s8wv1PY^x zy%s(aao9M;o$sDGbMF0Kv%&h$;^PY_bH9Qkgmy>5X{l$@NwQRZYSe}JW4GHI40aD~ z-{jHxYlm; T12^0%rBqwSE-S}2cP8-%Wk)0t diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 633a89c6c9fb1e7517e8ee2d0d0f52dcd57a8747..8c288dd61b6fd62c90714669aea65b14c7f40c52 100644 GIT binary patch literal 15477 zcmcIr34B~tx&OYKG&7ytrfpIRZD>1`wxns3$)qbyw=`*KO4635v<>E|7-XvL&Nn)=HYT5KS@Bab^mChy({|{nLqqf2 zNIW*uZyCub(*@3W=@2z+!%iBB)PR``b!5Asf6XvBYfnUmtmKH1Fu}GOG%yxQMa+Z= z&c>~@9dddcMh}cxawMIwW5edLSSr>ZH`@~l3+NCtm1PRU2gZiup?xQMx-np(ZJ=LA zI+-*R_Mv3dOfs!1o+sj{C3G}tnn$Jgv6y*UJYm!%D`Z;vyrDFN7_`eWo}&#B`~bF0D58oSF_z|CPR6%*Yt1!B?O5hHG! zEn%i3|Ed|g61F*LCY1u_owWK>ISn&aI|?~w#M4l(`_+rJ#MgYMEz2I3HsDZ>V&$21 z=i^{{xL;N?&wDGAKW&28Z$qYK-eT-Y+qRW}V)emfEb4rT)P z=HkyS#h+V?KQAu&47U`27IPIY<|4l9jUv&pihXvyz zTWYSNIJ-^2;%2rLTUE8Sj}EGtomNccZsZ!A?zkz&%H_o|ggKj*vo+E!>Ke65F@$2j z3hjrOZ7^36?T;`mEo$oAlegsPQZo>XnqDwCE4 z1HQsrC2~N!Y;zc>TW9Yvlfe=5GG`=djbI%XD~M3qj>SWVK{Ate%uJz!e>+@7B4+P| zd<|=lfvXNHYR)C5D|MPfRag`7Z8|4hnPkz96)~XZWK7n>C01=$FafHdt8{t+od{4r zMSTR7Io_?nL+NDF035=gX?L0fMmlc0u8V0=!&-;cg6?g?&X7(%@(bumolX(p7TF?Qn(3Sdhf(FV zU5mc0DYQZ{s?xphbRq5!1?!ZKC3((I44k) zyXfNXy!f6jN`PKVuk+D=6vL{RM5ou&f5Ik=ipMyFg)D+}0+=>;84I-&pqG&Cr~hI) zFVr7Pc&R|TyjiEW&|47!;S8Dy9G0f%#IdWLHi3A%PVb;=vAb<68%E_eRv|~C@ptNU zNHqR#_^BCpf}BJjy$7paXc%&Vg`eJsGu;xP>*)isJwC|P(9ktqsnaQIj|J#m^kEtF zktusBt4Ot{KC06Z>h;mba75I;m~xZ@bR%6Q;(S7<%Sq0$Jru*iUs+_XyaG@dftswV zZjU%Y$TCOcI27h6g0+xC-z)EJYmfQp(@gcAy6TJ>aceL@x6)O9$^iMkcOwW0W;eSu z+^*9da(?_N(>^M;*H34muCBy@l^j+9q?rh&6VYHdJVpY4f=$6=W-^87DA>}xNg(dh z>286T2Z;TqfirQ`9J8h69-Z!`&!I(3i{eELd)_QeJLdUL*f^i3FZ$>UFv+vXCU`o1 ziM|ZsFo_ej933Aqq3qSJ@xd$zjKrl%IE;`UXLVF;Wp^xPxB2KRGfk04n@ji8S9SUt zeH|X-(52Zhej5Mz5pC7<4SLu|523Hi|IAG2^awpFM=TnJ$Ao`qxUyhxW_R8dKKdqn zc9AyRRNxXsY@&()Jw{hm?OuhH2S4)l9i6^Q--CIO#ThhUU@IFsWt%@nKhWui*`{M? z^3jhmwF^IJ!kF2~@laO+BU4qoH#(SAyZi4^Zvpxd{X!1PF9F`ri5~~`37vjTPa^un zu)`2YWligssRHk+;FAok+n zbUzZhV5cRaLSRpO@7~QDJIx5ZW^!9lKwDGI5o^>vEkKCW4O)F^I!`c8+bv0 z=kr1zFJP(@jfIN)>Rc->!>2NrI70KfqC_U^`DzQ(nJiIq9?5>P-z)I#oj7HCh)jx6 zNuP4W!Zg>5*y=^x;6>c%Mcm{?-0Vf%;ziu*MZDO97;f<*hP{Yh5{11a3VTTu_L3;< zB~jQ*qOg}lVK0eVy(DV&lBm^7qE;`7TD>G{%}JyWq)mhfa=PM@Z}A45x~V6?n|O*_@RhP7Qn->dUJ6=qAch4S365clicl_g#ZvuGi} zhd zi98$8*?IZ6Qmr4XWxOAPwbc?aqHT-gIuElLHB8Zg9ieI<`wa2(NcooJ_$(f-(p4VO zsg4%aLMMZwn3PV7MPm><>ow5(h}R!*hDDOtE3GV2+gUnHDMrPpjWB%NQyuSPzF zxJgyNB+1L?$t`(K`%To$LnBVzWIS{PDaWBieB3!9*%56%My|cG@YH&xTdTqWzJ_0m zIF^xHuWl&XyIunjumR?f$;G=KvV8nZAB2x z0Kc8C^6@*}m^@@7mkagAhDX#fHutHt(9g)v1JP)6PfznWegb?Q0ye&m->dWc`29HA zPWp&)jPu4_|quB@Fb3AHX{$>=qjdB zK;S!czLU?&d6w+qsD&yf(>hlc;1y!EdC3#tyZEy{zB^l_m@-D^d*}qXM?{`7eT+Ok z7pZj}%84uUM}|;ZO5tEif!Roz8(MqKNK(9%j&Lw1ki@H5VT+hUKS{XqD*~5wg^!VV zJ5@DTIbDeyRDkc74B$ron$BP62gSbvU|-T2R$6c~0SPJ#2C1|8kcj+np)7@{_wu7U zKPF<&SD~l!NJo=K1Wvm;mhV{@;ug+;x)OTk!`}i$VITUDjU{cfbC1Lg-_`khGSR|O z+`HhKQM{m&!lGViCeN7ZLAU1*b^ej+iMom{0YpJhzY&Q*^{ZN#_D?_fQ?D=G!Z0Px;=sQE)$v3HxUI^vl`_6{?5<%_-S}D zSFYIy==={x3hXyh4i8c%b%M^EL&~|?Dee`caLJ@}&$LAy`{}aqZq*$YoKM=~iJnplj8N z=~EKJXIa5U>9x|yh$*fGfu&c#(kwdxu5}M$8-&C+p zMFXXBTiE@%H#$?!KDIEQa*-u=??pASZGM$DKNpTU%5cwR;V751KwBIj)|Tk}D}Dka z&s)GxxU}WErYYL8JnceV^DEj)(BKQZ5{T+L;s!iw%BMBBr?qGWy!7bP8c{M*4p!NX zBIUR$N9f@w9V_Kbwpl$G=ZSZS|mC>_OY+L2L7%ZTFz<@SyGVpzZRY?e?Ix z)1GPPxWj|i=|S7;LEGm+yTpUGpSq^ai^Npf4wT!}6Bq94iECi>L}-X7$%Sj~JRL2v z2_$!{=+Odeb(~IMhCY0)##4UgAkDhs7QATmJp3z$i)cMPUr|u8!4+0^$m0NzR=aVM zUf6g$851Z`qal2Q{iTKF;6SbJuIUJTMp`f6WxJH6s|dd(!g zq4td#dQ*npHbK{+>0Nzi>H5Bk+V|GJcaq*eNgtY^8$iCXZ<0PfK{w?&+yetg)JT=o z41?Q(`p+(^r`@y+&kG@H1B7kFvxOd}&Gabk!$rxZcwR=2(-3a^QfL+F#8g8T`Xqe{ zPo|sc7U-bR=s-7g(vSKU(N7l9&p^kYN&0z)eg*Px`f7hSNq?xQ z$j~1JvMEDP;raA&5xPPx%Qodreu4$~Dc*ht+xZJxM^DfO+$L_LC#fA*LMP~V_=S_F zD2nGGZhI_x8sa^pgcWr`2v=Bndlu3oilSj=)*$!>+QSuGNfkT?Jw-WATNT=veO}7J z4wjL)NxhZ*b*yK&CcjJpX<_7YKo@l{c6#PG2)G1ok;) zV%GtCQ3>qDWnwP@_RL zCHSr{6MGA=x0b*@zf9~Mz}{H`ds&&-9l-7^fxWy;>@Hv*D1p7AOzcCzK3oDjSSI%6 zz&=(2`+_pDuLSn^GOdURNgeJAi#{ z3GDS{VqXvJ_mseHDiiyI!2VDP?B+7DZv^(oN??b|#QqepZ!Uq|QYQ8UurnpF!-&AA zB@jqFs#M)*uwwfSbWC!b#@o0x!yD@}yzL&kKEu1G5;~_6EY@>e5eSI4xZr;bbrfbMD|VjqV`}fa4DB#TkCt zS-z&Pagtw?;n(G}j(t*T!{t~te}(G!0jlS((+Yl&R^fROe*+45h+6R6zz@?Fegw*R zn0E1_bQrf@QT`?+_**p2e^5$s62vpv1d-naOX1|smtmcy7FgZ5Zi3&^xPF3L^DNXz z6aNK@dWr)4*8=@k=aQdlxo=iVtCruR0UYz&=vo*4G!P_Rt3S(c@0;XnyU+4^+K;vm@CPwb z9Y%bJKMa&5Sl*AQUCMj|e-vLgVjR{KCsis1-v&F96Yi?xn~=QM@h3BU^L12vmOqWX zOxI2F#K9YAzWe!N`2_i3u%*9OBZW(v{O4riLlX`KBv81*u74jVi$iNZyNId3jP9r5x9+1>%6HQ zyNoKAKSR|%zUx_Rj0ztik$o-x;K}#mvXZ~VU!ErKgMg9Moi6YFuDlO)D|yu?t=ekZtgWG~+C`AN zfp%zX3zlw|E4Rq_O>9qwj5Y4t#rQuj-{${z&*x&QaHM_cS=2EgDkOxQ5cBa|4QI0u zA)Frv30CMk`F*Prb}dXk%}HpS?eBMIXa0T;qus@r?_m638k9N$+Gap)p&HG}VH~*m z4%`Ai|CoOQm~16VSeheeJHN4=72d2gfxV0&KjoiIA3~#3hwLgC@<04@cgPxS6Tnba zWBmmGA}_Wx&9`!60&;2Lj_JWuI9u45;a_L?56WEsIm3UGDV;s6hQq+*D@qIbS(ztS zM!|4U0J9(`R-6*!yNu-ZJF zO(OURoW~07Ty3dVuinnrR%k)>c7e7^Ta6toXSx!Bp!(4+($;G0XbC?_mbM-~=;eH+ J)>Jw7e*rVV8NC1i literal 14902 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 3a2116d..1f56096 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -13,6 +13,7 @@ import javafx.scene.control.TreeTableColumn; import javafx.scene.control.TreeTableView; import javafx.scene.control.TextField; import javafx.scene.control.TreeItem; +import javafx.scene.control.TitledPane; import java.awt.Desktop; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -59,7 +60,29 @@ public class MainWindowController private TreeTableColumn columnPosition; @FXML - private TreeTableColumn idSpalte = new TreeTableColumn<>( + private TreeTableColumn idSpalte01 = new TreeTableColumn<>( + ""); + + @FXML + private TreeTableView jobsTreeTable; + + @FXML + private TreeTableColumn columnValue; + + @FXML + private TreeTableColumn columnState; + + @FXML + private TreeTableColumn columnPositions; + + @FXML + private TreeTableColumn columnTime; + + @FXML + private TreeTableColumn columnNumber; + + @FXML + private TreeTableColumn idSpalte02 = new TreeTableColumn<>( ""); @FXML @@ -149,6 +172,15 @@ public class MainWindowController @FXML private Button btnLock; + @FXML + private Button btnReprintJob; + + @FXML + private Button bntCancelJob; + + @FXML + private Button btnCalcStats; + @FXML private Label labelAllPrize; @@ -158,25 +190,28 @@ public class MainWindowController @FXML private Label labelTime; + @FXML + private Label lableJobCount; + + @FXML + private Label labelAvgJob; + + @FXML + private Label lableAllValue; + + @FXML + private TitledPane titlePaneStats; + private Main main; private DBController dbc; - private String filepathXMLWin = "C:/ProgramData/PWMaster/config.xml"; // Pfad - // wo - // die - // XML - // liegt + // Pfad wo die XML liegt + private String filepathXMLWin = "C:/ProgramData/PWMaster/config.xml"; private String filepathXMLLinux = System.getProperty("user.home") + "/bin/PWMaster/config.xml"; // Pfad wo die XML liegt - private boolean showPasswort = false; - - private String schluessel; - - private String base32Secret; - private int id; @FXML @@ -216,6 +251,24 @@ public class MainWindowController dialog.showAndWait(); } + @FXML + public void btnCalcStatsAction(ActionEvent event) + { + System.out.println("Button!"); + } + + @FXML + public void btnReprintJobAction(ActionEvent event) + { + System.out.println("Button!"); + } + + @FXML + public void bntCancelJobAction(ActionEvent event) + { + System.out.println("Button!"); + } + @FXML public void btnLockAction(ActionEvent event) { @@ -389,7 +442,7 @@ public class MainWindowController public void fuelleTablle() { // Lädt die Datenbank in die Tabelle - dbc.setSchluessel(schluessel); + //dbc.setSchluessel(schluessel); for (int i = 0; i < dbc.ladeTabelle().size(); i++) { tableData helpTableData = new tableData( dbc.ladeTabelle().get(i).getID(), @@ -406,13 +459,13 @@ public class MainWindowController tableCurrentOrder.setEditable(false); // Setzt die Textfelder - idSpalte.setCellValueFactory( + idSpalte01.setCellValueFactory( cellData -> cellData.getValue().getValue().idProperty().asObject()); columnQuantity.setCellValueFactory( cellData -> cellData.getValue().getValue().datumProperty()); columnPosition.setCellValueFactory( cellData -> cellData.getValue().getValue().kontoProperty()); - tableCurrentOrder.getColumns().add(idSpalte); + tableCurrentOrder.getColumns().add(idSpalte01); tableCurrentOrder.getColumns().get(2).setVisible(false); tableCurrentOrder.getSelectionModel().selectedItemProperty() .addListener(new ChangeListener() { @@ -423,8 +476,8 @@ public class MainWindowController // last = selected; //for auto-play int selected = tableCurrentOrder.getSelectionModel() .getSelectedIndex(); // get selected item - id = idSpalte.getCellData(selected); // Ausgewählte Spalte - showPasswort = false; + id = idSpalte01.getCellData(selected); // Ausgewählte Spalte + try { // Setzt den entschlüsselten Inhalt in die Textfelder // tf01.setText("Verschlüsseltes Passwort von " + @@ -501,10 +554,7 @@ public class MainWindowController } } - public String getSchluesselXML() - { // Gibt den Schlüssel zurück für die Main - return schluessel; - } + public void starteDB() { // Startet die Datenbank @@ -517,8 +567,4 @@ public class MainWindowController dbc.verbindeDatenbank(); } - public String getbase32Secret() - { // Gibt den base32Secret zurück für die Main - return base32Secret; - } }