From bdd9dba62648cbfda8f01cecee8dc20289b05526 Mon Sep 17 00:00:00 2001 From: Ethanell Date: Wed, 29 Jun 2022 22:08:01 +0200 Subject: [PATCH] Add discount and prodCode to list and detail --- .../WEB-INF/classes/DAO/MagasinHelper.class | Bin 10786 -> 12856 bytes .../classes/controller/BddController.class | Bin 7562 -> 8124 bytes build/web/WEB-INF/classes/jsp/detail.jsp | 37 ++++++- build/web/WEB-INF/classes/jsp/resultat.jsp | 4 +- build/web/WEB-INF/jsp/detail.jsp | 34 +++++- build/web/WEB-INF/jsp/resultat.jsp | 4 +- src/java/DAO/MagasinHelper.java | 99 +++++++++++++++++- src/java/controller/BddController.java | 19 +++- web/WEB-INF/jsp/detail.jsp | 34 +++++- web/WEB-INF/jsp/resultat.jsp | 4 +- 10 files changed, 214 insertions(+), 21 deletions(-) diff --git a/build/web/WEB-INF/classes/DAO/MagasinHelper.class b/build/web/WEB-INF/classes/DAO/MagasinHelper.class index e3f950b2ded65dfb143c767e403db252ccae4fa3..21edcfdb8d89bae4c4ee281b97266fc6addb5fa7 100644 GIT binary patch literal 12856 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 literal 10786 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 diff --git a/build/web/WEB-INF/classes/controller/BddController.class b/build/web/WEB-INF/classes/controller/BddController.class index f1b11c08862179824c7771a7b8350be77da30b44..a273922326ed75ce758c3267bf86b22c548307ae 100644 GIT binary patch literal 8124 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 YTHP_lfFSt;X@ZVnOreA7!HCb#0jv1V@c;k- literal 7562 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 I=E%?g0N0s2IRF3v diff --git a/build/web/WEB-INF/classes/jsp/detail.jsp b/build/web/WEB-INF/classes/jsp/detail.jsp index 25094f9..c7a0739 100644 --- a/build/web/WEB-INF/classes/jsp/detail.jsp +++ b/build/web/WEB-INF/classes/jsp/detail.jsp @@ -33,10 +33,10 @@

- - - +

@@ -92,7 +92,6 @@

-

result: ${result}

@@ -123,7 +122,7 @@

- +

@@ -134,6 +133,34 @@

+ +

+ + +

+

+ + +

+ + +

+ + +

+

+ + +

+

+ + +

+ diff --git a/build/web/WEB-INF/classes/jsp/resultat.jsp b/build/web/WEB-INF/classes/jsp/resultat.jsp index e3b1710..7c7897a 100644 --- a/build/web/WEB-INF/classes/jsp/resultat.jsp +++ b/build/web/WEB-INF/classes/jsp/resultat.jsp @@ -35,7 +35,7 @@
- +
@@ -48,7 +48,7 @@
- +
diff --git a/build/web/WEB-INF/jsp/detail.jsp b/build/web/WEB-INF/jsp/detail.jsp index 17956f9..c7a0739 100644 --- a/build/web/WEB-INF/jsp/detail.jsp +++ b/build/web/WEB-INF/jsp/detail.jsp @@ -33,10 +33,10 @@

- - - +

@@ -133,6 +133,34 @@

+ +

+ + +

+

+ + +

+ + +

+ + +

+

+ + +

+

+ + +

+ diff --git a/build/web/WEB-INF/jsp/resultat.jsp b/build/web/WEB-INF/jsp/resultat.jsp index e3b1710..7c7897a 100644 --- a/build/web/WEB-INF/jsp/resultat.jsp +++ b/build/web/WEB-INF/jsp/resultat.jsp @@ -35,7 +35,7 @@
- +
@@ -48,7 +48,7 @@
- +
diff --git a/src/java/DAO/MagasinHelper.java b/src/java/DAO/MagasinHelper.java index c766991..458a469 100644 --- a/src/java/DAO/MagasinHelper.java +++ b/src/java/DAO/MagasinHelper.java @@ -180,6 +180,27 @@ public class MagasinHelper { return resultat; } + public List getProductCodesColums(){ + List resultat=null; + Transaction tx=null; + try{ + if(!session.isOpen())session=HibernateUtil.getSessionFactory().openSession(); + session.flush(); + + tx=session.beginTransaction(); + Query q=session.createQuery("select p.prodCode, p.discountCode, p.description from ProductCode p"); + resultat=q.list(); + + + } catch (Exception e) { + e.printStackTrace(); + } finally{ + if (session.isOpen())session.close(); + } + + return resultat; + } + public List getProductCodes(){ List resultat=null; Transaction tx=null; @@ -200,8 +221,30 @@ public class MagasinHelper { return resultat; } + + public ProductCode getProductCode(String id){ + ProductCode resultat=null; + Transaction tx=null; + try{ + if(!session.isOpen())session=HibernateUtil.getSessionFactory().openSession(); + session.flush(); + + tx=session.beginTransaction(); + Query q=session.createQuery("from ProductCode p where p.prodCode = :_id"); + q.setString("_id", id); + resultat=(ProductCode)q.list().iterator().next(); + + + } catch (Exception e) { + e.printStackTrace(); + } finally{ + if (session.isOpen())session.close(); + } -public List getDiscountCode(){ + return resultat; + } + +public List getDiscountCodesColums(){ List resultat=null; Transaction tx=null; try{ @@ -210,7 +253,7 @@ List resultat=null; session.flush(); tx=session.beginTransaction(); - Query q=session.createQuery("select a.discountCode from DiscountCode a"); + Query q=session.createQuery("select dc.discountCode, dc.rate from DiscountCode dc"); resultat=q.list(); } catch (Exception e) { @@ -225,6 +268,58 @@ List resultat=null; } + +public List getDiscountCodes(){ + List resultat=null; + Transaction tx=null; + try{ + if(!session.isOpen()) + session=HibernateUtil.getSessionFactory().openSession(); + session.flush(); + + tx=session.beginTransaction(); + Query q=session.createQuery(" from DiscountCode dc"); + resultat=q.list(); + } + catch (Exception e) { + e.printStackTrace(); + } + finally{ + if (session.isOpen())session.close(); + + } + + return resultat; + + +} + +public DiscountCode getDiscountCode(char c){ + DiscountCode resultat=null; + Transaction tx=null; + try{ + if(!session.isOpen()) + session=HibernateUtil.getSessionFactory().openSession(); + session.flush(); + + tx=session.beginTransaction(); + Query q=session.createQuery(" from DiscountCode dc where dc.discountCode = :_id"); + q.setCharacter("_id", c); + resultat=(DiscountCode)q.list().iterator().next(); + } + catch (Exception e) { + e.printStackTrace(); + } + finally{ + if (session.isOpen())session.close(); + + } + + return resultat; + + +} + public List getMicroMarket(){ List resultat=null; Transaction tx=null; diff --git a/src/java/controller/BddController.java b/src/java/controller/BddController.java index 56fc3fe..da41b5a 100644 --- a/src/java/controller/BddController.java +++ b/src/java/controller/BddController.java @@ -84,6 +84,14 @@ public class BddController extends MultiActionController { put("productId", "product"); }}); break; + case "discount": + mv.addObject("results", new MagasinHelper().getDiscountCodesColums()); + mv.addObject("colonnes", Arrays.asList("discountCode", "rate")); + break; + case "prodCode": + mv.addObject("results", new MagasinHelper().getProductCodesColums()); + mv.addObject("colonnes", Arrays.asList("prodCode", "discountCode", "description")); + break; default: mv.addObject("error", "Type not found"); } @@ -97,7 +105,7 @@ public class BddController extends MultiActionController { ModelAndView mv = new ModelAndView("form_inscription"); mv.addObject("user",session.getAttribute("user")); - mv.addObject("discount",new MagasinHelper().getDiscountCode()); + mv.addObject("discount",new MagasinHelper().getDiscountCodesColums()); mv.addObject("code",new MagasinHelper().getZipCode()); return mv; } @@ -112,7 +120,7 @@ public class BddController extends MultiActionController { switch (type) { case "customer": mv.addObject("result", new MagasinHelper().getClient(Integer.parseInt(request.getParameter("num")))); - mv.addObject("code",new MagasinHelper().getDiscountCode()); + mv.addObject("code",new MagasinHelper().getDiscountCodes()); mv.addObject("cpostaux",new MagasinHelper().getZipCode()); break; case "product": @@ -125,6 +133,13 @@ public class BddController extends MultiActionController { mv.addObject("customers", new MagasinHelper().getClients()); mv.addObject("products", new MagasinHelper().getProducts()); break; + case "discount": + mv.addObject("result", new MagasinHelper().getDiscountCode(request.getParameter("num").charAt(0))); + break; + case "prodCode": + mv.addObject("result", new MagasinHelper().getProductCode(request.getParameter("num"))); + mv.addObject("code",new MagasinHelper().getDiscountCodes()); + break; default: mv.addObject("error", "Type not found"); } diff --git a/web/WEB-INF/jsp/detail.jsp b/web/WEB-INF/jsp/detail.jsp index 17956f9..c7a0739 100644 --- a/web/WEB-INF/jsp/detail.jsp +++ b/web/WEB-INF/jsp/detail.jsp @@ -33,10 +33,10 @@

- - - +

@@ -133,6 +133,34 @@

+ +

+ + +

+

+ + +

+ + +

+ + +

+

+ + +

+

+ + +

+ diff --git a/web/WEB-INF/jsp/resultat.jsp b/web/WEB-INF/jsp/resultat.jsp index e3b1710..7c7897a 100644 --- a/web/WEB-INF/jsp/resultat.jsp +++ b/web/WEB-INF/jsp/resultat.jsp @@ -35,7 +35,7 @@
- +
@@ -48,7 +48,7 @@
- +