From 8a858b2153e8f593876b492cd839ece2b52ad713 Mon Sep 17 00:00:00 2001 From: "pro.boooooo" Date: Thu, 1 Dec 2022 18:12:57 +0100 Subject: [PATCH] $ --- FIProjetIHM2022.iml | 6 +- .../FIProjetIHM2022/Test/AdminView.class | Bin 1746 -> 1702 bytes .../FIProjetIHM2022/Test/BDatabase.class | Bin 7258 -> 7484 bytes .../FIProjetIHM2022/Test/BFrame.class | Bin 4641 -> 4671 bytes .../FIProjetIHM2022/Test/Controller$1.class | Bin 879 -> 879 bytes .../FIProjetIHM2022/Test/Controller.class | Bin 11427 -> 13049 bytes .../FIProjetIHM2022/Test/ProfView$1.class | Bin 871 -> 871 bytes .../FIProjetIHM2022/Test/ProfView.class | Bin 3711 -> 3671 bytes src/Test/AdminView.java | 4 + src/Test/BDatabase.java | 29 ++++---- src/Test/BFrame.java | 2 +- src/Test/Controller.java | 42 +++++------ src/Test/MainMenu.java | 69 +++++++++++------- src/Test/ProfView.java | 6 +- src/Test/StudentView.java | 24 +++--- 15 files changed, 93 insertions(+), 89 deletions(-) diff --git a/FIProjetIHM2022.iml b/FIProjetIHM2022.iml index 1313d69..57a8d21 100644 --- a/FIProjetIHM2022.iml +++ b/FIProjetIHM2022.iml @@ -1,8 +1,6 @@ - - - + @@ -10,7 +8,7 @@ - + \ No newline at end of file diff --git a/out/production/FIProjetIHM2022/Test/AdminView.class b/out/production/FIProjetIHM2022/Test/AdminView.class index b96a881e0233739da1965d4f08e9cb2a84becde8..43be318efe1c86abc1434c47489f8f8f82157153 100644 GIT binary patch literal 1702 zcmZ`(?NS>@5bQ;=CBzx9j1?OQ$Pi-mg`5xP12Bn@Z442ZAfi~V{K%r)$cK+R)#(J` zY4QxI3Zg1h<4BQ$Xv)nP|J0gYbm^hfbq+{ebw-pE`}#p zTdX4YlpV)6yt;G(%P7RLDlk*pXFIVt7YdR#rPJ1iuv&3E6&TUfOQ!jb`4FBPSPQPz zQ!QyZK0B^zH67`9JS8x9U2`l~O55wjXT8cVtx($R|Krwz+X_%CJ?U3^?Kh2Ybrfm3uZV$%@;Mc1?Pg-uH}A|Bcn=orIzKZ;EtNm*K~)bC;j4 zW%!=p>llZizS?W~$Jrh}+mWn>LqPB8kdtw6p{LHDWq-DWPl2!@HqrV02_&j+$7`tP zmM+3@U*dv(MtH#98{piEa4PU2L*NB>16b#t&%eLl;GT0MI1_wA-w{*c?l*cy`9GUI zg~*;ERzJmH7l~})1f$vf3C6Oy6Wq&oG4VTL5p421#i0gN*am-)> zTRhE%Vet~%+%Z9qo?dBUn)GZyDT430PW3F~q%MN96gFrJg>*A|iln|<1t|wPc@oiwbaqd;3 z*H)qDRY;b#S3yH4{+Sj(5QtyJDA!YnV;Z+u|0E?(>RHHN7IS#Sx%ZgkqRib3OBy4T1T0+r~76b#ug0a-K#sP{AshA5e0%=;QXz)gX~6RX*<%_D)>RIZx9hXPuppkf}mfuF)K zZYgOum33P~7Iz3~N`KvLTE68vF9hOKl%e*=G~B(uzm>p*z<^T!i_tu!aARd5@O{@w zVoKn4d52`_fv5cR(9)k z)2XQ4+vY^Zr(UX( zrLd&oD>VTrw;`QqUX^=A!`I5)zIDv@r?0yLpE0_tuGr-TWu@O z7X`-tAGZ{?Iz-L4>UM2r+r<{&ng3jslFDw4tokaJBiDlZw)8e5t(l6uW7<{Iv(&of zjQe|5lMRiIy0~YgJ9HI()Hn}$)t2Eqg4;2UKo@G;@=tQMeBKMP>Wu&k(d8p2t$t}B z&#(8jdqh|_C-A)aZ0Uv@csp{@QVs9DkT|0z4tLn(IG?l_GU`EqK!vLgtkUK)aw=o!TbCTKn9jvgJ04Qz771TA{XQp7q!pQ04Qx3q^^o++hJl#LT@YX3tD$}tOe55|3XBgkgOr9dQn%DnC*9r3Z%)Jxb*YndS zcsLy=L_fo$txWM0k3-ju^Qd`7trc2Ph0K>Ks-Pe`4_=`9MgA|V3Uq`OSfL8=1x>OE zJs9KaF7=P|J3;l6xQ84b(kdg*yIEjWX7CaQe&Wt++{e#&0GIDklc={9^IH{5!p3)a YL9rwJZZWchs8M`RD@O0DkjD@I0lli3wg3PC diff --git a/out/production/FIProjetIHM2022/Test/BDatabase.class b/out/production/FIProjetIHM2022/Test/BDatabase.class index d29a226465b44f3e6c76688ff43db7d69c697d22..b2c74bb96838acf90301fbcf984766fa1b699bb8 100644 GIT binary patch delta 1542 zcmZuxOKg-?6#mY<{(t_Nw)1GGoeo2%wH>C@7HX{)3zY~dVKk&kF@eM=YCAMWYz?Ig ze6iGxG32^3#)V;HWPxIcX_OTkbfbwY40S44M-;XALQ%%=-v4K8NHfj7XU_f3cfRwO zUflZesPpNq#d840WbB0Vc|&w(Y4`Z##K_3bg-80{zcS=BO(hV-QWSmoTJTUo4Me)n z?1;SWlN)E28kS|Cai)B9Z~57$%13t1EzBMj1PZ0zk{~>DWNzWP^1-L41@@si_f>t; zG}D-OWRnyu=_RQY)llqwxL@ECv1PNW#j-M}vhfYcA#&_nn3^ijkLLI^EGVe$c6uT;q>Dk_wmX52H$zWqAx0kUP# zf$wpZ(Kd$h1Ac@LZRo}|{6y93qDFK)4p0?wgE%fcf1jXvAxOOeB%*bbsPHH@Z(Dyd5d)-VX$f@7guu1U`z>D8oFx72HD@w%lGa(a^% zwm~EyLBqS0N=<8CJy+mW!=-x)R_D%6BqWx`(zk`Tc`JU1=F@ce@PF`$b%SjQ6ID?M zTEE~3ifvP71bf(l=h4B#m5z*@%RvZ+H4L>Pxgw)b;h^6{9LdRf~01 zA4t+u^`10)s!mFar|K<98C7|_A+5B6M&B@R8;q1TqfbY=`gEkLPe*EfdB=pVGNh`m zwik|@ZI(2pwo8WL70Q`raem&hVrCIv0cUY?Z~s}GIz^w~jKm>A?{0)8+};o3y)tOY z2L9@V??K6$GH(BxT#uF~vQexDy_9Q5AHH++*Vi3=hr2iGiOkv^ySXklhlA@R8qo!< z*)a*M8{Fw7x|nG{dwsUnG_~9%-MsVsH`v2^`^-6D&MoG=+no29 R^IjPt)*)`IjLLST{{yy=A3^{C delta 1404 zcmZuwS!_&E82?80M{8@kZCW+2#tQPpH6Ikr&t%fu z=WJQu)|PH_WP-ZsHAN>0D%EYTQkD60^9vxbk;lDTZT5G`L-oX;GpdK8s}VsxqIiVI zyj_AAttYgAm3WG0JhN(1VuW<7t%(i9-Ay#F(70J-D@PTc;|0+%wBRLP!9oe@@EUK( zIuk<;m&NFXA(yt^(l2;NuT~Wxdx^}d70Ej9J^dCw@a7{vaqm_Kll^@6VDakq9^P$) zOD@YW$N4*(W6t8UVb;Dc_{tbIk*!>ufm;={A+Ce{;>PS`88q2{pvpO7br6CTcL&PlR zbTu`${UJ$wDgySP2zzPoLjwEJLyzuCBFs|fQJl-NIIN$RzDB`W47n~lu-FbcMWSNUH4vQ~h(7!u`X4xtsaZ_v^03=%(~*)^)24Z> z(r#37P~&{N28Ya`*nIaw_-qWF;&NmJg*YksW_VIKE(NqAsKikjLMv(-(PT!9@uEj3 zh}R<%#P{andl{EiJ4+jbF_J>oyC~GxS$c!|_LeQl>1#xXQI$tkT{%@}#S2xP5W0Ewg>TyJhY1u|!3(pvcl$6n@k%2yq4D@NF)>rQuXfGjIwYQWj-YAJ1}%H(pgr>j_UzrD;4-Wmq~TLevk>99wDTVP^Ym~J=H*|<%X3f9VC8k3 z&tZ%6>+zfH!hK+%j^F<=`C+XiGMrdTDx{KUHEgM35k{K5c9c09&E9PGF*1%}EC{?uHM6ih zA5F@q+1b)O@{c7}QcJV_g(fSZ0!4>A?k!4wHYm%Suc{uT+iq9SGHQ2uYl@JJ+o8gy zt?I&CnEG3qZFaEeWr$sJ_?RNh9{W-ZWQ_w3Wv211=LkO@eLc;wb_Vr~p?7#W(bUHC zL)>E6LUAe+Zc@HnM{@3@I+JfVuJRHK4jShaWIfntTyQC+;6TTfu6nrUMypRZZ}n7o N)XCBAi7GF&{Q)obO$h)1 delta 258 zcmWNJIZFdk6otQ+iSNyfAn3~bV;E(I0}gRnCeIPa z@|CSPRZe89?|tZ$3@LkE=FE~qFN@e6Y0hoxk@{uIuwYPJ$XYP3E~Oc)ND}x`2**@S p%HgC_=Sp_Nk`r?+-{C}bW2-4{xwGopX2VX4C+mDm&%DxQ;2)c`LxTVS diff --git a/out/production/FIProjetIHM2022/Test/Controller$1.class b/out/production/FIProjetIHM2022/Test/Controller$1.class index f2eab1bf27603490a6360f3ce956628d7582a659..aef7f17c73932ed56c3aaa1d2728fae6d93503af 100644 GIT binary patch delta 19 bcmaFQ_MUCSE+$5k$-9}t8OPKTD2DI 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 Zx5-U1?PMm* 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 H3x)n0Yv}dN diff --git a/out/production/FIProjetIHM2022/Test/ProfView$1.class b/out/production/FIProjetIHM2022/Test/ProfView$1.class index 7603b24719d1506f7fdf2c35db3cc4022ea31ab4..82e188461a821823f97f5238993a496c6caa00bc 100644 GIT binary patch delta 27 jcmaFP_MC0QRwl-z$=jI1Ia3$}8B!TU8PX<;F$V$wf(i$s delta 27 jcmaFP_MC0QRwl;u$=jI1IWrjq8L}8e8L}sfF$V$wg762n diff --git a/out/production/FIProjetIHM2022/Test/ProfView.class b/out/production/FIProjetIHM2022/Test/ProfView.class index f71b8f8cf89f8d49130457c09ab79fdd09bda70f..73233a2cfcf64875fd620e7785a85cee721a8091 100644 GIT binary patch literal 3671 zcma)8-FH-175|+~CU=%t^Q~xp%zx z4jb=Dl{3|cdJ>xx?r;xG`2qZOusHWMqcN}%nO^n>iE=T48?@{+&` zUk0JHz{YgGW+>b{ZaLPB^!mHUSJ2FA6YW?d5G&e#ARXxmtj=qDL#`8eZm~#FCAiK+ z2ksLPQea(ZvmDsP?11N4SMpTWQb`jVwA75kxXHvvl*`5;+b@cv?#4hZvW~qj{CPtSDNG+EF32)SH?J=aFjVHUF_>S!aPt<5kjfuO&nKh2_hYs zQaG8jS<5M?!xJV(@ktWSDip#)r52KKOC4|JMd<|DMhRZ37&d0&6h6g((S$&Eof7XU zxegWkm(xI%*r%6PV&0mR#TX_?@l+h+I1WOS;}z~hWYt?Y6Roo5gq!;>nA7Riy$@lTkmDH8>-rs67>^n!d;oC!gz@(D#lj0@J#rM z*^0m;)+}vxp{#IUB-_(x?j1~0R<||XuMXL>((#$jJrXtg1-LHU7a*_xsI@C6gkD$=X&H{eX2bG;b8 zME6cgl|J<^hOaPeRhBBM4co;)^7a_MCXl=MW$|qjFXB4_E1BS9Qn$;H=9}w04ryL@OywB9C$LFD9+MWG zP_;!)k4kTMUIqkDUbW%}CVr^ytG*<(~62y@oRl>K>?_QTZ@??2El z(DmVRAw9HIkCv*nyu}v0zm6Ey9;a*`sQTA1w_62&jGQ6ewAkeXxU+uPwuW~IjVRNTQ zlTuvUm^R()coq+PmMR98MtyZxlgLIe0$0xO^G))A)CgQ0o{WyJ$1=iGs<5o%M zz`&cdI_8$WDarC;qS_W~VY@0|fz}aDE61fuC2^TKheO9u(ei!i<9?F4iBnUQLkXu1 z2>ghvCj6Ld&K0%wOI&ko(Px|{YWqK-ET3_0fjtK=bA5xWmk~iTf4egC5SaxS6Z2S6 zK|Hf<4v9?99M)!f=deCg!Nyw@i{PjHzmuaDu%3z=unL>7mcvYvyPX_hw(!!Q@iY^f z#VhzZSG=GKTYV|O%9$<=HG*I8yQ8|(L6?L++klt27rJ?qd#_?Q|G&YrJ^WQNt(mvb zS;3ZfkbZ;9CJnAdA8pkj%uuWfLg1G*6T7M=Vl+YLwlCFB*XhS<`oF?M)Kd`Z^$Fp@ z*O%Pidry7Ne4&118$%ca#6K3Wk0I~N_e3h_?@6>&a8P|7T)^N&`=NOZAMb6?RdB4A zKob>=WO{olIN8%o5vFT=qW$zd9@Se>t;L-)+!@Ji)0^7f0v?-)L?Ve@^LV0yNm^Q8 z!Svfm_ccfMM%P8F8_k7RusPWruGi7rg?HfI#%Bb^o{frEKX{K9c1XP@-7Ji>|ly_qK)5c@F44D536G@(j?Ii&Z2wKhkpLeabz9A0i4D` zJkIfSiUXjJAzZ~_Jda`A4XGc$1yreWHGgr%|GL5pz6k;a!_h;huqc-mnQxAMlD61FZ)385lIc>E;jg>_6zH Yt=qc5?qGqx&AjhA{>ZPm{^AGlKl%`pqyPW_ literal 3711 zcma)9TXYlG72Vg8JhB*rZ5}~DVue?1$)NBE6x-op6BB_jE^-VeQ{f#kEZ+1$VRfAwF-EA zALrb=&pG>?d-(l-Z@vrQe!Le&gTV5UvP=v)_PBIiS$1LwBch>EhlZ%YvSI0Z>AnHS zn3MvIy{2V)`vul@WX~HHjC9ekCek_2F|CQ7jQZ0#(u5e6Y0z~vW4S=He}FoF#FQ5W zqD9m7q$M4J)~vtRZ(E*Y7mL#AQMxTUTG1vTc;D*ama=CS(}x_#n95Swms+J`wJ$Xh zqs|>V)*>#T9X8!k(U=klbp%M(>)3!h1@sBWE|=tql4shMz#aaDZ36z?wQd^I|ldfYfv$kZNd@Svz#> z#4h5g#cmbkCEr;Y4foMYLA0~RlwI~>*p0o425~jor=uG^6mg|DWV@#F<7pbu!H}!{ z`*rMJxIe1lpuoyH(0ygkv#lul1lEt(rjsZd37-;)f^-woD;G?|^4u5>;IO*<0Y+g7 zvUQF`afE>=UFhyU!eCHOaYLzPbR1P`Ekt@KuW&NFlZI7Ln^_&lF-Yzig+j2Y)B-+k ztlnc>^wRQzw7hh^M31sGh9Mmv$4PpPM+kJ*DDj?>ZBemjF&8>VGz<&0)j1<;jLBjY zBV>Cbh8zw@F)Fa@(D=BSKPTy%T9+hTnP8%nFVH`Uf?>JbP6V`0bZdB+-teiW;Abov zPbZ$iBg%=7k|7;Ida77GuEW5XKupDwRxk$?aRSh{)qQ&lkQ&ByOepU7p-k7OBRSxj zmt_nEm^#km33`SUQ(?<2nG?*G*rB0J`iP&A%TR=^qonAqSUku=qv+}=+%75K@$k~l zELWYGR)7zilhSe->KHs+RH~$PgeI$ywd1mmPvDaQC59Y1E*(b}azxEaP-FJ|DYRU} zQ)KA8LytISq0g9Lt#UobFnxyZ#;0_AT9LjCSM+nIKEPqvN}(B**NMw1W3TslBM<`)awFQE;StZti7i%9#_E z;gubpu_Xw2JqF0edVSMJ%LUx>rBc4sq9Wc~!>VePRA=t5I;Z~fYCbPq zT=;x-GLggmc7Zmm$eNZMEKiO}XE^XoTh`7S#Sz0X)x5eG_Rg6k`HBS*B<<^^r%H1g zXO{%H$UFasYZkq}3Vth7(0>hs=gogCo4IzI3dFWZCKJ3P!ek-K@Qr6Wcq}TkYR!BMwbs^?z!`N#w>14SB?;;Qg7Bm|HN^lAuX6rF z&R*hJoqJERO|&+=-730T#lQKlaR#B}wrMmaQ`1Jd>Mv9*Ha zLj7$u`q6p)pJNyG6oguRLb&&h1^4e*QlGtJpdZ>#zefS__gU;7oxz@LDpbM8QZ0=Y z^r~U+EDnse9hyP^@vgRk3Lfkt(54EGCA(4;oJfT!lAJ|uwC$l8obs0!q*_{ZYbdxh)zVzS72m3>w5mH2 zkF-5ayW;A0->`VZ*KLVWE~PEDFFI%6=V)JdV=~?t$S-N)EK+pqGt=10bJ(R`oa8dk`ea@dTCH{uXKC{oF z30IlqzrZh9lgQ(0jzqw^X*BZAEx5@w4YTyw1~h!gD;hP#H0;)JKtoQ$+qCdMtYaa(<7eEv_$_~jdEYhM L;wa{iH~{_!&efg? diff --git a/src/Test/AdminView.java b/src/Test/AdminView.java index 58d5a61..92f41cd 100644 --- a/src/Test/AdminView.java +++ b/src/Test/AdminView.java @@ -2,6 +2,8 @@ package Test; import API.Etudiant; import API.Groupe; + +import java.awt.*; import java.util.ArrayList; import javax.swing.JButton; import javax.swing.JLabel; @@ -15,6 +17,8 @@ public class AdminView extends JPanel { public AdminView(ArrayList e, ArrayList g, Controller listener) { super(); + this.setLayout(new GridBagLayout()); + this.listener = listener; this.g = g; this.e = e; diff --git a/src/Test/BDatabase.java b/src/Test/BDatabase.java index 60b4f54..9b093b5 100644 --- a/src/Test/BDatabase.java +++ b/src/Test/BDatabase.java @@ -219,6 +219,19 @@ public class BDatabase { return listGroupe; } + /** + * + * Recuperer le nombre de membre d'un groupe + * + * @param groupe_id le groupes + * @return le nombre de membre + * */ + public int getMemberCount(int groupe_id) { + ArrayList forCount = this.fetchAll( + "SELECT nom FROM fi_eleves WHERE groupe=" + groupe_id); + + return forCount.size(); + } /** * Recuperer l'hote courant. @@ -251,20 +264,4 @@ public class BDatabase { public String toString() { return this.db_host + "\n" + this.db_name + "\n" + this.db_user + "\n"; } - /*** - * Recupere le nombre d'etudiant par groupe - * @return - */ - /** -* Recuperer le nombre de membre d'un groupe -* -* @param groupe_id le groupes -* @return le nombre de membre -* */ -public int getMemberCount(int groupe_id) { - ArrayList forCount = this.fetchAll( - "SELECT nom FROM fi_eleves WHERE groupe=" + groupe_id); - - return forCount.size(); -} } \ No newline at end of file diff --git a/src/Test/BFrame.java b/src/Test/BFrame.java index 9569844..4d10cf0 100644 --- a/src/Test/BFrame.java +++ b/src/Test/BFrame.java @@ -108,7 +108,7 @@ public class BFrame extends JFrame { * @param daron La fenetre qui va etre bloquer * @param content Contenu de la fenetre * */ - public BFrame(String title, int loca_x, int loca_y, int size_x, int size_y, BFrame daron, JPanel content) { + public BFrame(String title, int loca_x, int loca_y, int size_x, int size_y, JFrame daron, JPanel content) { JDialog frame = new JDialog(daron, title, true); frame.setLocation(loca_x, loca_y); frame.setSize(size_x, size_y); diff --git a/src/Test/Controller.java b/src/Test/Controller.java index febd14e..e81c440 100644 --- a/src/Test/Controller.java +++ b/src/Test/Controller.java @@ -18,11 +18,11 @@ import java.util.Objects; public class Controller implements ActionListener, ListSelectionListener { private final BDatabase db; - private ProfView pv = null; - private AdminView av = null; + private ProfView pv; + private AdminView av; + private StudentView sv; private BFrame currentModal; - - private MainMenu parent; + private JFrame parent; private ArrayList e; private ArrayList g; @@ -32,17 +32,15 @@ public class Controller implements ActionListener, ListSelectionListener { private ArrayList tmpStud; - public Controller(BDatabase db, MainMenu frame) { + public Controller(BDatabase db) { this.db = db; this.e = this.db.getEtuList(); this.g = this.db.getGroupeList(); - parent = frame; - // Les 3 fenetres s'ouvriront en meme temps (Pour le contexte du projet) - //this.pv = new ProfView(this.e, this.g, this); - //System.out.println("[+] Demarrage de la vue professeur -> " + this.pv); - //this.av = new AdminView(this.e, this.g, this); - //System.out.println("[+] Demarrage de la vue Administrateur -> " + this.av); + this.sv = new StudentView(this.e, this.g, this); + this.pv = new ProfView(this.e, this.g, this); + this.av = new AdminView(this.e, this.g, this); + this.parent = new MainMenu(this); } /** @@ -58,11 +56,9 @@ public class Controller implements ActionListener, ListSelectionListener { }; } - /** * Pour afficher une JTable sans listener * - * @param parent La fenetre qui sera bloque * @param frameTitle Le titre de la fenetre * @param size_x Taille en x * @param size_y Taille en y @@ -81,13 +77,12 @@ public class Controller implements ActionListener, ListSelectionListener { forModal.add(liste); - BFrame frame = new BFrame(frameTitle, loca_x, loca_y, size_x, size_y, parent, forModal); + BFrame frame = new BFrame(frameTitle, loca_x, loca_y, size_x, size_y, this.parent, forModal); } /** * Pour afficher une JTable contenant un listener * - * @param parent La fenetre qui sera bloque * @param frameTitle Le titre de la fenetre * @param size_x Taille en x * @param size_y Taille en y @@ -113,7 +108,6 @@ public class Controller implements ActionListener, ListSelectionListener { /** * Pour afficher une modale classique pour plus de liberte (panel a creer au prealable) * - * @param parent La fenetre qui sera bloque * @param frameTitle Le titre de la fenetre * @param size_x Taille en x * @param size_y Taille en y @@ -436,18 +430,16 @@ public class Controller implements ActionListener, ListSelectionListener { } } - - public void setAv (AdminView av) { - if (this.av == null) { - this.av = av; - } + public ProfView getProfView() { + return this.pv; } + public StudentView getStudentView() { + return this.sv; + } - public void setPv (ProfView pv) { - if (this.pv == null) { - this.pv = pv; - } + public AdminView getAdminView() { + return this.av; } diff --git a/src/Test/MainMenu.java b/src/Test/MainMenu.java index f4469cf..319bfb9 100644 --- a/src/Test/MainMenu.java +++ b/src/Test/MainMenu.java @@ -6,50 +6,58 @@ import java.awt.event.ActionEvent; public class MainMenu extends JFrame { private final static Dimension MINIMUM_SIZE = new Dimension(960, 540); - private CardLayout cards = new CardLayout(); + private CardLayout cards; + private AdminView av; + private StudentView sv; private ProfView pv; + private BLayout settings; - private JButton[] buttonTab = { - new JButton("Admin"), - new JButton("Prof"), - new JButton("Student") - }; + private final Controller listener; + private JButton[] buttonTab; - public MainMenu() { + public MainMenu(Controller listener) { super(); + + this.av = listener.getAdminView(); + this.pv = listener.getProfView(); + this.sv = listener.getStudentView(); + + this.cards = new CardLayout(); + + this.listener = listener; + + this.buttonTab = new JButton[] { + new JButton("Admin"), + new JButton("Prof"), + new JButton("Student") + }; + this.setDefaultCloseOperation(EXIT_ON_CLOSE); this.setExtendedState(MAXIMIZED_BOTH); this.setMinimumSize(MINIMUM_SIZE); - init(); + this.init(); this.setVisible(true); } private void init() { - BDatabase db = new BDatabase(); - Controller listener = new Controller(db, this); - - av = new AdminView(listener.getEtudiants(), listener.getGroupes(), listener); - pv = new ProfView(listener.getEtudiants(), listener.getGroupes(), listener); - - listener.setAv(av); - listener.setPv(pv); - - this.setLayout(cards); + this.setLayout(this.cards); this.add(first()); this.add(adminView()); this.add(profView()); + this.add(studentView()); - cards.first(this.getContentPane()); + this.cards.first(this.getContentPane()); } private JPanel first() { - JPanel mainPanel = new JPanel(), centerPanel = new JPanel(); + JPanel mainPanel = new JPanel(); + JPanel centerPanel = new JPanel(); Dimension buttonDimension = new Dimension(300, 50); mainPanel.setLayout(new BorderLayout()); @@ -75,18 +83,22 @@ public class MainMenu extends JFrame { private JPanel adminView() { - JPanel mainPanel = new JPanel(); - mainPanel.add(av); + JPanel mainPanel = new JPanel(new GridBagLayout()); + mainPanel.add(this.av, this.settings); return mainPanel; } - private JPanel profView() { - JPanel mainPanel = new JPanel(); - mainPanel.add(pv); + JPanel mainPanel = new JPanel(new GridBagLayout()); + mainPanel.add(this.pv, this.settings); return mainPanel; } + private JPanel studentView() { + JPanel mainPanel = new JPanel(new GridBagLayout()); + mainPanel.add(this.sv, this.settings); + return mainPanel; + } private void action(ActionEvent e) { JButton origin = (JButton) e.getSource(); @@ -98,8 +110,13 @@ public class MainMenu extends JFrame { } else if (origin.getText() == "Prof") { cards.next(this.getContentPane()); cards.next(this.getContentPane()); + } else if (origin.getText() == "Student") { + cards.next(this.getContentPane()); + cards.next(this.getContentPane()); + cards.next(this.getContentPane()); + } - } else { + else { JOptionPane.showMessageDialog(null, "En travaux"); } } diff --git a/src/Test/ProfView.java b/src/Test/ProfView.java index 2d8118a..c3f0718 100644 --- a/src/Test/ProfView.java +++ b/src/Test/ProfView.java @@ -8,9 +8,7 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; -import java.awt.Dimension; -import java.awt.Insets; -import java.awt.GridBagConstraints; +import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.ArrayList; @@ -25,6 +23,8 @@ public class ProfView extends JPanel { public ProfView(ArrayList e, ArrayList g, Controller listener) { super(); + this.setLayout(new GridBagLayout()); + this.listener = listener; this.e = e; this.g = g; diff --git a/src/Test/StudentView.java b/src/Test/StudentView.java index 2a92a9f..d78fe98 100644 --- a/src/Test/StudentView.java +++ b/src/Test/StudentView.java @@ -8,23 +8,23 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; -import java.awt.Dimension; -import java.awt.Insets; -import java.awt.GridBagConstraints; +import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.util.ArrayList; -public class ProfView extends JPanel { +public class StudentView extends JPanel { private final ArrayList e; private final ArrayList g; private final Controller listener; private JComboBox groupeOption; private JTextField text; - public ProfView(ArrayList e, ArrayList g, Controller listener) { + public StudentView(ArrayList e, ArrayList g, Controller listener) { super(); + this.setLayout(new GridBagLayout()); + this.listener = listener; this.e = e; this.g = g; @@ -110,20 +110,16 @@ public class ProfView extends JPanel { searchTLetters.addActionListener(this.listener); searchTLetters.setActionCommand("pv::SearchStudentPer3Letters"); this.add(searchTLetters, settings); + settings.setAnchor(GridBagConstraints.CENTER); + settings.setPositionY(7); + this.add(new JLabel(" "), settings); + + settings.setPositionY(8); JButton changGrp = new JButton("Changer de groupe"); changGrp.addActionListener(this.listener); this.add(changGrp, settings); - - if(this.db.insertRow(la_table, new String[]{"nom"}, new String[]{"felix"})) { - Affiche "OUHRAA" - } else { - Affiche "Marche ap" - } this.repaint(); - - - } }