From c3975ab084ad6ca9b5f831ff513be0cbfca52598 Mon Sep 17 00:00:00 2001
From: Ethanell <flifloo@gmail.com>
Date: Wed, 29 Jun 2022 00:27:40 +0200
Subject: [PATCH] Add product and purchase list Start of the detail

---
 .../WEB-INF/classes/DAO/MagasinHelper.class   | Bin 8758 -> 8959 bytes
 .../classes/controller/BddController$1.class  | Bin 0 -> 868 bytes
 .../classes/controller/BddController.class    | Bin 5860 -> 7417 bytes
 build/web/WEB-INF/classes/jsp/detail.jsp      | 118 ++++++++++++------
 build/web/WEB-INF/classes/jsp/resultat.jsp    |  75 +++++------
 build/web/WEB-INF/jsp/detail.jsp              | 118 ++++++++++++------
 build/web/WEB-INF/jsp/resultat.jsp            |  75 +++++------
 nbproject/private/private.xml                 |   8 +-
 src/java/DAO/MagasinHelper.java               |  70 +++++++----
 src/java/controller/BddController.java        |  80 +++++++++---
 web/WEB-INF/jsp/detail.jsp                    | 118 ++++++++++++------
 web/WEB-INF/jsp/resultat.jsp                  |  75 +++++------
 12 files changed, 473 insertions(+), 264 deletions(-)
 create mode 100644 build/web/WEB-INF/classes/controller/BddController$1.class

diff --git a/build/web/WEB-INF/classes/DAO/MagasinHelper.class b/build/web/WEB-INF/classes/DAO/MagasinHelper.class
index 054b5223835d0c24fc3b9033cf77c2eee177c882..9e73c1a1439f1f2b6754ac53c48e1085f15ab66f 100644
GIT binary patch
literal 8959
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

literal 8758
zcmd5>X?RrC8Gg@XCNoKf#jp;G3<4UmDk@3>v=|qnS%3h7V8hMil3X&G8D;^32wJVO
zR9iKo7+b3dxC^LYM2)T1s-?B9*0tK&+V*Lmu20)X`?S`+=iECpcamWdY#)AP&Rx!T
z&UfDT``+`Nn^*qx)UyE2#BcL31y|<tYQ4PL;Ko(?aAJKvuEv)Oa1E|4z*lgc{JCEK
zZ1iB0Y&RER3%)9^ZgAtqd<??ZJovf?H+f*lS2ufbiw9jE-0H^Ge2m0xvhVE$*oHgg
zPq%z_r+oGe55DO^LK@vwfN$aM0^Eb`9^9LU9oXr{u6&$|^&Z?O+xz9u1M=s=d_07Q
z<p7U(@Tdp7-Pn_l)3Mi$$J}^az#Y?LF(Vuj7*QLJwpO$m&3ZJX#r29t^F@__ClC&X
zLm@pTFsyckwo0o=#EoFZtY}p0tTkeBcFAirT4|Mt>H?Fq^_gxy3~Hg)ipF@<2(?zt
zq+LO)9<NS~URY$ewT5<9hg&%6pjsoO*C#sY-h8b&$R~xh;eZxgs6`EVZ#{Iz+YI_S
zr1tz-4Hb1-s}?gtv-My^k8-wC`;C7Hw{oW&AtOFhAg5^ZLetAR(Qr#55a-xprNki<
zthot2+Q}IN{jxApOTA!CK##<UFW-5hdMpu)YjJ_WHi)ccI^t^tM)w(ZepCy^w173h
z@XQ5wMv{vj*JrrtYW0@K3g-chaV^kZr$rP@Zam?}K1QS)`vvkP2SGy*$;J7z4pp6q
z#ls!MP;xf0s6Ut4cnfJAiX{~>cH&7Ur##<?1;U9C>6i2l<dZrh5DnL9(RQ5>O~~qq
ztqXl&5S#8_W<;!Ej8IIE#*_Xss*7r>v$#uAg~nMGP|4n0TR~I6T53%TyVM8_XlluD
zR8$K%o7Nf;S|=hc%#@_LKvUMq`cHpsPh=#znoLyPO<D`XiG<}gMcTq4BADBxcW6eC
zxtQWp;H09O$$i)8Fu1hbfMT4oBXCMqLS+Iamqug;w&+3KzE~%RrbjtVayU8XtU#M4
zLuiPcGc6NVd>8e9YK3VcO2e4m5N)vn%p+q#TO%1@{*i<H#xOhS7aA(<GqSo|PUOW@
zoa4oLsP^J4oJ|+f)2CF*jVHb6!BcJ=@ZxDa<HoaI^x`=$zAf#(gXaY{$GFHq+#e~A
znCV{AQp%eSEtFW!G^D&m%_r7t8FaEk#9BjjI2M=pD-&8MZp1qqLbJ7yHAJ*M5s~lc
zuMw1rC2v~vSRiUBh43$rhCBRL()uG_ynyez@uC;sLzNdV;pODAGKIy9SHO_mVtKBW
zrvtduua(Pik*(IE;w4BCJ)<<^b_#D9&ZW)eQ3kW=MUr>FR_eFsslVC3x=oMj9MGN>
zGnzAQ1@1Y4yz!F(3kZMEXxIIfDu=xIJ`QrTN_lEukcmRZ%BdEE6+<=&qDrOA389Pz
z)6&+*PeZRgmt>qadGQ1MkQ(g8t1|e0B!A9Bn-@REPXvnlvfxj_o@UoSqmrrT#cOz-
zdhW$f@rE03dhr(C7AQU15oCP0@s1bo;%8LLzFK`=!U!@gsTX=QswbjeyodMY&(FR1
z1wL@&mtOn|AA0d?>36v~>l}MV`~6xL=augQMHYN@vlbQEBX@FN_o-xQ*J?s>y;Y|#
zzrk9*=(p38sdVRt<`v9n>Q`D4q#_CUGIwy>R-2J%^V_1~)n>t=W}2NWkQT58;_TEa
zt5Uj<3K5QWat~#hkvVu~531>y!@cJ=6prX2%ZQ#HYCH}!EbBnz%ZN2_45gr#ao<=T
zOvKs<Otao<gfiATw%_Qs*K$h?M0E;-s&JSuS@()eCz8d`kSve6c?K2yu0Svx<F+*-
zS(C+91}my%nVBqi21QsV##P}$j{@wQ7bDoJcoeA0;z<8}wJ#A#*PJnJ6$dP~4`N12
zm9=*nVOGE_ErZ5d$v%O|4TL*73`UM88V&}VSx@nqSptxUY$I`d%%{s%y!M&Ss)D&!
zW`T**d5pMDMGiChh9@ynb$5;RoP7$@L7jX`fJ6EkdO0*{r1lGIaT%%6*cprK9So6h
zg8i+smFu2k;!fH-<g&F01BrWanSF_t_ZC>T>dsOO8fNs*1UGAcPduC?H`8}(u4Gzf
zddMS;ijyE?J%fa#ha@4_tX(9gq4+{An9wnv$G9_jwsY{0B?EsUiwFpu%PR+_@vJ6L
zi7H-C=aUNF3AV1{$02sBE;IO>s~!%;OkR7<4)_AT$UAeGS$xK_guil-CCE{I#ux90
zqgXtFoZ<s;F5VB<6A;BuBDV)_0Y2Wt&JM^4hQr0*kvwdkggo92g%5s=vQ0SNno!_;
zdaEW92Cb#tR#7YJ=y6UDJOX!MkbM&Kc^<=3b;uV`T?-3(;B}zBtOo-GYE#zRP-9*X
z6u5L3rq`G4!(iLn68qbeE1kAi1JbX2&fb#UT#b{kEFs3S?WCtmuuQd`xI(o~wfZRp
z6&TCaoXnnnj3IB6FoA4L<XR`uwuF{NSc=KCFF_Z|6*6aW^;K}=0$fPQm(unk%;psl
zvCwj`Zw)RcUQXPMOHj)>>iAxgXuhlGRfC${^$EtfF~^O$>)n`lxf_k2U<5~R{3p8#
z%>R5~Kj}n+eF|51CgC}ouumn}=Mwg5Tx*qz=p_VlDI<Luqq~bR%MAEDU|(?burFj+
zrj=MlW^+0H4pArSQ(<?+Xjfee3l;2@PM@=INJ$Td=HODFQ-yvyakk--bOi6hOxgRe
z!7o+9%(-o_2fwSg)C~Rxw5i~4z(zXWhOlZkVzX*<RPay50KTgs3m21xTCz|_78=OH
z94>nvL%NZ7i)p<8E3lAbEXH<nBAJ*;K&E4eN&qL{x>N!<B}i5R$g4}Sh!8qxB~!t{
zS?*S;kfQ>B9MXaR5iViqH}wtu#i`I=Li1x*oM9(I=-WYG#?@$qBY?qZA@DkZZzb?;
zT(80K4^ws833ZU+A7=Q+jwAe!N@Ffd0UfY_-mIkEwr7|j*I&+u|9`-p%9xRIJ{28|
zvIeT6Y&!^#Z0&NshAZgglXV35N^WNxDCk!a+^cDOJuR<cd|ylZ>zNCiQ@~cF<a`co
zlXAW}CFdJca(-PuIhXI2Sh_L+&QCc>jvGr&O^3)P>X)YgpZi$>A8{f8Zbq}Yf8M|q
z+(^)FBH%X@@Gb&=D*@k1!0#j$w-fMf1pH0{e%EmTE+hFU;r$YtEb(rmY`AIIC2S?b
z5w*M0c>p69j~-LDAHGVZwmw%6MmbFJ9-XXdSoCbebh~y}RJwdFYPZz*F+5tidMk4e
zA=bIQd$_UWpq{BeNVRL|XDil1wkE)p7|84GyxW1%*vYcwJ_36`gXaOp=!3L<j1~`5
zG#)_+k0OEHw0;b?V4nhdHrHN7onA({ak1AR71>fqyHYycg=PwoEIzv^MmouqSIep0
z(z}~fv^z;7C{(V0V>Ig&Q?6ODWL7Gz6fkqkyp6?V0WG>kr6;xgBctxIQ1>}~E?=(C
zy&q#M^Q65muLmbP;Pdq0u;AzU@+A1|Cc)3^t;|o&p1D)zTi`DsY!dthlnL<qYSr4o
ze~NFPCiu?~{9c03uX%W$z`sD7gS2=N5q?5T@C({HyiDtZtb<=w;715SH3}8@dF*9^
zpC@5Sf#011zdHqfH;Izq%YG|(CAZaX?gxw14%p3IVUemwx)n)o_Pkw@<mpS&JStB=
zk~-+KNzyg6ly%MCW2tM#rRy61=pKwu*EKyjMesxD1cB!;@_$+6EG6o4OIS*^0k7Ao
z_Ey}cTKj(c8iV?E_I!gO{3iF>x5(q$EMVSYI=oB!4`}@!R^xq+@c~olL&cw2<oK;3
zXEo86+k#|cZ;HRY+<;{AIA|4NlF1_Hkt{{dN|iN>vK2WUh+2f)Z4q+tSO}SzCZtcH
zc}PNZGdauy*P=@2UQ9ZGQ+ZxIt*~exCd(qUcppmkq4ap`(KJ<$Dyp_ptH8fKs<o%v
z?+D@V3F03})gMXKpGei8N!4En{$EMe$E50Sr0VZfrhjmY`Iz6Q|CN=laVfeErsz7D
zs!3l-(e=_{>FVq&axug$y4p#Xl+s<F{S0hoPkmWoGIt~s=7~6itsay)P}*1Y&b9Ma
zq7KUJL&YoWwQX{lg6C9%=b*l?XVS=a3teB28&qpDFq3b9PvH;(qlAMg>_nMxVVcP0
z{{Y-*5+3McFxHEFY!LjvwD4k+7=SH&wo?pIEXXt3G?ZFL;|)CUCTpo(DHe8-Lo;c1
zDC`|+;Tom#B)~kW?F;-WvaUXs9N&SgJe?;=@K2-znHWa+hr=mGl29KeiP5MKV=!He
z#YN&|G>D046Mn1^;}Pcdc5#|5_>XiTOKR0I9>~mZPHPzcovc#KO{A5a$RyY)Y8^9D
zo9z*|diC9>u)<!-+5`XeeK;dM+UNFZXv{-Y7AMcP?P}wghfVanok}3vP0R$@nz^7#
zTTwzXN=ZgJ$*3S1XON63s1j#ko~T5-n2Mk{2N7Q1D`uqPzlxu4%uho>&X$b-omTui
kaIcDb`Dy4Lo*d+fOIBB7t@H3)@e%5?of)oRCkNL37Z(VaUjP6A

diff --git a/build/web/WEB-INF/classes/controller/BddController$1.class b/build/web/WEB-INF/classes/controller/BddController$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..a6a8dccb2015391356c60c75e9d31d236372cac9
GIT binary patch
literal 868
zcmaJ<U2hUW6g>l27F;b|ziLahR#d>mwedwm(?p4;O+b@U@ue@z?g&$tnRRBi_~vi&
zK}~${2l%6mcL5ul1~=LJHFwUv_uTpQ`^QfJPtYvE!Fm}bR2^(MxK$?qwu4OvcZ%35
z;x5CI9SKu=%&^u8m9$#LG1vZ!C~BX2Ey~&vQrKOFjr!uWMxUY3RuN}d?g+_Wr{e+F
zhruAGh}ThJ5cdNuGJhT{WW^cWeJQza$AK}N-0H#-wQcI9)DuG)*i;khv(9mF68NbV
zvA-9XQ8!3-W}!HcL%(OWki*vb$S&cOdn(l-e<h~votgMihDuYslwqt4L3Fttsi=sW
zi+i~5qKu0!Ts$C@Ff~?<x!#W$oWG8XIvUh!qE(cJHajcMZDM*6(Y0-cm2(3ztS-7h
ze8<9AhR^lsjGuhN^-0XFKe9IQ_ek_+fdl?A<;Kpa_+Oeylr+56=qNq(O_K5VUI$}7
zQTl^F;e*o(U0QVfTt<DtC&XsHo~=Khq}0vRSvUT42X6+)Je(Ik6KVXjmU$93>4BE$
z?XpTG<2bYEcX5gIWwMTtM~-y0`S2@P^E+})FYgt;;ljJ7x8xNw;|rbVuuRfJf#d-p
x_Q*cOI^Lo}k?S)Itl$cHgf^{3Wa27$Ib5TROy9sN=>l$IjqZc8XvL)I`vXRo<o*Bv

literal 0
HcmV?d00001

diff --git a/build/web/WEB-INF/classes/controller/BddController.class b/build/web/WEB-INF/classes/controller/BddController.class
index 8a66b7036ea13d969d38822ee80a19052b88272f..d2974448f4d396f9f55c12bae36894de5aba1a01 100644
GIT binary patch
literal 7417
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
D>Z|>j

literal 5860
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
FdliwfgoFS9

diff --git a/build/web/WEB-INF/classes/jsp/detail.jsp b/build/web/WEB-INF/classes/jsp/detail.jsp
index 6f8c5aa..398d510 100644
--- a/build/web/WEB-INF/classes/jsp/detail.jsp
+++ b/build/web/WEB-INF/classes/jsp/detail.jsp
@@ -9,47 +9,89 @@
     <body>
         <%@include file="header.jsp" %>
         
-        
         <form name="detail" method="POST">
-           <p>
-                <label for="numero">Numero</label>
-                <input type="text" name="numero" value="${client.customerId}" size="30" id="numero" />
-            </p>
-            <p>
-           <label for="nom">Nom</label>
-                <input type="text" name="nom" value="${client.name}" size="30" id="nom" />
-            </p>
-            <p>
-            <label for="adresse">Adresse</label>
-            <input type="text" name="adresse" value="${client.addressline1}" size="30" id="adresse" />
-            </p>
-            <p>
-            <label for="telephone">Téléphone</label>
-            <input type="text" name="telephone" value="${client.phone}" size="30" id="tel" />
-            </p>
-            <p>
-            <label for="email">E-mail</label>
-            <input type="text" name="email" value="${client.email}" size="30" id="email"/>
-            </p>
-            <p>
-            <label for="Remise">Remise</label>
-            <select name="code_remise" id="dc">
-               <c:forEach items="${code}" var="dc">
-                      <option <c:if test="${dc==client.discountCode}"> selected </c:if>>${dc}</option>
-               </c:forEach>
-            </select>
-            </p>
-            <p>
-            <label for="cp">Code Postal</label>
-            <select name="CP" id="cp">
-                 <c:forEach items="${cpostaux}" var="cp">
-                         <option <c:if test="${cp==client.zip}"> selected </c:if>>${cp}</option>
-               </c:forEach>
-            </select>
-            </p>
+            <c:choose>
+                <c:when test="${type == 'customer'}">
+                    <p>
+                        <label for="numero">Numero</label>
+                        <input type="text" name="numero" value="${result.customerId}" size="30" id="numero" />
+                    </p>
+                    <p>
+                        <label for="nom">Nom</label>
+                        <input type="text" name="nom" value="${result.name}" size="30" id="nom" />
+                    </p>
+                    <p>
+                        <label for="adresse">Adresse</label>
+                        <input type="text" name="adresse" value="${result.addressline1}" size="30" id="adresse" />
+                    </p>
+                    <p>
+                        <label for="telephone">Téléphone</label>
+                        <input type="text" name="telephone" value="${result.phone}" size="30" id="tel" />
+                    </p>
+                    <p>
+                        <label for="email">E-mail</label>
+                        <input type="text" name="email" value="${result.email}" size="30" id="email"/>
+                    </p>
+                    <p>
+                        <label for="Remise">Remise</label>
+                        <select name="code_remise" id="dc">
+                            <c:forEach items="${code}" var="dc">
+                                <option <c:if test="${dc==result.discountCode}"> selected </c:if>>${dc}</option>
+                            </c:forEach>
+                        </select>
+                    </p>
+                    <p>
+                        <label for="cp">Code Postal</label>
+                        <select name="CP" id="cp">
+                            <c:forEach items="${cpostaux}" var="cp">
+                                <option <c:if test="${cp==result.zip}"> selected </c:if>>${cp}</option>
+                            </c:forEach>
+                        </select>
+                    </p>
+                </c:when>
+                <c:when test="${type == 'product'}">
+                    <p>
+                        <label for="productId">ID</label>
+                        <input type="number" name="productId" value="${result.productId}" size="30" id="productId" />
+                    </p>
+                    <p>
+                        <label for="manufacturerId">Manufacturer</label>
+                        <input type="number" name="manufacturerId" value="${result.manufacturerId}" size="30" id="manufacturerId" />
+                    </p>
+                    <p>
+                        <label for="productCode">Product Code</label>
+                        <input type="text" name="productCode" value="${result.productCode}" size="2" id="productCode" />
+                    </p>
+                    <p>
+                        <label for="purchaseCost">Purchase cost</label>
+                        <input type="number" step="0.000000000001" name="purchaseCost" value="${result.purchaseCost}" id="purchaseCost" />
+                    </p>
+                    <p>
+                        <label for="quantityOnHand">Quantity on hand</label>
+                        <input type="number" name="quantityOnHand" value="${result.quantityOnHand}" id="quantityOnHand" />
+                    </p>
+                    <p>
+                        <label for="markup">Markup</label>
+                        <input type="number" step="0.0001" name="markup" value="${result.markup}" id="markup" />
+                    </p>
+                    <p>
+                        <label for="markup">Available</label>
+                        <input type="text" name="available" value="${result.available}" id="available" size="5" />
+                    </p>
+                    <p>
+                        <label for="description">Description</label>
+                        <input type="text" name="description" value="${result.description}" id="description" size="50" />
+                    </p>
+                </c:when>
+            </c:choose>
+           
+            <input hidden type="text" name="type"  value="${type}" />
             <input type="submit" value="Modifier" formaction="update.htm" />
             <input type="submit" value="Supprimer" formaction="delete.htm" />
-            <input type="submit" value="Afficher les achats" formaction="achats.htm" />
+            <c:if test="${type == 'customer'}">
+                <input type="submit" value="Afficher les achats" formaction="achats.htm" />
+            </c:if>
+            
         </form>
     </body>
 </html>
diff --git a/build/web/WEB-INF/classes/jsp/resultat.jsp b/build/web/WEB-INF/classes/jsp/resultat.jsp
index 3e70189..e3b1710 100644
--- a/build/web/WEB-INF/classes/jsp/resultat.jsp
+++ b/build/web/WEB-INF/classes/jsp/resultat.jsp
@@ -15,42 +15,47 @@
     <body>
         <%@include file="header.jsp" %>
         
-                
-        <table border="1" cellpadding="10">
-           
-           
-              <TR>
-                    <c:forEach items="${colonnes}" var="col">
-                    <TD>${col}</TD> 
-                    </c:forEach>
-                </TR>
-            
-                <c:forEach items="${results}" var="values" varStatus="row" >
-                <TR>
-                  <c:forEach items="${values}" var="v" >  
-                    <TD>${v}
-                    </TD>
-                  </c:forEach>
-                    <TD>
-                        <form name="Detail" action="detail.htm"  method="POST">
-                            <input type=hidden name="type"  value="${type}"/>
-                            <input type=hidden name="num"  value="${list[row.index][0]}"/>
-                            <input type=submit  value="Détail"  />
-                        </form>
+        <c:choose>
+            <c:when test="${error != null}">
+                <h1>${error}</h1>
+            </c:when>
+            <c:otherwise>
+                <table border="1" cellpadding="10">
+                    <TR>
+                        <c:forEach items="${colonnes}" var="col">
+                        <TD>${col}</TD> 
+                        </c:forEach>
+                    </TR>
 
-                    </TD>
-                </TR>
+                    <c:forEach items="${results}" var="values" varStatus="row" >
+                    <TR>
+                        <c:forEach items="${values}" var="v" varStatus="vStatus" >
+                            <c:choose>
+                                <c:when test="${relation != null && relation.get(colonnes[vStatus.index]) != null}">
+                                    <TD>
+                                        <form name="Detail" action="detail.htm"  method="POST">
+                                            <input hidden type="text" name="type"  value="${relation.get(colonnes[vStatus.index])}"/>
+                                            <input hidden type="number" name="num"  value="${v}"/>
+                                            <input type=submit  value="${v}"  />
+                                        </form>
+                                    </TD>
+                                </c:when>
+                                <c:otherwise>
+                                    <TD>${v}</TD>
+                                </c:otherwise>
+                            </c:choose>
+                        </c:forEach>
+                        <TD>
+                            <form name="Detail" action="detail.htm"  method="POST">
+                                <input hidden type="text" name="type"  value="${type}"/>
+                                <input hidden type="number" name="num"  value="${values[0]}"/>
+                                <input type=submit  value="Détail"  />
+                            </form>
+                        </TD>
+                    </TR>
                 </c:forEach>
-                <%--   <c:forEach items="${liste}" var="client">
-                <TR>
-                    <TD>${client.customerId}</TD>
-                    <TD>${client.discountCode}</TD>
-                    <TD>${client.zip}</TD>
-                    <TD>${client.name}</TD>
-                </TR>
-                        </c:forEach>        --%>
-                 
-        </table>
-        
+                </table>
+            </c:otherwise>
+        </c:choose>
     </body>
 </html>
diff --git a/build/web/WEB-INF/jsp/detail.jsp b/build/web/WEB-INF/jsp/detail.jsp
index 6f8c5aa..398d510 100644
--- a/build/web/WEB-INF/jsp/detail.jsp
+++ b/build/web/WEB-INF/jsp/detail.jsp
@@ -9,47 +9,89 @@
     <body>
         <%@include file="header.jsp" %>
         
-        
         <form name="detail" method="POST">
-           <p>
-                <label for="numero">Numero</label>
-                <input type="text" name="numero" value="${client.customerId}" size="30" id="numero" />
-            </p>
-            <p>
-           <label for="nom">Nom</label>
-                <input type="text" name="nom" value="${client.name}" size="30" id="nom" />
-            </p>
-            <p>
-            <label for="adresse">Adresse</label>
-            <input type="text" name="adresse" value="${client.addressline1}" size="30" id="adresse" />
-            </p>
-            <p>
-            <label for="telephone">Téléphone</label>
-            <input type="text" name="telephone" value="${client.phone}" size="30" id="tel" />
-            </p>
-            <p>
-            <label for="email">E-mail</label>
-            <input type="text" name="email" value="${client.email}" size="30" id="email"/>
-            </p>
-            <p>
-            <label for="Remise">Remise</label>
-            <select name="code_remise" id="dc">
-               <c:forEach items="${code}" var="dc">
-                      <option <c:if test="${dc==client.discountCode}"> selected </c:if>>${dc}</option>
-               </c:forEach>
-            </select>
-            </p>
-            <p>
-            <label for="cp">Code Postal</label>
-            <select name="CP" id="cp">
-                 <c:forEach items="${cpostaux}" var="cp">
-                         <option <c:if test="${cp==client.zip}"> selected </c:if>>${cp}</option>
-               </c:forEach>
-            </select>
-            </p>
+            <c:choose>
+                <c:when test="${type == 'customer'}">
+                    <p>
+                        <label for="numero">Numero</label>
+                        <input type="text" name="numero" value="${result.customerId}" size="30" id="numero" />
+                    </p>
+                    <p>
+                        <label for="nom">Nom</label>
+                        <input type="text" name="nom" value="${result.name}" size="30" id="nom" />
+                    </p>
+                    <p>
+                        <label for="adresse">Adresse</label>
+                        <input type="text" name="adresse" value="${result.addressline1}" size="30" id="adresse" />
+                    </p>
+                    <p>
+                        <label for="telephone">Téléphone</label>
+                        <input type="text" name="telephone" value="${result.phone}" size="30" id="tel" />
+                    </p>
+                    <p>
+                        <label for="email">E-mail</label>
+                        <input type="text" name="email" value="${result.email}" size="30" id="email"/>
+                    </p>
+                    <p>
+                        <label for="Remise">Remise</label>
+                        <select name="code_remise" id="dc">
+                            <c:forEach items="${code}" var="dc">
+                                <option <c:if test="${dc==result.discountCode}"> selected </c:if>>${dc}</option>
+                            </c:forEach>
+                        </select>
+                    </p>
+                    <p>
+                        <label for="cp">Code Postal</label>
+                        <select name="CP" id="cp">
+                            <c:forEach items="${cpostaux}" var="cp">
+                                <option <c:if test="${cp==result.zip}"> selected </c:if>>${cp}</option>
+                            </c:forEach>
+                        </select>
+                    </p>
+                </c:when>
+                <c:when test="${type == 'product'}">
+                    <p>
+                        <label for="productId">ID</label>
+                        <input type="number" name="productId" value="${result.productId}" size="30" id="productId" />
+                    </p>
+                    <p>
+                        <label for="manufacturerId">Manufacturer</label>
+                        <input type="number" name="manufacturerId" value="${result.manufacturerId}" size="30" id="manufacturerId" />
+                    </p>
+                    <p>
+                        <label for="productCode">Product Code</label>
+                        <input type="text" name="productCode" value="${result.productCode}" size="2" id="productCode" />
+                    </p>
+                    <p>
+                        <label for="purchaseCost">Purchase cost</label>
+                        <input type="number" step="0.000000000001" name="purchaseCost" value="${result.purchaseCost}" id="purchaseCost" />
+                    </p>
+                    <p>
+                        <label for="quantityOnHand">Quantity on hand</label>
+                        <input type="number" name="quantityOnHand" value="${result.quantityOnHand}" id="quantityOnHand" />
+                    </p>
+                    <p>
+                        <label for="markup">Markup</label>
+                        <input type="number" step="0.0001" name="markup" value="${result.markup}" id="markup" />
+                    </p>
+                    <p>
+                        <label for="markup">Available</label>
+                        <input type="text" name="available" value="${result.available}" id="available" size="5" />
+                    </p>
+                    <p>
+                        <label for="description">Description</label>
+                        <input type="text" name="description" value="${result.description}" id="description" size="50" />
+                    </p>
+                </c:when>
+            </c:choose>
+           
+            <input hidden type="text" name="type"  value="${type}" />
             <input type="submit" value="Modifier" formaction="update.htm" />
             <input type="submit" value="Supprimer" formaction="delete.htm" />
-            <input type="submit" value="Afficher les achats" formaction="achats.htm" />
+            <c:if test="${type == 'customer'}">
+                <input type="submit" value="Afficher les achats" formaction="achats.htm" />
+            </c:if>
+            
         </form>
     </body>
 </html>
diff --git a/build/web/WEB-INF/jsp/resultat.jsp b/build/web/WEB-INF/jsp/resultat.jsp
index 3e70189..e3b1710 100644
--- a/build/web/WEB-INF/jsp/resultat.jsp
+++ b/build/web/WEB-INF/jsp/resultat.jsp
@@ -15,42 +15,47 @@
     <body>
         <%@include file="header.jsp" %>
         
-                
-        <table border="1" cellpadding="10">
-           
-           
-              <TR>
-                    <c:forEach items="${colonnes}" var="col">
-                    <TD>${col}</TD> 
-                    </c:forEach>
-                </TR>
-            
-                <c:forEach items="${results}" var="values" varStatus="row" >
-                <TR>
-                  <c:forEach items="${values}" var="v" >  
-                    <TD>${v}
-                    </TD>
-                  </c:forEach>
-                    <TD>
-                        <form name="Detail" action="detail.htm"  method="POST">
-                            <input type=hidden name="type"  value="${type}"/>
-                            <input type=hidden name="num"  value="${list[row.index][0]}"/>
-                            <input type=submit  value="Détail"  />
-                        </form>
+        <c:choose>
+            <c:when test="${error != null}">
+                <h1>${error}</h1>
+            </c:when>
+            <c:otherwise>
+                <table border="1" cellpadding="10">
+                    <TR>
+                        <c:forEach items="${colonnes}" var="col">
+                        <TD>${col}</TD> 
+                        </c:forEach>
+                    </TR>
 
-                    </TD>
-                </TR>
+                    <c:forEach items="${results}" var="values" varStatus="row" >
+                    <TR>
+                        <c:forEach items="${values}" var="v" varStatus="vStatus" >
+                            <c:choose>
+                                <c:when test="${relation != null && relation.get(colonnes[vStatus.index]) != null}">
+                                    <TD>
+                                        <form name="Detail" action="detail.htm"  method="POST">
+                                            <input hidden type="text" name="type"  value="${relation.get(colonnes[vStatus.index])}"/>
+                                            <input hidden type="number" name="num"  value="${v}"/>
+                                            <input type=submit  value="${v}"  />
+                                        </form>
+                                    </TD>
+                                </c:when>
+                                <c:otherwise>
+                                    <TD>${v}</TD>
+                                </c:otherwise>
+                            </c:choose>
+                        </c:forEach>
+                        <TD>
+                            <form name="Detail" action="detail.htm"  method="POST">
+                                <input hidden type="text" name="type"  value="${type}"/>
+                                <input hidden type="number" name="num"  value="${values[0]}"/>
+                                <input type=submit  value="Détail"  />
+                            </form>
+                        </TD>
+                    </TR>
                 </c:forEach>
-                <%--   <c:forEach items="${liste}" var="client">
-                <TR>
-                    <TD>${client.customerId}</TD>
-                    <TD>${client.discountCode}</TD>
-                    <TD>${client.zip}</TD>
-                    <TD>${client.name}</TD>
-                </TR>
-                        </c:forEach>        --%>
-                 
-        </table>
-        
+                </table>
+            </c:otherwise>
+        </c:choose>
     </body>
 </html>
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 6807a2b..e9dbd15 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -2,6 +2,12 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/C:/Users/flifloo/Nextcloud/IUT/JEE/JEE%20Project/Code/src/java/DAO/Product.hbm.xml</file>
+            <file>file:/C:/Users/flifloo/Nextcloud/IUT/JEE/JEE%20Project/Code/web/WEB-INF/jsp/menu.jsp</file>
+            <file>file:/C:/Users/flifloo/Nextcloud/IUT/JEE/JEE%20Project/Code/web/WEB-INF/jsp/resultat.jsp</file>
+            <file>file:/C:/Users/flifloo/Nextcloud/IUT/JEE/JEE%20Project/Code/src/java/controller/BddController.java</file>
+            <file>file:/C:/Users/flifloo/Nextcloud/IUT/JEE/JEE%20Project/Code/src/java/DAO/MagasinHelper.java</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/src/java/DAO/MagasinHelper.java b/src/java/DAO/MagasinHelper.java
index 3745e72..a0066e0 100644
--- a/src/java/DAO/MagasinHelper.java
+++ b/src/java/DAO/MagasinHelper.java
@@ -46,6 +46,28 @@ public class MagasinHelper {
         return resultat;
     }
     
+    public Product getProduct(int id){
+        Product resultat=null;
+        Transaction tx=null;
+        try{
+            if(!session.isOpen())session=HibernateUtil.getSessionFactory().openSession();
+            session.flush();
+            
+             tx=session.beginTransaction();
+            Query q=session.createQuery("from Product p where p.productId = :_id");
+            q.setInteger("_id", id);
+            resultat=(Product)q.list().iterator().next();
+                    
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally{
+          if (session.isOpen())session.close();
+        }
+
+        return resultat;
+    }
+    
     public List getClients(){
         List <Customer> resultat=null;
         Transaction tx=null;
@@ -227,29 +249,7 @@ public Customer getClient(int id){
       
     return client;
 }
-public Customer getClient(String name){
-   
-   
-   Customer client=null;
-    Transaction tx=null;
-        try{
-            if(!session.isOpen())session=HibernateUtil.getSessionFactory().openSession();
-            session.flush();
-            tx=session.beginTransaction();
-           Query q=session.createQuery(" from Customer a  where a.customerId =:_name");
-           q.setString("_name", name);
-           client=(Customer)q.list().iterator().next();
-      }
-       catch (Exception e) {
-        System.out.println("erreur"+e);
-        e.printStackTrace();
-        }
-       finally{
-          if (session.isOpen())session.close();
-        }
-      
-    return client;
-}
+
 public void deleteCustomer  (int _id) {
     
     Transaction tx=null;
@@ -273,7 +273,29 @@ public void deleteCustomer  (int _id) {
         }
     
 }
- public List<PurchaseOrder> getAchats(int id){
+
+ public List<PurchaseOrder> getPurchase(){
+        List resultat=null;
+        Transaction tx=null;
+        try{
+            if(!session.isOpen())session=HibernateUtil.getSessionFactory().openSession();
+            session.flush();
+            
+             tx=session.beginTransaction();
+           Query q=session.createQuery("select po.customerId, po.productId, po.quantity, po.shippingCost, po.salesDate, po.shippingDate, po.freightCompany from PurchaseOrder po");
+            resultat=(List<PurchaseOrder>)q.list();
+        }
+        catch (Exception e) {
+        e.printStackTrace();
+        }
+       finally{
+          if (session.isOpen())session.close();
+        }
+      
+    return resultat;
+}
+
+ public List<PurchaseOrder> getPurchase(int id){
         List resultat=null;
         Transaction tx=null;
         try{
diff --git a/src/java/controller/BddController.java b/src/java/controller/BddController.java
index ee6de7b..1ead67a 100644
--- a/src/java/controller/BddController.java
+++ b/src/java/controller/BddController.java
@@ -29,26 +29,29 @@ public class BddController extends MultiActionController {
     private User utilisateur;
     private HttpSession session;
     public BddController() {}
+    
+    private void sessionInit(HttpServletRequest request) {
+        if (login == null)
+            login=request.getUserPrincipal().getName();
+        if (utilisateur == null)
+            utilisateur =new User(login);
+        
+        if (session == null) {
+            session=request.getSession();
+            session.setAttribute("user", utilisateur);
+        }
+    }
    
     public ModelAndView  menu(HttpServletRequest request,
 			HttpServletResponse response){
-        
-        login=request.getUserPrincipal().getName();
-               
-        //pwd=request.getParameter("password");
-       
-        utilisateur =new User(login);
-        
-        session=request.getSession();
-        session.setAttribute("user", utilisateur);
+        sessionInit(request);
         System.out.println ("nbuser="+User.getCompteur());
         return new ModelAndView("menu").addObject("user",utilisateur); 
         
     }
     public ModelAndView  logout(HttpServletRequest request,
 			HttpServletResponse response){
-        
-        
+        sessionInit(request);
         request.getSession().invalidate();
         
         
@@ -58,46 +61,78 @@ public class BddController extends MultiActionController {
     
    public ModelAndView list(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
-       
+       sessionInit(request);
        String type = request.getParameter("type");
        ModelAndView mv = new ModelAndView("resultat");
-      
+       mv.addObject("user",session.getAttribute("user"));
        mv.addObject("type", type);
        
        switch (type) {
            case "customer":
                 mv.addObject("results", new MagasinHelper().getClients());
+                mv.addObject("colonnes", Arrays.asList("customerId", "name", "addressline1", "addressline2", "zip", "rate"));
                break;
            case "product":
                mv.addObject("results", new MagasinHelper().getProducts());
+               mv.addObject("colonnes", Arrays.asList("productId", "manufacturerId", "productCode", "purchaseCost", "quantityOnHand", "markup", "available", "description"));
                break;
+           case "purchase":
+                mv.addObject("results", new MagasinHelper().getPurchase());
+                mv.addObject("colonnes", Arrays.asList("customerId", "productId", "quantity", "shippingCost", "salesDate", "shippingDate", "freightCompany"));
+                mv.addObject("relation", new HashMap<String, String>() {{
+                    put("customerId", "customer");
+                    put("productId", "product");
+                }});
+                break;
+           default:
+               mv.addObject("error", "Type not found");
        }
        
        return mv;
    }
  public ModelAndView add(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
-       
+       sessionInit(request);
      
        ModelAndView mv = new ModelAndView("form_inscription");
        
-       mv.addObject("user",session.getAttribute("user"));
+      mv.addObject("user",session.getAttribute("user"));
       mv.addObject("discount",new MagasinHelper().getDiscountCode());
       mv.addObject("code",new MagasinHelper().getZipCode());
       return mv;
    }
  public ModelAndView detail(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
+     sessionInit(request);
+     String type = request.getParameter("type");
      ModelAndView mv = new ModelAndView("detail");
      mv.addObject("user",session.getAttribute("user"));
-     mv.addObject("code",new MagasinHelper().getDiscountCode());
-     mv.addObject("cpostaux",new MagasinHelper().getZipCode());
-     mv.addObject("client",new MagasinHelper().getClient(request.getParameter("num")));
+     mv.addObject("type", type);
+     
+     switch (type) {
+           case "customer":
+                mv.addObject("result", new MagasinHelper().getClient(Integer.parseInt(request.getParameter("num"))));
+                mv.addObject("colonnes", Arrays.asList("customerId", "name", "addressline1", "addressline2", "zip", "rate"));
+                mv.addObject("code",new MagasinHelper().getDiscountCode());
+                mv.addObject("cpostaux",new MagasinHelper().getZipCode());
+               break;
+           case "product":
+               mv.addObject("result", new MagasinHelper().getProduct(Integer.parseInt(request.getParameter("num"))));
+               mv.addObject("colonnes", Arrays.asList("productId", "manufacturerId", "productCode", "purchaseCost", "quantityOnHand", "markup", "available", "description"));
+               break;
+           case "purchase":
+                mv.addObject("result", new MagasinHelper().getPurchase(Integer.parseInt(request.getParameter("num"))));
+                mv.addObject("colonnes", Arrays.asList("customerId", "productId", "quantity", "shippingCost", "salesDate", "shippingDate", "freightCompany"));
+                break;
+           default:
+               mv.addObject("error", "Type not found");
+       }
+
      return mv;
    }
  public ModelAndView find(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
-       
+       sessionInit(request);
      
        ModelAndView mv ;
        MagasinHelper requeteur = new MagasinHelper(); 
@@ -117,10 +152,12 @@ public class BddController extends MultiActionController {
    }
  public ModelAndView formfind(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
+     sessionInit(request);
       return new ModelAndView("recherche");
    }
   public ModelAndView achats(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
+      sessionInit(request);
        
      
        ModelAndView mv = new ModelAndView("achats");
@@ -128,12 +165,13 @@ public class BddController extends MultiActionController {
      mv.addObject("user",session.getAttribute("user"));
      System.out.println("num "+Integer.parseInt(request.getParameter("numero")));
       
-      mv.addObject("achats",new MagasinHelper().getAchats(Integer.parseInt(request.getParameter("numero"))));
+      mv.addObject("achats",new MagasinHelper().getPurchase(Integer.parseInt(request.getParameter("numero"))));
       return mv;
    }
    
     public ModelAndView save(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
+        sessionInit(request);
        String param1 = request.getParameter("nom");
         String param2 = request.getParameter("adresse");
         String param3 = request.getParameter("telephone");
@@ -146,6 +184,7 @@ public class BddController extends MultiActionController {
    }
    public ModelAndView delete(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
+       sessionInit(request);
        
         new MagasinHelper().deleteCustomer(Integer.parseInt(request.getParameter("numero")));
        return new ModelAndView("confirm").addObject("confirm","suppression effectuée");
@@ -153,6 +192,7 @@ public class BddController extends MultiActionController {
    }
     public ModelAndView update(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
+        sessionInit(request);
         String param1 = request.getParameter("numero");
         String param2 = request.getParameter("code_remise");
         String param3 = request.getParameter("nom");
diff --git a/web/WEB-INF/jsp/detail.jsp b/web/WEB-INF/jsp/detail.jsp
index 6f8c5aa..398d510 100644
--- a/web/WEB-INF/jsp/detail.jsp
+++ b/web/WEB-INF/jsp/detail.jsp
@@ -9,47 +9,89 @@
     <body>
         <%@include file="header.jsp" %>
         
-        
         <form name="detail" method="POST">
-           <p>
-                <label for="numero">Numero</label>
-                <input type="text" name="numero" value="${client.customerId}" size="30" id="numero" />
-            </p>
-            <p>
-           <label for="nom">Nom</label>
-                <input type="text" name="nom" value="${client.name}" size="30" id="nom" />
-            </p>
-            <p>
-            <label for="adresse">Adresse</label>
-            <input type="text" name="adresse" value="${client.addressline1}" size="30" id="adresse" />
-            </p>
-            <p>
-            <label for="telephone">Téléphone</label>
-            <input type="text" name="telephone" value="${client.phone}" size="30" id="tel" />
-            </p>
-            <p>
-            <label for="email">E-mail</label>
-            <input type="text" name="email" value="${client.email}" size="30" id="email"/>
-            </p>
-            <p>
-            <label for="Remise">Remise</label>
-            <select name="code_remise" id="dc">
-               <c:forEach items="${code}" var="dc">
-                      <option <c:if test="${dc==client.discountCode}"> selected </c:if>>${dc}</option>
-               </c:forEach>
-            </select>
-            </p>
-            <p>
-            <label for="cp">Code Postal</label>
-            <select name="CP" id="cp">
-                 <c:forEach items="${cpostaux}" var="cp">
-                         <option <c:if test="${cp==client.zip}"> selected </c:if>>${cp}</option>
-               </c:forEach>
-            </select>
-            </p>
+            <c:choose>
+                <c:when test="${type == 'customer'}">
+                    <p>
+                        <label for="numero">Numero</label>
+                        <input type="text" name="numero" value="${result.customerId}" size="30" id="numero" />
+                    </p>
+                    <p>
+                        <label for="nom">Nom</label>
+                        <input type="text" name="nom" value="${result.name}" size="30" id="nom" />
+                    </p>
+                    <p>
+                        <label for="adresse">Adresse</label>
+                        <input type="text" name="adresse" value="${result.addressline1}" size="30" id="adresse" />
+                    </p>
+                    <p>
+                        <label for="telephone">Téléphone</label>
+                        <input type="text" name="telephone" value="${result.phone}" size="30" id="tel" />
+                    </p>
+                    <p>
+                        <label for="email">E-mail</label>
+                        <input type="text" name="email" value="${result.email}" size="30" id="email"/>
+                    </p>
+                    <p>
+                        <label for="Remise">Remise</label>
+                        <select name="code_remise" id="dc">
+                            <c:forEach items="${code}" var="dc">
+                                <option <c:if test="${dc==result.discountCode}"> selected </c:if>>${dc}</option>
+                            </c:forEach>
+                        </select>
+                    </p>
+                    <p>
+                        <label for="cp">Code Postal</label>
+                        <select name="CP" id="cp">
+                            <c:forEach items="${cpostaux}" var="cp">
+                                <option <c:if test="${cp==result.zip}"> selected </c:if>>${cp}</option>
+                            </c:forEach>
+                        </select>
+                    </p>
+                </c:when>
+                <c:when test="${type == 'product'}">
+                    <p>
+                        <label for="productId">ID</label>
+                        <input type="number" name="productId" value="${result.productId}" size="30" id="productId" />
+                    </p>
+                    <p>
+                        <label for="manufacturerId">Manufacturer</label>
+                        <input type="number" name="manufacturerId" value="${result.manufacturerId}" size="30" id="manufacturerId" />
+                    </p>
+                    <p>
+                        <label for="productCode">Product Code</label>
+                        <input type="text" name="productCode" value="${result.productCode}" size="2" id="productCode" />
+                    </p>
+                    <p>
+                        <label for="purchaseCost">Purchase cost</label>
+                        <input type="number" step="0.000000000001" name="purchaseCost" value="${result.purchaseCost}" id="purchaseCost" />
+                    </p>
+                    <p>
+                        <label for="quantityOnHand">Quantity on hand</label>
+                        <input type="number" name="quantityOnHand" value="${result.quantityOnHand}" id="quantityOnHand" />
+                    </p>
+                    <p>
+                        <label for="markup">Markup</label>
+                        <input type="number" step="0.0001" name="markup" value="${result.markup}" id="markup" />
+                    </p>
+                    <p>
+                        <label for="markup">Available</label>
+                        <input type="text" name="available" value="${result.available}" id="available" size="5" />
+                    </p>
+                    <p>
+                        <label for="description">Description</label>
+                        <input type="text" name="description" value="${result.description}" id="description" size="50" />
+                    </p>
+                </c:when>
+            </c:choose>
+           
+            <input hidden type="text" name="type"  value="${type}" />
             <input type="submit" value="Modifier" formaction="update.htm" />
             <input type="submit" value="Supprimer" formaction="delete.htm" />
-            <input type="submit" value="Afficher les achats" formaction="achats.htm" />
+            <c:if test="${type == 'customer'}">
+                <input type="submit" value="Afficher les achats" formaction="achats.htm" />
+            </c:if>
+            
         </form>
     </body>
 </html>
diff --git a/web/WEB-INF/jsp/resultat.jsp b/web/WEB-INF/jsp/resultat.jsp
index 3e70189..e3b1710 100644
--- a/web/WEB-INF/jsp/resultat.jsp
+++ b/web/WEB-INF/jsp/resultat.jsp
@@ -15,42 +15,47 @@
     <body>
         <%@include file="header.jsp" %>
         
-                
-        <table border="1" cellpadding="10">
-           
-           
-              <TR>
-                    <c:forEach items="${colonnes}" var="col">
-                    <TD>${col}</TD> 
-                    </c:forEach>
-                </TR>
-            
-                <c:forEach items="${results}" var="values" varStatus="row" >
-                <TR>
-                  <c:forEach items="${values}" var="v" >  
-                    <TD>${v}
-                    </TD>
-                  </c:forEach>
-                    <TD>
-                        <form name="Detail" action="detail.htm"  method="POST">
-                            <input type=hidden name="type"  value="${type}"/>
-                            <input type=hidden name="num"  value="${list[row.index][0]}"/>
-                            <input type=submit  value="Détail"  />
-                        </form>
+        <c:choose>
+            <c:when test="${error != null}">
+                <h1>${error}</h1>
+            </c:when>
+            <c:otherwise>
+                <table border="1" cellpadding="10">
+                    <TR>
+                        <c:forEach items="${colonnes}" var="col">
+                        <TD>${col}</TD> 
+                        </c:forEach>
+                    </TR>
 
-                    </TD>
-                </TR>
+                    <c:forEach items="${results}" var="values" varStatus="row" >
+                    <TR>
+                        <c:forEach items="${values}" var="v" varStatus="vStatus" >
+                            <c:choose>
+                                <c:when test="${relation != null && relation.get(colonnes[vStatus.index]) != null}">
+                                    <TD>
+                                        <form name="Detail" action="detail.htm"  method="POST">
+                                            <input hidden type="text" name="type"  value="${relation.get(colonnes[vStatus.index])}"/>
+                                            <input hidden type="number" name="num"  value="${v}"/>
+                                            <input type=submit  value="${v}"  />
+                                        </form>
+                                    </TD>
+                                </c:when>
+                                <c:otherwise>
+                                    <TD>${v}</TD>
+                                </c:otherwise>
+                            </c:choose>
+                        </c:forEach>
+                        <TD>
+                            <form name="Detail" action="detail.htm"  method="POST">
+                                <input hidden type="text" name="type"  value="${type}"/>
+                                <input hidden type="number" name="num"  value="${values[0]}"/>
+                                <input type=submit  value="Détail"  />
+                            </form>
+                        </TD>
+                    </TR>
                 </c:forEach>
-                <%--   <c:forEach items="${liste}" var="client">
-                <TR>
-                    <TD>${client.customerId}</TD>
-                    <TD>${client.discountCode}</TD>
-                    <TD>${client.zip}</TD>
-                    <TD>${client.name}</TD>
-                </TR>
-                        </c:forEach>        --%>
-                 
-        </table>
-        
+                </table>
+            </c:otherwise>
+        </c:choose>
     </body>
 </html>