From 672427c13f2addeeb9eec5ef6fb33c0be860f396 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Tue, 20 Oct 2015 11:19:54 +0200 Subject: [PATCH] Fixed login verification and gui --- .../.vs/ErgometerApplication/v14/.suo | Bin 117760 -> 124928 bytes .../ErgometerApplication/ClientApplicatie.cs | 17 ++++++++--------- .../ErgometerApplication/PanelLogin.cs | 1 + .../bin/Debug/ErgometerLibrary.dll | Bin 21504 -> 22016 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index 2cf926d78aeeb4724b9976eea89affdddcc01035..8dfd3961161890af408e1348cae6ff4b8afcddb0 100644 GIT binary patch delta 3546 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 delta 4510 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 diff --git a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs index 7b87357..429a914 100644 --- a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs +++ b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs @@ -58,7 +58,7 @@ namespace ErgometerApplication public void validateLogin(string username, string password) { - if (username.Length >= 4) + if (username.Length > 0) { if (password.Length == 0) { @@ -66,13 +66,7 @@ namespace ErgometerApplication panelLogin.lblVerification.ForeColor = Color.Red; panelLogin.lblVerification.Visible = true; } - if (password.Length > 0 && password.Length < 4) - { - panelLogin.lblVerification.Text = "Vul een wachtwoord in van minimaal 4 karakters."; - panelLogin.lblVerification.ForeColor = Color.Red; - panelLogin.lblVerification.Visible = true; - } - if (password.Length >= 3) + if (password.Length > 0) { string error = ""; bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error); @@ -96,7 +90,7 @@ namespace ErgometerApplication } else { - panelLogin.lblVerification.Text = "Vul een gebruikersnaam in van minimaal 4 karakters."; + panelLogin.lblVerification.Text = "Vul een gebruikersnaam in."; panelLogin.lblVerification.ForeColor = Color.Red; panelLogin.lblVerification.Visible = true; } @@ -136,6 +130,11 @@ namespace ErgometerApplication { panelLogin.BringToFront(); panelTopBar.Visible = false; + panelLogin.lblVerification.Text = "U bent uitgelogd."; + panelLogin.lblVerification.ForeColor = Color.Blue; + panelLogin.lblVerification.Visible = true; + panelLogin.textBoxUsername.Text = ""; + panelLogin.textBoxPassword.Text = ""; sessionLogout(); updateTimer.Stop(); } diff --git a/ErgometerApplication/ErgometerApplication/PanelLogin.cs b/ErgometerApplication/ErgometerApplication/PanelLogin.cs index e265523..151a3a0 100644 --- a/ErgometerApplication/ErgometerApplication/PanelLogin.cs +++ b/ErgometerApplication/ErgometerApplication/PanelLogin.cs @@ -91,6 +91,7 @@ namespace ErgometerApplication this.textBoxUsername.Name = "textBoxUsername"; this.textBoxUsername.Size = new System.Drawing.Size(167, 20); this.textBoxUsername.TabIndex = 2; + this.textBoxUsername.KeyDown += TextBoxPassword_KeyDown; // // lblLoginTitle // diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll index bdeafa8ceab0354383ed50c30986e07ba954a801..42517bbb3ef2c4d281b03a264aa7b4c3792db629 100644 GIT binary patch delta 4502 zcmZ9Q3viUx701uH-|l9=eUTRlOCZ@@Lb8yAph-v`+(4;{CZkrUiaPZ{Eo!2)h>lf9Y!OS_bI;x+rJ4DD-}(RV zz2`gkyWeXQJ%G`JxaY1wA?B~TkU#`YnN3@bGA8kwJJ(!0z@(AYQa`_1cylW|g`ddPq04wy*1n9d0 z0A*e6%vh~h?(jZp05}1XpmhqsR)+{C1K6Ai3tjS;X|_5 zJqH`*$L=dJC=)#y!X;#Zry7sR9i9!iQVx0QgcW7+m>N7R?-;WI>*cvIvy!~F))G5x z4Ne1aIP#pW*UId~KqO_lfL&A@O)3dQTOl>>OaZWn9g0Sn&WZ!#A~Q^N4~w+$m7^j( zTr?_t(a8Ye;{P#DTgfOHHNrDSV#5-iDgT(5>7F%WDd&g8e4Hr*Nz-t)tV_zpt76-e zN)ca{zfUf}59L|n=W=XHf#Z9c(G!!$iC~S)Ov!ebrk1tx+vIHFHDymqKIX}{QVOs% z_EQQX&XJc=cc#vz!%b4_0+1bQblbd-1n0`Gu@yL1o*Mg5&OB;%*z%{+nuX_694sZY zg$T|BBV0y%NC;moA56=NWY7s*Kxyc7(FqJT)7m*~ypq8n^>f+tGr$(4+1s4(iN_6D z&NOwFm4ZBTL?xtH@*v4F6);g1l@87Tc+%)PQTeF^Nag%tT^U^|@ya~$(x?I|EnF_G z=^E|4bD~<(c$lfe^e|nJw3bGg*2WgxK%n9)$P+tM-!NU#)T|vf zL_5B2swHb~TNSm3>3*S3t&McngVh{QXse-pknWj?x>8iC;X|>=2-k8y7OgvJU;v=F zEZv*dR!0rt`q9=26WSV-wS3g_U8IAj#gBc>sGYSvD>ZJ?Ej@hLh!IAbRV!VLTX{Lc zGz&*~WxR))(MVxRj2kXYiPqkDVV1JA|0_(jPRJU6S!L|;yu+(Tvj?(#S?^UMo$$xYe?&?0-i zDgH0$L>@QExuyZ0%?D7I(WJ%KRFu=cpY(b8zIP6;i6xCM6Okpt4`1UFfpAt-5$lW^ zqA*l^Qq&QBVmWb!SVgQAYl)8=O~fOjh1kiX452c_$KJu&-eLYqTu=UWoJYF1sQ!k^ zxe^t(U{!>6`%xWiA~zgm-oPv-`gK`r%&pYtI-}T#{ z&S9QlE@S$cPZA@;=?+5^rF)v`W%`N3tt(&^wU#rVWd4FU+&Tl+QtN)^DP{q2xb-l! zQ0qaapBW_9`e-#^w|skI!I*ZM+P1j1-{UNl&diL(+l2woviAo#Zg-;%&X=X#>T z2IKrR9J(Q7?IcyJ)$NwMMFO;IwaId~yfJf1q+OWs9DBR%-HLexfMkB0?Pz8+TSnA(A^`hG)CG|ZZ;Yt_h#atI zbB&b6Y6PKZM7fPTxOPOPMvQ6j7|U)jY!i$tp*Tkk+zSQS0GU)I)hBF6ksrH|pU4 ztN00Sgkt(IQm5@5!;OtFj=qf49c$R;8PqnS78q+`9epIJwsS_Mu@1IsbAVHEq3XX4Q%oBSv9lf3*mLw&dmO(b#|A$#J8*@4EOg-Yu3zKb^ksYq_hP5B z4?A#%{rL#(E?5%bVX}}qt+x-5Q*9o{r^$Jn;;{QP4(I`yj?c+iWPhGmz)bZd(x@SG z08d~leo6k#&hOChd2YG%7&?}Pq_Sce z`3n%O@@EConYq|HT}n>L8ORq$fk zl-z~%o~frdRz3Kj0&0jgun?BR0`k-gv5a&%K(l=I>ipP|^7)uJ_I>NITV85g_*-vv zl4H+Lbur7LbhKGPcsw4NvAD%_Bv?Jki6VJ*?9RoB2A0U~%4_q7{}Cdn#(lKy*+d)t zx~p#}Z+J3x&ivuz*{UNAJNrW^j@P8Gsx!HEvzku)Z?lShd;Mu*?PhthDimv~y$z*j u=`PbsD@>;vtg#1|{u8kzc7M&iw3FW2nI!6Je~03>t71v@-{9Wq3I7EV{x{_S delta 4377 zcmZ9Q3vg7`8OOix+ydM+7z)Fd+}}ke3Ke3>4F-OA;SL5$;A4 z6&1&LY{V)UG>)ird;~15+J;(1isMLiYGkk^R4qDXgpQ-)sMGI!dy-&x=Kk*Y|9|Iv z=iGbl-aSe5AVv@1L-%I><@y<`L4QUdGvLNTfE8poV&*rkz0a@q4YUHRR7MnFt)(}Z z=;;UWkiKvOz*HF&d2$_QyMCx7D?rBzc^~FtwR{z`u|fV5GyTI z8vtcj^}NA4agEEr%K&f##6w38z*d(CB>>pm_GNDQhNnQxpDq9EX~)0GP2Mo>lFxWc zu||%1=cG>&)U4wZJ8Tu9I0_$_NmWBL09>y5KcSrMtHBqg>D!Ez@-tt(_!i{+NwxT_ zyl2v8ESKje%{SZ~#j+$W(*#H?6tI(KNS785qH`7%*^vlf5!)4wNC6oT6X_AUQDY({ zLYFcoQX_LFL?B8tiOjvsIBg}PXu^mT>zI5?q(q*IOZU>v8LLK)H9ikZXCB7zSB<8zLIAH5jGbW2rt(=vZTQeqw& z@{`1TOdWJ5A>u;mP2Q1IN~29zivy4qUhlQ}e;X>5`;sfMRGv$Ibmoc-poNPp zqByje(7A-*wi}T!oxvU{lh34N)F&1qBvTo>TXg?I&9odYTZk@@*3pv-4yplZbdRY5 zBypRFu1-sSdG)1SJ#v+-PYu&5J)9acm#KkhQI^wr$27Glu`peQsgbKyS{MkMXI<_$6P0D4OMeIwX=rKp;`b_Er=>L zHWZ7r2z@QaG99a^VeImM)}sv1nqe|#EBOdgwt5*^!O)3B7K{NFTGc523ypUs0kzRJj&iRu}F4DZjT zpqd$;2z^CuAzB7oWVKx9&n;d{T_Wqa-;~%KAa@3czy-Rn34|_d=8vqDfAHrnxq;<~{N zQ_6(7L>qlg1k2t71K|n|m2TRfzSy zi>tlQ+$VlP{uZtyy)CM}p=z!{#T#*{NvFN22Ajr-Bg{5t5izKzb**y?wb??n+0H

TeQXgt{-1>;{z-g`iVSS9$XIi~y ze^PkiyjH{Z0aD*+)$e^?_~0k44tifCWv9oL?u5hdJS--`B(1WXf0XxUq+y$UHX{df zZrU%Kk3WAc0@a>N-Cb)1Y!(jfw!= zKCaG*OxQcFz7kn*VqASAW`ZM&=SWq45Fwa5t}I3_Y#3K=)0hQMuQ#z;Bd8Sp9%d$G52Ia_DCjdyXogn0~Ek71Z-U zyNrsMf^6>#q(0QDz?*}W0Q56XE#Z_?sY0#tZE;X(!dfk7q8C@dKukG?Jw0Lt9MtM_ z57Hj#uvQzPM^wQZTKy6bs^D#{3a|#M;XSPuV4J9hkF;8Dseu|eqgA7&P1JySPRkN^ zkEn$UT7}&RwQxzR0$-0<32LLJp1OrTq`jF-t7Fu!4idEbfcn+ZFK(>m3d+^PbgizX zTs`Dz^_Z&$8lcFGNxF&IMg#0&6}!RfA&a&(>bAXacyT>A<|?J0k|Kk0<7%OC9n{kH zM&-UR%8ZTBq}3aaN}~x5X?4n|Gp>hWtzL1gFe5tBKgatul{3WgQBCEHay-fv5LGoq z;?LmVH~RL%&;qngSAgD0V>oB+o`P343+F4I&_6UWVp zrf4>l6=kbSQ#t({4>3oWU{Qkwm|fW;QXS%zow&bA$a`qC_9jb38*NIg~=gLFOA02&^MTe^MrDwJ}{R$Kpq3X8AqPWSeoW(xHk2v1Q zq-hP_ly?=q8|BOSsW}&M8mf1!ML~Zq;$f!>f9A=H`H5-YqlGh0%DL!p)8V1R3zos) ztk+Xy`;y$j!ewEM>p9chux}cc-+gQbR#y+*F&JH*igNGOn{0Nw;Y)}cbXCL|I9sMw zZODhQe@F-#bPpY#Ryybpvxdg<#uJM-tm^VqRs3nyfyUFl<>%x;Rd>R>)L`uMxrzh5 z!4xsvDjTZ9(pS6FsaA$=5#Zo&YQIICJ-EB>emY5i!#oo84Zlb6-GagRYrewXLi_&! DT|yzs