From 0b995a0bcb56bcdffe2754f47e5823606cb91cd5 Mon Sep 17 00:00:00 2001
From: "pro.boooooo" <pro.boudjemline@gmail.com>
Date: Thu, 8 Dec 2022 02:10:28 +0100
Subject: [PATCH] $

---
 build/API/Requete.class     | Bin 392 -> 412 bytes
 build/MNP/RequeteNP.class   | Bin 971 -> 1109 bytes
 build/Test/BDatabase.class  | Bin 8233 -> 8265 bytes
 build/Test/Controller.class | Bin 22346 -> 22392 bytes
 src/API/Requete.java        |   5 +++++
 src/MNP/RequeteNP.java      |   9 ++++++++-
 src/Test/BDatabase.java     |   3 ++-
 src/Test/Controller.java    |   3 +++
 8 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/build/API/Requete.class b/build/API/Requete.class
index bf9ae9174db71ab03a49d520abe230539e835d44..bf2ac1bc3b188761c47b5d1766b078b5488350d9 100644
GIT binary patch
delta 115
zcmeBRp2N&_>ff$?3=9mm4B`{HW^r+*r<MelB$kwxOk7mS$Ua$yQNxFYk%5na3#f*X
wfgeaSG6(?KIzXBcNHZ~R0FexWK#~nCqRSuzWb;5|8H5=`fILP9QLrj802jj!lmGw#

delta 96
zcmbQk+`-Is>ff$?3=9mm3}O?xW=-5s&d4@dgHgkUfsuiafeT3T10{8UG$W8^V%z{C
e83ceN8(2hxK@iC1fygolF$e>Bj0_@RRiXeZ{0g7|

diff --git a/build/MNP/RequeteNP.class b/build/MNP/RequeteNP.class
index 89620bb3a9b6cd8b30b4443138286582730d3d76..76bcef90ee023413ba05e010577475c0e1959d92 100644
GIT binary patch
literal 1109
zcmZuu%Wl(95Ir|>>?U>6=0#rwO6enULnGD&B!qZaYC}Y-uy&HG)K!{*a}DB;Sg-&I
z3yB3Ez(*lwuKR%08_(S1IWuR@{QmRv7l6lT<&Z+!f?*>AQ(*bb`{1?4-elBz-9M89
zC15`CC%$?jkghj+Su7xHA!lO|wm|;4-D$m%??b6%yCabDhXTUos)CIrEDKoYayIiu
zQlNBn-Mp&;e=<7c!jg?L_sU8YcBf%5kc?Js++x&FpWbO;)y5hFiywV8IDHvR!x-PN
zahvCuGv%ppX5kLiJngubvIO?)?#;=rn*cU?H1OGUNMe_c{E2Lb=Y1KRc>S@KKOK1E
zo)`H1z5oq%>d(0PKO+tW7DiG%SD{OOkZ-O)j)3D!D=PKIO-TYa)wsi}DvO>cw7x)r
zvbWcJlUW3Gd0{$GE_UsO&ngR7*EnFeagV%AL7)Z`B|aLRy~LN%k&M@otk#hn){z{g
zXb~@iyY$_p*JtWuQQUQYKsXx_ET<VE@6;j`ovIO`;#4ycR-836!umI=Own{;ixdEP
z7$_i1lMB?lj3QmLM7_({L4|67S8;dT$2Praj#evl#(GmaW5sEmv1UVOtU9AJ)@_pB
z9b(6-TNJrR#`%uo7fNDLTm-D@!FF75F<4*^bwW1j|G(t?*Ew=6k=#g}Y|T&JN+dgp
h<jOpGFOj^TNM4yIHxtRt#GTjYcYc^iexRK>_zNYyo<aZs

delta 491
zcmZvX%}T>S6ot=CoTfk4S}O^$+NQ0sHZJ-E6<oR#pTTSeLDzkTGOm39abck=K_5VI
z+1GIARy>&z)G`cn@0sCz_h(st3#zYQPcHx_IGR<Tw*#~VwUe{c@p*oAlV9h8c=i$L
zNbdE!r2Y<+{*+Nvf<R%HagXpVJd~IdJ@LBJIhBVFV+R4_I@VA}1sgmKw6KX7O?0uv
z3mjV#33`0725Kb4s0O{BQ7!)YMunzc;ftvhoqY@#i#f*3GNn-20?h{sJ4Z1s5So6r
zwj$r-pI{&9U-}2GKd!)SCw%a~wSo1eUl|tL+pdWd99mG{`QgQ{H+6as9ZeR9R@cj%
J@W||ueFM${Cd>c;

diff --git a/build/Test/BDatabase.class b/build/Test/BDatabase.class
index 05e4d135750693e1991e4e9e97f87f8aa074db3c..3984492e9d4543563da49e9debfe6b55822d8199 100644
GIT binary patch
delta 336
zcmXxcKQ99T7{~G7b1iqJ2|=YD?k)yY8oer!l%-glm>3K!M=nLA5fQO57?>oUq?3qP
znog}qY7<5;0IL^JgD?<(ALqI}`8;`^d`sEeY^5(8O~mc#RcFhw)|`CKn%&%3$>&CG
z+van%{bD?P-x|6@6G8w^xJ#d)d3N=&?wA_UswiK>y+o~wtGPXmia)1`iu?ufB6A9D
ze4}S}4)BU2JfVOZj`1!Vupqq*mhgd3Xn$qA$pzv9zVHn~3l6DYq@WY~loSPEV3#aW
z5IxwYl&AqotkZy~5yM!fv`8gIN|R9kYa=vR&rzVB6ZtujpA-2xk(cALk)lO@G}5H-
Yb2P$nvzMAZxuOnFXXX&a_`#g{1xw{n3;+NC

delta 313
zcmX@<u+m|JCXa-qhNn+fVp*boPGVlVesD=qW?s6rr>E!UV4mv&oW~hBfslb=%4B0%
zXU4$E<+6^_+Zo<$W7rqo!oj%w|0?YbKv@=s&p^_RL2&Y2S<CtkhPMno3~v}FG5lco
z0u+w{nqbKg$?%)u4+96tETH&LAk6_(^_Srv10w@JLo1^$kj2Cx#!$zo2V^lb$T5^L
z>H}FU3~CH{j0Qj!D}x?G8lxeQ#l~R95XWc)WU(_c0ZsB?V27B-Xw1N91~HD28D<=i
z1vL)Hf*J>8L5%~lz{X8JFK56QF-hKtk#Vwvr08T1d38pv$p!K@jKX04A$b!<iOJvP
Fg8(bsMqmH{

diff --git a/build/Test/Controller.class b/build/Test/Controller.class
index 7917bea0346f03c4c67e1a9ac8a0cbe9dfe859b6..14c213ad405476955c5087fb63dbd6e559d31aed 100644
GIT binary patch
delta 1090
zcmZ8dYfRO37=GUOJ#r3k{sFV2T-1&wl84e1IK=HBB*-lqw+Pf3*I?kZxGY*gU>96t
z6u&7sb++mZGGfX<Ni!*E-Q<Hc4JfN+4IL$zHH%sw`q9=Gzr1_)JkQ?eeV=nfv@k@+
zts%*`Jyz9NT-#Vtv-OGHO?#^RIhy0`oPcbCO-pHwO_`N`uyK-|J$Q?-=+|U!*{-V8
zmdr{sJ><<`-(uJh2pD_S!p3nLS7$cO(zNnMh10M(5oIMhrY=PHvmdFaV`kVlR8_dY
zr6jdE)=PcnmDoz6O)5L?bE;8}_>bu|^HTf-(WL56?4fiOo77C_)lgD7)vF*+^Rk=w
zEM?az^d7`7F4sG-j$q|UI90DFC98KB(~F$bVH-itha7#H-GmVgjL=%!S#XKmqQ+^J
z6AMZ#xA1Po$!Ve0E?0<8hz=MW!EYx3SonQC++>(#$z+N0a--ekX8R<!*{^cD!TgL7
zz#T>ecN!kvYvl8@MlE+4d$`SL<`<1l?l!w0IKw+?VdaZ-8NT+fafHXo3!B}<dHw`*
z@Uc%~kiVj2SQi`RQT{+DYXk?+fw07A<9WUVj9{aVuWKX-Givx(y~Tnx#!l0lUd{d)
zR$Q}^hyKQ4wJdWq<z*e&ivU(w&Iho9`w-5rU_Bp1A|FCJA4WbO#ddxbHT*gn_zkpj
zKe~7TJ=(jU-&T&S1LRSISp~kw^(iOdVpG|&r^4TbKcCi{-@__h&jvn=Ej)^c^x366
zhTZ%bI`~V|lG9D?7ZJphaPkz^@wB#ngBZSqH2x0R{5`hu4=CfysOKNi&Oc!v&*<<g
zILfo|^3OQQ*D$6#_>|{$SJyGcH!#CD3H%2I^9>5)zjQd@fe%0{{%=mBKY2kn2Qx6Y
zliUA6urTfuKe)voNn#*H0+A;{D3ztClH2i=IM5@@v0s95NJ20mp%|7hjL9mT6DPiq
z)tHn!aaGn}PQvlKtR;)wO@6YD0wt2d<X(!G^^_qSC|fqt!xBZ?C7Q}5h8j{OmRjU~
zYL_^ANfM|}66uH}(J}GRuq4wd*-T@SN)xh$W@Rf|B!gE<Dmx{IBjrJMORiav*G%Dg
zFeD$VrC9&+2oj_Oxl)R9*@gz$fhRTJCOg%9ey?u@mPjQ+rCRMPcs{5O0aA~<WEY~P
y4)OB1auz;HO{$|Xky`Y0s0)P=)cPL^EQ+8G)mjvy@`@tqIgQe&%lxS51^O4KZ5^-x

delta 997
zcmZ8fdrZ}J6#tyh!R`g_PoY9C;R7>Df%!nV#N%?~aVfYCGr$MICa=O)T7r}gAzY@l
z3iBJ5OO|ahQ5P{Tp+-@-QA;+hq0z+NQ%4CsY|Z+oe&v6iKh8e;oX^hZoU?PiM^5)h
zuOr6ie7LUB-?+7~HVjT?xR{A!f|)nS;;P5$a<>)MhBJj;7qbz#QChpPv8MjsEt|JK
zUKcEgIpPjo3@0K0tI}Lweo79S!Q@HlGhHj<<%Qtr3WvxuW-R3}Lnlmg>LogVH#MG%
z5^e5D>yjsem(yxRTqcnIspOidj1g%LPGpRV^qRw2?Gk6wyiIb%^mwbKz(i&@g`Z8j
zg$XCH?*K+jXLiogC!HUF>op;vA8}F60j&IpDJSU>3^2W9eaQd#EVIbxmo~G>H(QrT
zcyPB*LK3^#=o)3S>mql!CfQ;MTP-)AwvyOp<#Cr)#AfS$?y)NPd~h&tkd=9G@SJ>y
zP}dpk<SFTb)76cBevB#H<Qm1xJTE>t{yhnY_#y1DDiOsg2xeI8IL-MW+?Jm|+ei^>
z<?<K1O9<|;(t~3K4>8>9z*UE2%U@_S`GrF{FWHvun8m$_rokM(f_Qdd3HKw5uc3ek
z@Bj~@f}N=6AvEw!?BHA2!!ESj+72Eyc}4pr(_APj34Plhr3VS@HJ-qDd_TfDV0S)_
zc|3`wd=L2?#45gzat>iLN6^MI!Q_=MO4a9x<QU?34vTr-mX0HpU&7A|2yg-q@+(yF
zYdp$t(8_P|9KW~Cf502Oj4ocmyPU)@f5a#J31@i~<DAAN{wClxadTQ?`A0CW_z+wF
zgqwe3nL6N6C%hVl9JR1oXQEsqP^XdDt~aAyZ$*bj;dPyjZjDBtx-qP=IIVN>na;x(
zIv-bb0jBhJT+@XTqVW=@cS?jVl2}cU3{8~#G)V&XBdpP7QlZPGT9c(AS5su0rb?@N
zWUt;WuWGt<YK9!uOzG1sIiX$|R-cS&j!bGkL)6c?>SLT1GEs}@(Lk_mb(6#w!_rk)
zpr!UMWysVuDAu*8)^%vmay(`8Em~pbl<W)LfEika+qA|UFL^ey9<y{K7V0BN(RyU)
vCR1FxLAIE8O0%TN&QV6n?vm~Qp==wqm}6xzrnM|lcG}1<yMn)#?UsK4U~vZ@

diff --git a/src/API/Requete.java b/src/API/Requete.java
index 786994e..91d9a4f 100644
--- a/src/API/Requete.java
+++ b/src/API/Requete.java
@@ -32,6 +32,11 @@ public interface Requete extends MonPrint {
      * */
     public int getWitchGroupe();
 
+    /**
+     * Recuperer le statut de la requete
+     * */
+    public String getStatut();
+
     /**
      * @see MonPrint
      * NB. On n'utilise le mécanisme des méthodes par défaut pour donner du code dans une interface. C'est un petit peu laid et à contre-emploi mais pratique ici.
diff --git a/src/MNP/RequeteNP.java b/src/MNP/RequeteNP.java
index 0230d1f..1b13cd0 100644
--- a/src/MNP/RequeteNP.java
+++ b/src/MNP/RequeteNP.java
@@ -8,13 +8,15 @@ public class RequeteNP implements Requete {
     private final int etuSource;
     private final int type;
     private final int witchGroupe;
+    private final String status;
 
-    public RequeteNP(int id, String message, int etuSource, int type, int witchGroupe) {
+    public RequeteNP(int id, String message, int etuSource, int type, int witchGroupe, String status) {
         this.id = id;
         this.message = message;
         this.etuSource = etuSource;
         this.type = type;
         this.witchGroupe = witchGroupe;
+        this.status = status;
     }
 
     @Override
@@ -41,4 +43,9 @@ public class RequeteNP implements Requete {
     public int getWitchGroupe() {
         return this.witchGroupe;
     }
+
+    @Override
+    public String getStatut() {
+        return this.status;
+    }
 }
diff --git a/src/Test/BDatabase.java b/src/Test/BDatabase.java
index df2a7ea..ec8d0ad 100644
--- a/src/Test/BDatabase.java
+++ b/src/Test/BDatabase.java
@@ -240,7 +240,8 @@ public class BDatabase {
                         requestMessage.get(i),
                         Integer.parseInt(requestEtu.get(i)),
                         Integer.parseInt(requestType.get(i)),
-                        Integer.parseInt(requestWitchGrup.get(i))
+                        Integer.parseInt(requestWitchGrup.get(i)),
+                        requestStatut.get(i)
                 )
             );
         }
diff --git a/src/Test/Controller.java b/src/Test/Controller.java
index 98a8de8..dfa1fc3 100644
--- a/src/Test/Controller.java
+++ b/src/Test/Controller.java
@@ -623,6 +623,8 @@ public class Controller implements ActionListener, ListSelectionListener {
         }
 
         else if(Objects.equals(command, "av::ShowRequestFromStudent")) {
+            this.r = this.db.getRequestList();
+
             Object[][] data = new Object[this.r.size()][5];
 
             String[] titre = {
@@ -634,6 +636,7 @@ public class Controller implements ActionListener, ListSelectionListener {
             };
 
             for(int i = 0; i <= this.r.size()-1; i++) {
+                System.out.println(this.getGroupeById(this.r.get(i).getWitchGroupe()));
                 Object[] info = {
                         this.getEtuNameById(this.r.get(i).getEtuId()),
                         this.getGroupeById(this.r.get(i).getWitchGroupe()),