From 52907325982c8c5a02edbe748d462d992afb8516 Mon Sep 17 00:00:00 2001 From: Maximilian Date: Fri, 14 Jun 2024 07:28:34 +0200 Subject: [PATCH] Funktionen angepasst --- bin/controllers/FlightController.class | Bin 952 -> 2533 bytes bin/resources/icons/exit_icon.png | Bin 0 -> 7270 bytes bin/views/AddFlightScreen.class | Bin 15226 -> 15226 bytes bin/views/DeletePilotScreen.class | Bin 5478 -> 5426 bytes bin/views/EditFlightScreen.class | Bin 11094 -> 11042 bytes bin/views/HelpScreen.class | Bin 3141 -> 2998 bytes bin/views/HomeScreen.class | Bin 7957 -> 7908 bytes bin/views/ManagePilotProfileScreen.class | Bin 11097 -> 10949 bytes bin/views/PilotView.class | Bin 5603 -> 5373 bytes pilots.xml | 16 ++++++-- src/controllers/FlightController.java | 46 ++++++++++++++++------- src/resources/icons/exit_icon.png | Bin 0 -> 7270 bytes src/views/AddFlightScreen.java | 2 +- src/views/DeletePilotScreen.java | 2 +- src/views/EditFlightScreen.java | 4 +- src/views/HelpScreen.java | 6 +-- src/views/HomeScreen.java | 14 +++---- src/views/ManagePilotProfileScreen.java | 10 ++--- src/views/PilotView.java | 26 ++++++------- 19 files changed, 75 insertions(+), 51 deletions(-) create mode 100644 bin/resources/icons/exit_icon.png create mode 100644 src/resources/icons/exit_icon.png diff --git a/bin/controllers/FlightController.class b/bin/controllers/FlightController.class index 520767cd9e16eb1d0f9d5465776b83582d65cf9c..43dc06a0225918d9dbe9dd0e640be99ba860e929 100644 GIT binary patch literal 2533 zcma)7ZF3V<6n<`+benWrN=u7HT0(g1TgZrr*di4BVu8Nd#8kw$O>)yNYeW*i+YjLz@_{5Adp@wqqKG(rn>rklI>o^zh(Jm;LdfB*aEQvlboWgsSS zyzIH5?>Ub2gWSAhZ)}D$%^d@Afu6h8H&)KE+>P8y>8>n?0$rh9lk=Wmv%*mN0;d%L73T2_yYD%E}itXCrRe`pV(V{?n#;eE_+R$mjKt~6<1QH7ileJn3hj7?H zk3ikegUs61Qut`FZ(uUAkpC z^*Rc+%G^YlO5rR<44k8edjxhBFfocT0iz_t`%+Sn)rf)ar%=|mJl}G1g=o=A?D6dtjI`xfjrOh7ieX#@rrsdwNyVWpg z*d&6`@@d=OqRd{>j4$1aK&KrPEyu1Xt!djT?{05?%4ty93JCtU=J4D&{lBhktFC-# zmG3QCTTwf91u~rTeb3K_4^+>dY`|5wb3s|UG8c7eE*kQw(P9Ut1qQO!?QF^OE7H%F zJ;(DW)4r@wxDPOEV21aEs@p+POw3_kpo7>E?7mrY<`Y$0I@DxXD|S#k=G9Ynq~*^m zYaNo+%8cB3xtF?B+BE>JPrSm|z#^L=*!1pS=iSF5zUCMf4SXbUY+pHaq$KkA*g%2T z;=x9zwQ1qO7N@U>bqX`Lwzje+aCZL`wfUYC3$u#b>e^)Ij2=+p=Y2+t%Ih-|pYIl{ zV22KG;8lES;w!bOx@SRJ?1F;a4%JD?L|L75^F;NGbi>^vQmsPjr>PUa2Q zmHv!l1%aCEWK&<9;xN&LP8{W)+3>&{7~~t<0dLa!IM;E$4e7WKxlV8=Gd}h^jy%DM<%wu98P5*J zpWw_6#(zA5oc9Z@TCon%zXyFdtg$XOqC{AXhqrJ+<7eErYQH-pADl`5Mn+JTu07ukGOao~S9kJxr$)8e*Vf)`T$dAr=_qJKVs{ zDA*6QQRPdI-=0i7y%cY|`ZIb46GIo4CIo|j-zJ9o<3Bz7N1?PPl%bHPm{x{ZXIc_U zH__6#g+-zqrql|zkq|jOqXz8;gn=ap{nVvj#!AHLA(515>A$dg`!}pT#wW|!@g3aB zlF}F1i5*zk9aPr$GC!ts7@@$UEb UEUjvt8eIOS$SKc}^`-~^15`6+s{jB1 literal 952 zcmaJ}X(E{T z;1BRe8PCivRaas*nY~}j(OG=5h?Gze zxO*O42Hh~2jJj|7=V}lO6vxw{3I!@XYuo^j1PYg0eGsVj%>O3t(`Ihzg`Vj6rNC}8 zgZsC-<&*1#DjxDEOSo7T$TwTQ3w9(?#FDY95+yjM5j|0_=i|PL-Ua5c!E|5O-?Gi28lL0 z0&7D(y9k4i=_OSh=#Yb{W*1}D;JuyBqk%frW~{aB6FD?WsYqlfZP6pO6MB)ehYX^85swwmbh+xcR}o88xKe$C~0nGx_)MTz%g{!c=U;} v9P!{yO$&9)B(3eFOagmsKEXd{wW*WDuOuA%*^V}-wD|{*T<{!NwWq%Tr_a73 diff --git a/bin/resources/icons/exit_icon.png b/bin/resources/icons/exit_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..57ce87c649431d80e3a2effb12d1186a20c3a2cc GIT binary patch literal 7270 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 NC_j$9=%p$z+Lx%tW delta 1469 zcmY*YX>e0j6#h<z>0vLS1U9Ax%b@jo%5Y@&v$P}@JP_P z=iIjK047qn-5FHE8s-u5L$g~$*Vfj}ZHUL_Me9R#u}Cal8W=ozRK>*=72}+!M!t$x z4wN&T`EDm#;Iftl0t>N7HYf!nTF@r27>fvc!bp}I(WDXAaSd)3xCQkDt!hT))zc}S9;4zO9a>8*V5t|pUGZNuMa(=`}46jQhoOm2hs8~&K&$4M%FD4dL=gZ6YD? zB%YEb+Q__TutvqR1kn=_HIm^gE}tf_7VG2!EvT%=3o4$M>$O7r25giEwLqX9n^bfV zyjI5SR<2juV1#E{tH5S#kv@H>(vFls=cbAJUZQ<6%Qe+;fRHDT>pAjzm#QDa2P)nt z6!dyB!2;;JsLcA^WP3w(h*o+Qt=sxcWc zEa#U3Us=vfc1|&B>y3Do(VDc7Zv?)zkSt4%7|Rh&{s$cu_zvI8dT~JcP2hK&kmEB8 zLZ^5hO|g0-k_cBeMq)`9-bJ^-pV&xH;zm=fnJX6IFRRBha#?1ca!%lHg4~cfdJNeJ zp5{iQB@vzyYcgim#SJ6sBqE0uu345MkPV@c#&i|NbrB=3ky8%H8m0(=_po11&swYW zCBI7jgm;Zj}al$lL21BB&2}*;l|m zzRJ{S)QI=!ZX{F+5{Ag-?!L0pou#N$Vm)Q+xZ1Nq9}5jmfC93#Pe+?y^(IX;r_oZA z!u(RrulW@dH}IyKxY4h4;HFO8>Q~ZetnuN>6q-75dm2k?{F)E<_^>>M6{WggH*sIk z#7gfYCLS~K^j17)!>r(DWLnURmSMtd=bz|+o7XwWzOr!qso}+_zs*bb@&~-5G?UK zw&D*Scp61DB`KWt20C#zO;lqIK1FtuGS(n7m`!Rn=_a`>A?!Uu4B{&Tg|gB&Vp1k$ zu~)|^a+9a`k}lZJV5EwZr=fdn)|=~XrJO@;oa+968M)h6RBjOw?3B&8jeL~DJ5Q1> hU|&96NP~K;!Bj{?sfaNzW5qO#Lh!RpT{OJR{|_YqVC4V+ diff --git a/bin/views/EditFlightScreen.class b/bin/views/EditFlightScreen.class index 0e6714be55924d355e08806f0bd660bdeea690a3..1de65f9473369103bffabaa35a03fe85a6834749 100644 GIT binary patch delta 3222 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 delta 988 zcmZ{i+jCP@6vlri=aw9glMpjg(-BM!(vUVDDi=*VTzUaPD^?=ZwCWhr)7TOcnjA{2 zXc5KxeItT5DqcZF%P^-S9UNbL(Eq?U{t6vm9QUc086Vsad#_pRTi;&ax3}N&ZN^o^|^({p|-sy8&E_;P8@Y%RT zzL=oLxXR|D+EFNKorR*FD=f0LTT5z}==0f`)Rq{OsNIVU`4o~`eAuVB#7HrzC3q;o zBa1xRttWM#a@MC3Kj3rFr}-VTA%?S;xjrb(1%V&s#Dbh9L{#p5#KcvrWo{)oR>?1# zqCgv?+`=Sjrnr^ktl3Wy=Z3nc#pFKXo7 diff --git a/bin/views/HomeScreen.class b/bin/views/HomeScreen.class index 6ba4a86edbb5e40a14dd57430e238470804bc633..91a52f9169946325e1e7da237673b58872ef2420 100644 GIT binary patch delta 3338 zcmZWs33yc175>j`Zj-4y|S1B_a2i?!NCyV*^vR_&rz?P81C+H>Db2w(ZWeDD2p&VSE6|2g-b zncOz-y?Xa6|2^_NfO9Cl-~Fk@m%A(yjVJY3X*d?ud-RwS)5TF+<-rDPfW&^Aj~0sp zYc(wqpV-PBO)8qvB8u(xj#iwnV3}BFFSWLzU2L~c?`_J51^lqehfO~0XmVl|!M129 zl5}DXVN!5FPs9fYy7WXa(iM*-f;zj_Nm$z->v3W&!7tgR$zHuQ+}|IKbcK_Vcq|_d zG${xZip4I)pSO4*(!DGk)7@APkAiM-%sxfyLaz!15#F(4VdZk^+o&RnJ~7KtQ@b8< z75&nyB=lrsPq<$a22>K4QM{_+hbYPvs3Ve$a($2D$0~jz4!Va5yn1&e zX`bc8{A7$2_>O$wc__M6fU&Kna#P*RqS4_%T z9?`eB@ge>yeV>Ru>Zxaah|g5~O`Z{zdvk6i*{I9@NY+18{8KtS8OMr9ce2-wR{Tq@ z{x_jQ+?VeYdEN=OFXRS$atlO**X2D1O|t%@;=lM>EcZ^c5Q!0Q+vHYEax}yn_=6z5A321Sq75{W;~{LdflCl1h`QRJ@;4Gr5&cRjG{J1UKi@5{b1( zwsECe=`@w5a)dK-7ul)^MVw2K(?tQQRj5YXom*)Q(&^&m+&SJ#n#S4FbV6lCGt;Il zp37H>D)A~mXqHN|Wf#00y-^Q$>jNG7P*Qs4s8lCCIqX>wkMT@Nj=IiLsh;MEt$A0| zBJp)zk#`|2mKAckX(5l6spF>8Qn6}W@%R>6?4}l4!d;Gr`#QVBQ>H1@E_RG78*Y=X zwi8{`6P#nfat-_CbWGF^^_525)J+#Dr1Om!Oh%%K;L4U}8ABgXsfT*S&ipwOH*jJ4`0BGa za~9ncp{PoI6cg{|m(A*@0fjbkjm(Q6!vvcniKI#iO7fYFBo_7cC;7fxEBIot+RZ9$ zp&?Q4tMzZ=&`o+Irk9$Lc~a9QV%Rs^ahXcxR3V=A)f9~uZ5Ce*x=N+1p%Uy}(Rf09 z;G5|fp&bg{AWrd@TW_SBM3et*x?ThdiidZ)!3R*K`LrNcp z?osJ{({}fm?S7S(o3{JLY!9il+O$15W_w(v^``ByG24E%l(w73r`X7sY)LGp516Ay zPbg#%P7|;DOFW4w&GGog!G47f9n2kXq2WdYQ|pvK)e)Qr7+6}vsKZ2>jo}3uXlJ-Q z104)kWT3)ur3tI@L;0)oFO;#Inv>1zOmiCRLn(CDxinWAT_Hd86nYG7&|C}+#5C8i z2{vi214tU!rnv%EtAWcjSB)+6)@)XrY0wl~7TB%!jKyh_AdT%Zvi&(+6|z>hhisaw zJ%wxP+?v}AdVLxroW+hhkLJk+`Mn1Q{RDfSg^8Ga3~gD{cL*H7^?{?eaH+wgNnR!pN9e!<9wdDMwt zGP0wQR^kmt4s=j6e#J<^ULIn9gwDz7FF zshkeyKwd@`6Xh_nGUq(Xr93V|G0vuOB!38#~v-!zy;M45el;NZCQsn1Sq!bd!3bAK}*wa)P@>5ZYiVZ5^0+9SO=#()y zMdVDB5;tHCHgdhA7(kyXbzUZ=<5CArfl}%qNr4t->83y{ideoBXk&r(ra(I^avo&` zUc%+D@ygOPRfY~wb&AedT2pP%j2gb!Gi#gygU+lmXs&p1V*S$BvK1|*v(0ThD4+&9 z2i81`98KAf3pk{#c5a#$hUB?T(YXdS?q`z)x%_l65hxe$luW2RkD5TdoTu2y%UiO` zTMb$!<`!2RXY+hJncbFUcNlbm*l_}zC*R5J61O*&nJ2bP%E{!wv;Ym$<=oXPID`k5uMkiu z@&#O6R-W70^v>e9?26NzBy{Efw_~Omdwhm-{AfAJ6bdU{!)q;cEnUZNzH4+dR$FNo z-AcDHw9@T#7wtCDH|Sp4W1_wEO?tpY-=c@<5feR1PtcPl+D8ZIAU)0D_}>zGhEjAG N8vov@q$3U5{{RM@?E3%! delta 3390 zcmai1d3;pW75>i5n|U*n8Gc!ZEdD4A>w5D5|uhE0M5f=mD>DlkcgFff@3nE?VW zK@mmVxuO;~YE|5o#TQ`IYOS`~y40@L)?#ZHsN&IgUVXLw%w>ge+TX413!J)hW$M=p*;NWw=cdr5-r;p?%NcK@^2UFoGjgjysd5cycJG6XS zAhYe2v{2r!RXAG(7UKf>rq<{VV5yEaLb05w6*~l$VY!^@s4Hpp!UkUKYSGl

U0- zI#$Zp9p%my$kNdvPdLUKA*>eA(M`~Nb1Ij4umTZ*wOA)7J8LJdK#xF7Y4t=n+1wrK zRR+BR>xX2^Sms6o8+0V)4bD;ajo2jjImfwHV6(s$Tq@so*6@$Z1+Kt=bn4@@D+#0I zTaJPS%Vx#WKBe^I!SSAku_#=bchwVY;gwhDGDHtV>K zFjo1Kdv%e$16dyIzzqU7;wE`Suc+IBTLf;!O#~NnSQ6=8lT-mqf!nZ&;BISOymHC> zdChI=z1vmHcgTF#bk`2tC2%+Hk!`MX={|XztI~BZ9#kJsXBUhvI zae*iBr1ZPTo%J-K@RajRBsWLHiHV(wga-$3NXJ1!j$-4FhGO0R+0jrUA@B@Lxzjy$ z^kE#;afBc&i&!}6U%I44Acbe;JMJpy^LRnWccj}hq45g5$Q${r#H3xdcB~C|CeN;H z_uwVGtmAtG?@-#3q3*ChpjLrb@O>HeR2092R|Q_f=yYP*BFQMH{U!WJ;C1<=r(bvX zs;W-N@~lGHlyx7yFOOxFxDMd=0w3TH(jn%!j^R%#A%B(^h!XmXjEiz{93LssUkN2X zxqgH(%Q~pz_?y5ds%Qis!g-NoGgtqbqzA|G4}pIwMOIp|Jkph1<3RwQDmVWk_PC+`k zT=ED+hkNeR$6LF3s& zRnA=U$=;k&cNNv>RL!l+%~vR&$jP(U(nR@U&U8^hlQ?pkOsMq9Cas8-IrCH!r~~=RF*5LQ&1NKA-5}%=#7Rp^Nh5N62l?YyNIj9lP<=I{XJ0+MQEK) zYvm+wfjvq+a-Mg3ah&tn!-FH5@TVPkC`RiA^-)6JTii8 zl7jkaGf%fjVs1}wl9AoV{lmmB6?7S0E>CzT77VcK1>s2Sp5PdDmxgZwnV!hRFoEK3WH(av3kV+L;Zfao?sO*At{Cz(q#bIFo@Q_%UA z?9O4?y@FaT**(LuZwqR(WcLrt9u^d|Wc!9?PY7CJ$sQk;9pJ_cTf+S;!OTSg94gKQPC{ga*CJ+w48x+oG_mrs^mb0VbBzGP=-0hQ=_M zh7N}9Y3O8lQ5xzDFHS=j!%Hlf!iwM^RyDW{cM73k0Xhc}HnGNVGc*x3+yfSf8}0+> zGtqCjYwUItml^I_E&Vh!yJiUtUCRKM-I10!GzC)FsysWM!&O0hbs(r2?!X|fZtxf$ z%jvZ#?BFPNHe?xDhR4M9{BWAM*>E1fuE1gJHk|3;?&RPOV^0eA292x&>@C3kgLt4p z7{bK9Die=+pE9xE#NZJ;XT$QUL&#RD?<(LeGVuciO#D#RkD6360juESFKZ=|sKNlM zu@g1ejaux*M7eF$rhzx`Cirts+wm5D%-`?{v;}W7vSSLx@DoNFW>5!y%E*Ccx)48O z$0};VFBrLS2p{2>cn5Csp&!4(yYSF-bmQ0f4YDYX$#@UHh2UL$91(v8 zfe?LFdArYf}>` z<8n5;RLRas(X61V+CiFQ(s{CDjIXkp=7ZRpXVvM}3o_OVO~!nJ8S5n` z1*BFo?3?G?>DEg#*2_)0P%bU;4GcxXlkarv_Kfw#CS9_hso0RitCJ1EeWt3dC{6L? z8RXEALmr!_J6xG@7&58DayW2`$J+nnk!Nnk;~q|}op+y>Ppc2pninXxu;vw%^C9&f zp(J4s3R844F)ZG)57|}ubVWXGHR&p~v)$Tw^ng`Ee!kL7;u@LEeLIDj)uA3!t!T>9 z`<&!AEzOVZYv^j8DmJ=?on^uHCHV3Z`+}R^PS>)?Mmy*_esVj~EiBtbyXkfd-9dZk zE(_gF_sycc7W@`HKo45zA$o)!wa{bqBt2!Jr|BRaqG#A0{}17UJWNMnP!(TqQccGH E08ZQYEdT%j diff --git a/bin/views/ManagePilotProfileScreen.class b/bin/views/ManagePilotProfileScreen.class index 656ab6a241151b867a8621671ab5e203b48324c9..943f2439c3cfe6d3ee32e257618aa91341b64fb3 100644 GIT binary patch delta 4599 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 delta 4508 zcmb7H33yXg7XD9~-XZJMT~kJ3d2nx@navKNGc)IluEP(+I?26#XuO>2^}iV++| zMMb=>ptxIi1vCYU%2LDy+;K<24Z#JS(GeYIm~&rJit;(%Ouu~Zo%f&R-h1wU?mgXc z&U+J_Fa3MdvjB$D;kC{wwjnBlgu?Qf^UJ3Nrq7ubX=n=1D4*UCYKT-8pK_-8H_(ZZ zn4=+tB7zz8xa8v^4G~1eYFpR7^=Q&C7g2(PJ@ngnLt*Jh9y!2b7;e1?7C=&zh-P~gvq614ONc<8Faa=0=_93S&C3r3j z%ni((UlE;dgpGW#%O02dQ*_U9shHJzYdnfyK8dl(X zvDbbI-5^NmY`+mVE4WFVqw(+^%3XL6bvOgpF9mIpbnbO04 zmxjA>kJzXb+wa2z3hoylE1lAs@u2uwDPibg4UeqvuFfTTR@~vpr!8WmqrkdN=4oYK z;W#JS@VtT@9KXI{h7pQZj17hwVj6a04MCY@#6}0|4HYjE;KWuGN{3wKn}(cz`yZ%n4zMk6?Vwh;-d_<_*(4~W~lSI_EU0|pjLbd z08!R@BV#LBI}y6@zUGJ_ZkJuxs59k@vF^&gTd6>!!uBm4&%-;(O~o3WL?`pM1f$jU zjj;uUG+*gNCy2Ug)Q!4}E$+TnAK_$ijrZg|joRrE zgLz4l=>mBWs8X7yAsd=XGuZM>V|K_0&oGLsIcb4uhLcKYrbe^ct85h47?VJ5O;Do? zX^uFQ-9NpaU^hJ@Dm91-?_jz}guUm}T=9}OKP?w?#1ZcV>mr3N5o0J%tjMvs9CRry zRcHyJtI3lUIawK((O(I+>T%=7j3aax*XQN3X{KwSlNQqzG84(hVSxi@HbanfI zJ3bf-@iZ6HH5y$j!F1042qQ4Vh$QK?m{w?Xy%?ICqb{Z!G!k^9n3B8QeuqYD=uT16 zsjK&H_Bz`LhK=H(P0@LQ*&&tg6;nI?Y~M?iUI#gY77jy+J};M?U#vAfH%xNi5%PT;~;)YrA3p;FNm-IhQjzw8ObblW=2+kl0- ztre5&yr^kGU;`GnVo9B@cyXB*m$zV9rK+n5TwgOAQgyEs z5_o7W51WQeeojO#Kf6HeD)7g9;yU!gE$EFk=!5&w7muMIHe&$a6_xl5r{fz8#t(eB zx!Gw_a`woAhrf6oc$DqAUhx$k#}j-Sd-z;`5^H&=o_w6I!+Jg&N3hLPEZNYA%keZ4 zu=9vh(1HzdF00+}VIwwiYFas@#^I7dHggc-V$0(#IP{g~c*?etlf0F8;q^*;yP%YN-bmmr z-RjvRUpCJ>@@4nDCtr%^1Aet)FZ+C4skRFap2JBp>-%^j`!}MTH$rzLKR-);wxWNX z=RgYvRXTO29=Gf2CL9FkWT>h6T54Rni%HZvyxXb2i< zBqG$rt=~=jUX2*tizZr!xwH}UX&V;Mi&#jnVG+H{J>LObLPrp{WMYXW4@)gYxXk2i zB1xKd&RU9bl)EA(mL)yKSsxvV6Oo1aHkdx4G?uIwPrJyYWk#-|E6Bl;13RgXoJ?~k_E8nNSaOkt3Q1#0<7NFs=`5x5!uFfxkiknzmP01R zwQMB`|aFxyKwWp6!ZuW&EOEO8E^|F1BReC`Xtd$1U$vb3U3k^=t(BwB?Cdu#WY#OnFMs9&m-ZeXs-3niwbZMdZ*cSSWL=z|} z+eoz*tU_k{*Lm_3Q%q+zpIj$zlopzrpg=QO=nXw5;VIRnI;g*rZ9i5W%lNf zlhUcgd>2w9mzKPQ7NU@!%a8-^O|V=zyImGf)+MLdEJlk=wpom6rX-8eYD%*3Y^Ed& z&yF3aHt!*Yt3sm)MY;JYhLfcjm#Vx}WEIJ13S}Jg%z#~15l(}%LeJ07`&DS&-Tm6y z3CGMcImbRFV-;$2F%!7CWZNA;es%Y5j6T`@ z^r;JJ5u;hKk!pJ8B7TF}GhParIBVI3xTWN9KI*PZ@<)h2X z5_DxbC1`m$bKpAO|COSq{)|`T0;pL;|7dSXD_gAUF zXK-Mdjm+P&Lrn1b`pH1#cFN8xWj%>)c}r2?Px5~ia`?8~C%;myOM)I2Py75;<|NFa zxfAHZLAX`>zk(E%`n|skVv)U_m|WV0o)im9dzVVJ!mHut?!?usPjUU}1SP~fr9RV| z*qYnE6RnT04B_+pn#{Fx@;32mE!0Yz`8|Tkxt*~c^a8zTN-xoFdc~Apr8nqJQ+kWu up?6K`J^GOLn$kzKpKmAW`zd`v2k1+V#{U4*LHdfmfzJOTET(U(^#1_Kr5>69 diff --git a/bin/views/PilotView.class b/bin/views/PilotView.class index db9216afd99ce444666ec16183e02bc00a7ef7cc..40c74d646f60ad624e46073427ab5e35a98c24b0 100644 GIT binary patch delta 2255 zcmb7Fdwf&%75|>*K9ZZ;CS)z?Ew#{=mOd!4%&{48JUSSTSUM<=z$ONIOCxE*l1nX* zt^44nV-qL-bYo5@?u8RYQI{6tq)rFQrp`GZOx;k}=4&rE_oTA(yMgi9XMZi9d``|i z_x#S|`#rytldWUT#5GDxHE9&NLa-2-si^~c6s!iEPA6mD; zz-rWmpdw*nE!K&fm08}^uub%0y*RG4D@j6)IIPzM4D`V-Mao1!(qg7Mc}5>Ln)npb z1Ygc}I_$J#XMOl6awZ%sB6zzOcdd!dU(hYj4VdV}RfJY?Tx}5hJ(?k{n@w!NR&h+7 zJ^j;!(3OdSMDJiEx6V%6k)={di$;=<**3ya8f=ssGkFVo49k&u{#Y$hTYT_HXUF`GK zcn#cvZ|V4^xIznizK!pQE!vc6dkLjo$yCOf^by-hBvU!*^*s}Jp`H<9+`5xa%9h5v zP2BUq(^?0$jS`HF@=R{pV1LTM5Am3eM+t#V4hM*=yeziRPHnWaCVqq?Vz&3<_~V?V zKhtCLTQ?bJIf`Q@evEczhk+?t{df{j>v)QravPQLBC%x7G4WIBS(52Ba0!-4zh_PS z9M6eoyp7rmIIiPGG3E_>eu0-n*jMu*>Gq0=UrONp9KWM4nd-^fX+K`T2@|j4HJ-A* zM6S~wbO@fN=2bdQ5hlt>T()#wHj_$qCDPpYN&H5VnU>n?Cf>lC+zP|8An9~xRwR3z zK7!J;s(HC|c-zG9q(j*`hlO@>eV-G8hJ={nUp%1*TP(5GPBDhL|KyQm?b65l&u5+~ zuJ&(ke2)+uNZMEBA`3J9HovuPu4Ie{foozy$Ed_4kEk=F;&!uL^HZr#rg+|LRm%vw zo5bwWN--MHMMLS2c4B1}A>0%@dqM00zHE{CQqF8%9;8|W zM3YVY3#S7*)dz9s~a} zlPXRHBEAYJ7!M!9qB_`Qlqm4R4^X4%4DJ~!V0Aq7$ziOCdM$6uAzT6E(NjQQd>B_o zeU{Ji=COf)^gJ?__kLtYu*vck&=oJo>|u0|V6cE~am!bZ&y?e{!`L1*EF+K4x8$)S zv@?${=W+8v+){!SEf1npzS<*|(0B8=vt@|2JoX*ny-dy$=VtggR1iKWiRN{0<&qP2uz};X&3^F5)qKpEZq3xsB5g z^N8)kR*c{vgL)Y2aR>!Q`dzf+A^ZT$DIVrQGj6>v!r)n_`}iU==Zg!5Q2^&oymh^l+hY^ewFJYf`-QKf*2xTWL~9!70c zYs=$hODjSxy?#Zw<;=4MoQ$^(YF1 zjAtQ*xfsAa{+sB)cFf04EWmE|xC58sPJE0xTg2GMnD|a!R*P{0UA%Tajz40FOLQ+I z&p4kY+K1O!e}`G9#Bux?e_@{M@s!KokcY!oVLyjdIK9c#NqPsE)W70yY}<(*mtK{V zce(UxoU+QLSI6Hujik32_#YhjpKO^7qRvv$y0=$xft_-=d+?C^9SxJ-lL>)CyqpMA!7HXxbd{Qp5Hi}R?tbYUD CL<{}^ delta 2468 zcmb7FYj_mp6@E{4c4l@nn+?l`Fi8jrfn<|)S)x*9gGES4p)Mgp07JF1Bonf*m$*B@ zfYwO+^l7DHp)q-gDk}&b-<9LfHGrTaym}SV_x9yk*h~71t7~BYi`W?TMaUJ9625 zHFfRIuf>Zi@O}-~qmH2F4RfQpCuJx|5GutnwX#Y@4?)>Fn0xTPo?TvS!-4?Z=+m$R z{o-0_xw;KIHS9u49Fdx(4CfQisMVETq)}`yH)zNqPmnowS9X9fM;vhnV~v~b!$A$Z z?L!YAwi+4J$a(M{3~AVds~Aq#`p)a)tJ}M5*PAqS;ATRYuP+k!xMZ)rdy9r)+$s*a zSI`H=8F%@LJzPHj%h~Vo?rm|*Dn_(uBsl4qaG<@>yUUenSlwogvTEl1VeMM=d z$Xx{QfPE*wcqpCn;ybuU!QBM^pveKE*Q|@LF;W9YPQ!O`OkC$#);-Eu(%D{vPn~3( zWdz4Hd=Jgsm>q^$*e%8wCKQYlO6(${cD!gjnKv~|+MY$(KAXx-w%`349>Dj-tDgGs zNj#|F6d^EkX)U)oVP+Y^5AZ{Rlre@(LNFxud1lWGKt{D4=wS^%!Xt!YM$p=yO!acF zL`)8;#rQEESMZpKD)p|P;HTmmrMgYU&j_W{ZK_FR_8Q3@Mkc_0f5KMEF9^#+@!d(| z#_1wAv)K~=-?Cd8#hH@X;tok|E5=FuQp2zCYgS%=BH!TvbcGtX2B3n=+=r(%JY%CP zVRVjS^ZkZla_e09t%m3DJCTy>=ml|5u8?2E9~JyT9Fv2tKjF{fA$e)|CA^~GWrF5( zC1aS;O&j7G{)#FNX=Yasaf>pERC_j;7O#2N`?Ow10ILQ~Gn)~&7VoJ)$K@94S(8m0 z8+&qwk@4aUyk%=mWs8FoiTPTrG#t9HQ1Mi8Rhbt=iiX(;vd&Y9^!DDw!i&Wg?Go8X zeuYZJK`rbqB^(Zk8%nChv)awIno6^|Asvad5vw7U%2;YEnU;LM@LVo#@>PX(rYxS^ zYcK^F$E}h}+G^y?WM6Vu!n9qzG>_&hR4q>V8eBD0D_-_JCvoNFVnhmF-O{+Zl@Cqqb^M~d$91pGWQ<&ED#5_=3N012{wC=%doY~T zszusgMY7oMk9vZTPzDbVgj4>Im(DV`#Q@C_XZ=TpbtUjV3)f9yTX$gl7t~O1= z04yY@knSEsHs;Yix@uv7{}cLcufv-e8lYnqDzE^RxD-{m3iGfX^Klz$a0s((U;<&%trhf!@z zj#zj|mnZOO5wEJQ^!Xs_~`E82|P)-^ZZ>i0+4ix1@M~-1mM=) zcB%p0&DTv`n&zJ|ypwjAIQCx3zc} z@5STH=#z-!MgFk;6YI%`t62&gXg)U5a6P<@JT@Ox3hjJXDRp;qOf3T=L@|ERrJr z7DNa-IXub0b|u5yx6g T&2%wc!jbGrdMUk&E{FbK|0y$6 diff --git a/pilots.xml b/pilots.xml index efef9b4..09938fb 100644 --- a/pilots.xml +++ b/pilots.xml @@ -29,15 +29,23 @@ - + - asdasd + sad - 23 + ads + + + + äää + + + äää + - adsasd + sad diff --git a/src/controllers/FlightController.java b/src/controllers/FlightController.java index 47fd6d4..c640bf5 100644 --- a/src/controllers/FlightController.java +++ b/src/controllers/FlightController.java @@ -1,28 +1,46 @@ package controllers; -import java.time.LocalDate; +import java.time.Duration; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; -import models.Flight; -import views.FlightView; +import javafx.scene.control.Alert; +import javafx.scene.control.Control; public class FlightController { - private Flight model; - private FlightView view; + private DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm"); - public FlightController(Flight model, FlightView view) { - this.model = model; - this.view = view; + public double calculateFlightDuration(String abflugzeit, String ankunftszeit) throws DateTimeParseException { + LocalTime start = LocalTime.parse(abflugzeit, timeFormatter); + LocalTime end = LocalTime.parse(ankunftszeit, timeFormatter); + return (double) Duration.between(start, end).toMinutes() / 60; } - public void setFlightDatum(LocalDate datum) { - model.setDatum(datum); + public boolean isValidTime(String time) { + try { + LocalTime.parse(time, timeFormatter); + return true; + } catch (DateTimeParseException e) { + return false; + } } - public LocalDate getFlightDatum() { - return model.getDatum(); + public void setErrorStyle(Control field) { + field.setStyle("-fx-border-color: red;"); } - public void updateView() { - view.displayFlightDetails(model); + public void clearFieldStyles(Control... fields) { + for (Control field : fields) { + field.setStyle(null); + } + } + + public void showAlert(String title, String message) { + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setTitle(title); + alert.setHeaderText(null); + alert.setContentText(message); + alert.showAndWait(); } } diff --git a/src/resources/icons/exit_icon.png b/src/resources/icons/exit_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..57ce87c649431d80e3a2effb12d1186a20c3a2cc GIT binary patch literal 7270 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 new HomeScreen(stage).display()); VBox vbox = new VBox(10, label, helpText, backBtn); vbox.setAlignment(Pos.CENTER); vbox.setPadding(new Insets(20)); - vbox.setStyle("-fx-background-color: #FFFFFF;"); + - Scene scene = new Scene(vbox, 400, 300); + Scene scene = new Scene(vbox, 800, 600); scene.getStylesheets().add(getClass().getResource("/resources/styles.css").toExternalForm()); stage.setScene(scene); diff --git a/src/views/HomeScreen.java b/src/views/HomeScreen.java index 2939543..ba2ebca 100644 --- a/src/views/HomeScreen.java +++ b/src/views/HomeScreen.java @@ -31,18 +31,16 @@ public class HomeScreen { Button btn1 = createButton("Flug erfassen", "/resources/icons/add_flight_icon.png", "Erfassen Sie einen neuen Flug"); Button btn2 = createButton("Logbuch einsehen", "/resources/icons/view_logbook_icon.png", "Sehen Sie das Fluglogbuch ein"); - Button btn3 = createButton("Pilotenprofil verwalten", "/resources/icons/manage_pilot_icon.png", "Verwalten Sie das Profil eines Piloten"); + Button btn3 = createButton("Piloten anlegen", "/resources/icons/edit_pilot_icon.png", "Verwalten Sie das Profil eines Piloten"); Button btn4 = createButton("Piloten löschen", "/resources/icons/delete_pilot_icon.png", "Löschen Sie einen Piloten"); Button helpBtn = createHelpButton("/resources/icons/help_icon.png", "Hilfe anzeigen"); - Button pilotsBtn = createButton("Alle Piloten anzeigen", "/resources/icons/view_pilot_icon.png", "Alle Piloten anzeigen"); - Button editPilotsBtn = createButton("Pilot bearbeiten", "/resources/icons/edit_pilot_icon.png", "Bearbeiten Sie ein Pilotenprofil"); + Button editPilotsBtn = createButton("Pilot bearbeiten", "/resources/icons/manage_pilot_icon.png", "Bearbeiten Sie ein Pilotenprofil"); btn1.setOnAction(e -> new AddFlightScreen(stage).display()); btn2.setOnAction(e -> new ViewLogbookScreen(stage).display()); btn3.setOnAction(e -> new ManagePilotProfileScreen(stage).display()); btn4.setOnAction(e -> new DeletePilotScreen(stage).display()); helpBtn.setOnAction(e -> new HelpScreen(stage).display()); - pilotsBtn.setOnAction(e -> new PilotView(stage).displayAllPilots()); editPilotsBtn.setOnAction(e -> { Pilots pilots = (Pilots) XMLHelper.loadFromXML("pilots.xml"); if (pilots != null && !pilots.getPilots().isEmpty()) { @@ -51,6 +49,8 @@ public class HomeScreen { showAlert("Keine Piloten", "Es sind keine Piloten zum Bearbeiten verfügbar."); } }); + Button exitBtn = createButton("Exit", "/resources/icons/exit_icon.png", "Exit the application"); + exitBtn.setOnAction(e -> stage.close()); GridPane gridPane = new GridPane(); gridPane.setPadding(new Insets(20)); @@ -60,9 +60,9 @@ public class HomeScreen { gridPane.add(btn1, 0, 0); gridPane.add(btn2, 1, 0); gridPane.add(btn3, 0, 1); - gridPane.add(pilotsBtn, 1, 1); - gridPane.add(editPilotsBtn, 0, 2); - gridPane.add(btn4, 1, 2); + gridPane.add(editPilotsBtn, 1, 1); + gridPane.add(btn4, 0, 2); + gridPane.add(exitBtn, 1, 2); VBox vbox = new VBox(20, title, gridPane); vbox.setAlignment(Pos.CENTER); diff --git a/src/views/ManagePilotProfileScreen.java b/src/views/ManagePilotProfileScreen.java index 8e7a4f4..253c5b3 100644 --- a/src/views/ManagePilotProfileScreen.java +++ b/src/views/ManagePilotProfileScreen.java @@ -46,7 +46,7 @@ public class ManagePilotProfileScreen { VBox vbox = new VBox(10, label, pilotComboBox, selectBtn); vbox.setAlignment(Pos.CENTER); vbox.setPadding(new Insets(20)); - vbox.setStyle("-fx-background-color: #FFFFFF;"); + BorderPane borderPane = new BorderPane(); borderPane.setTop(backButton); @@ -54,7 +54,7 @@ public class ManagePilotProfileScreen { BorderPane.setAlignment(backButton, Pos.TOP_LEFT); BorderPane.setMargin(backButton, new Insets(10)); - Scene scene = new Scene(borderPane, 400, 300); + Scene scene = new Scene(borderPane, 800, 600); scene.getStylesheets().add(getClass().getResource("/resources/styles.css").toExternalForm()); @@ -101,7 +101,7 @@ public class ManagePilotProfileScreen { }); Button submitBtn = new Button(pilot == null ? "Hinzufügen" : "Speichern"); - submitBtn.setStyle("-fx-background-color: #431EB9; -fx-text-fill: #FFFFFF;"); + submitBtn.setOnAction(e -> handleSaveProfile(pilot, nameField, adresseField, kontaktinformationenField, lizenzListView, zertifikatListView)); @@ -115,7 +115,7 @@ public class ManagePilotProfileScreen { lizenzListView, zertifikatField, addZertifikatBtn, zertifikatListView, submitBtn, viewPilotsBtn); vbox.setAlignment(Pos.CENTER); vbox.setPadding(new Insets(20)); - vbox.setStyle("-fx-background-color: #FFFFFF;"); + BorderPane borderPane = new BorderPane(); borderPane.setTop(backButton); @@ -123,7 +123,7 @@ public class ManagePilotProfileScreen { BorderPane.setAlignment(backButton, Pos.TOP_LEFT); BorderPane.setMargin(backButton, new Insets(10)); - Scene scene = new Scene(borderPane, 400, 600); + Scene scene = new Scene(borderPane, 800, 600); scene.getStylesheets().add(getClass().getResource("/resources/styles.css").toExternalForm()); stage.setScene(scene); diff --git a/src/views/PilotView.java b/src/views/PilotView.java index f577445..20ce787 100644 --- a/src/views/PilotView.java +++ b/src/views/PilotView.java @@ -5,6 +5,7 @@ import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; @@ -31,7 +32,7 @@ public class PilotView { VBox vbox = new VBox(10, nameLabel, adresseLabel, kontaktLabel, lizenzenLabel, zertifikateLabel); vbox.setAlignment(Pos.CENTER); vbox.setPadding(new Insets(20)); - vbox.setStyle("-fx-background-color: #FFFFFF;"); + Button backButton = new Button("Zurück"); backButton.setOnAction(e -> new HomeScreen(stage).display()); @@ -42,7 +43,8 @@ public class PilotView { BorderPane.setAlignment(backButton, Pos.TOP_LEFT); BorderPane.setMargin(backButton, new Insets(10)); - Scene scene = new Scene(borderPane, 400, 300); + Scene scene = new Scene(borderPane, 800, 600); // Fenstergröße angepasst + scene.getStylesheets().add(getClass().getResource("/resources/styles.css").toExternalForm()); stage.setScene(scene); stage.setTitle("Pilot Details"); stage.show(); @@ -53,31 +55,27 @@ public class PilotView { List pilots = pilotsData != null ? pilotsData.getPilots() : List.of(); VBox vbox = new VBox(10); - vbox.setAlignment(Pos.CENTER); vbox.setPadding(new Insets(20)); - vbox.setStyle("-fx-background-color: #FFFFFF;"); for (Pilot pilot : pilots) { - Label nameLabel = new Label("Name: " + pilot.getName()); - vbox.getChildren().add(nameLabel); - - Button detailButton = new Button("Details anzeigen"); - detailButton.setOnAction(e -> displayPilotDetails(pilot)); - vbox.getChildren().add(detailButton); + Label pilotLabel = new Label(pilot.getName()); + vbox.getChildren().add(pilotLabel); } + ScrollPane scrollPane = new ScrollPane(vbox); // ScrollPane hinzugefügt + scrollPane.setFitToWidth(true); + scrollPane.setFitToHeight(true); + Button backButton = new Button("Zurück"); backButton.setOnAction(e -> new HomeScreen(stage).display()); BorderPane borderPane = new BorderPane(); borderPane.setTop(backButton); - borderPane.setCenter(vbox); + borderPane.setCenter(scrollPane); // ScrollPane anstelle von VBox hinzugefügt BorderPane.setAlignment(backButton, Pos.TOP_LEFT); BorderPane.setMargin(backButton, new Insets(10)); - Scene scene = new Scene(borderPane, 400, 300); - scene.getStylesheets().add(getClass().getResource("/resources/styles.css").toExternalForm()); - + Scene scene = new Scene(borderPane, 800, 600); // Fenstergröße angepasst stage.setScene(scene); stage.setTitle("Alle Piloten"); stage.show();