From 5d73d2e578327c74418c296a0d42ca881fa79c04 Mon Sep 17 00:00:00 2001
From: thilinianjalika <brittothilini@gmail.com>
Date: Sat, 2 Oct 2021 13:06:37 +0530
Subject: [PATCH] Admin modified for advertisement confirmation

---
 EnLearn.iml                                   |   2 +-
 .../enLearn/controller/AdminController.java   |   2 +-
 .../service/AdvertisementServiceImpl.java     |   5 +-
 .../WEB-INF/view/Advertisement-Confirm.jsp    | 365 +++++++++---------
 src/main/webapp/WEB-INF/view/admin-panel.jsp  |   2 +-
 5 files changed, 192 insertions(+), 184 deletions(-)

diff --git a/EnLearn.iml b/EnLearn.iml
index 86c33514..b2d9edb4 100644
--- a/EnLearn.iml
+++ b/EnLearn.iml
@@ -20,7 +20,7 @@
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
         <datasource-mapping>
-          <factory-entry name="EnLearn" value="c7d4ad7f-c5e9-4f5b-80c4-ffb906e4e59d" />
+          <factory-entry name="EnLearn" value="3ea9648e-c02b-4981-91f7-6f1634b68cdc" />
         </datasource-mapping>
         <naming-strategy-map>
           <unit-entry name="EnLearn" />
diff --git a/src/main/java/net/enLearn/controller/AdminController.java b/src/main/java/net/enLearn/controller/AdminController.java
index 0391f964..f42dff0c 100644
--- a/src/main/java/net/enLearn/controller/AdminController.java
+++ b/src/main/java/net/enLearn/controller/AdminController.java
@@ -168,7 +168,7 @@ public String showEventUpdateForm(@RequestParam("eventId") int eventId, Model mo
     @RequestMapping("/showAdvertisements")
     public String showAdvertisement(Model model){
 
-        int advertiser_id = 20;
+        int advertiser_id = 4;
 
 
         //To retrieve all the data in the table - advertisement
diff --git a/src/main/java/net/enLearn/service/AdvertisementServiceImpl.java b/src/main/java/net/enLearn/service/AdvertisementServiceImpl.java
index 41cbc736..44908f41 100644
--- a/src/main/java/net/enLearn/service/AdvertisementServiceImpl.java
+++ b/src/main/java/net/enLearn/service/AdvertisementServiceImpl.java
@@ -1,6 +1,6 @@
 package net.enLearn.service;
 
-import net.enLearn.dao.AdvertisementDAOImpl;
+import net.enLearn.dao.AdvertisementDAO;
 import net.enLearn.entity.Advertisement;
 import net.enLearn.entity.Advertiser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +13,8 @@
 public class AdvertisementServiceImpl implements AdvertisementService {
 
     @Autowired
-    AdvertisementDAOImpl advertisementDAO;
+    //AdvertisementDAOImpl advertisementDAO;
+    AdvertisementDAO advertisementDAO;
 
 
     @Override
diff --git a/src/main/webapp/WEB-INF/view/Advertisement-Confirm.jsp b/src/main/webapp/WEB-INF/view/Advertisement-Confirm.jsp
index f97c8fad..2254e309 100644
--- a/src/main/webapp/WEB-INF/view/Advertisement-Confirm.jsp
+++ b/src/main/webapp/WEB-INF/view/Advertisement-Confirm.jsp
@@ -1,7 +1,4 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ page import="net.enLearn.entity.Advertisement" %>
-<%@ page import="java.util.List" %>
-<%@ page import="net.enLearn.entity.Advertiser" %><%--
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
   Created by IntelliJ IDEA.
   User: Thilini
   Date: 9/9/2021
@@ -63,7 +60,7 @@
                 </div>
             </div>
             <br>
-            <form class="" action="" style="margin:auto;max-width:300px" method="post">
+            <form class="" action="" style="margin:auto;max-width:300px">
                 <input type="text" placeholder="Search.." name="search2">
                 <button type="submit"><i class="fa fa-search"></i></button>
             </form>
@@ -71,15 +68,151 @@
 
 
 
-            <div class="row">
 
+            <div class="row">
                 <c:forEach var="advertisement" items="${allAdvertisements}">
-                    <c:forEach var="advertiser" items="${allAdvertisers}">
-                        <div class="col spacing-top">
+                    <%--<c:forEach var="advertiser" items="${allAdvertisers}">--%>
+
+                    <%--<c:url var="confirmAdvertisementLink" value="/admins/confirmAdvertisement">
+                        <c:param name="type" value="${admin.id}" />
+                    </c:url>--%>
+                    <div class="col spacing-top">
+                        <div class="card">
+                            <h5 class="mg-md text-lg-center">
+                                <c:out value="${advertisement.title}" />
+                            </h5>
+                            <div>
+                                <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
+                                <div class="divider-h">
+                                    <span class="divider"></span>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                    <%--<c:out value="${advertiser.cname}" />--%>
+                                                    ${allAdvertisers.cname}
+
+                                            </h6>
+                                        </div>
+
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                    <%--<c:out value="${advertiser.email}" />--%>
+                                                    ${allAdvertisers.email}
+
+                                            </h6>
+                                        </div>
+
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                    <%--<c:out value="${advertiser.contact_no}" />--%>
+                                                    ${allAdvertisers.contact_no}
+                                            </h6>
+                                        </div>
+
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                <c:out value="${advertisement.description}" />
+                                            </h6>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                            <textarea id="w3review" name="w3review" rows="3" cols="25">
+                                            </textarea>
+                                            </h6>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <div class="text-center">
+                                    <div class="row">
+                                        <div class="col">
+                                            <a href="confirmAdvertisementLink" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
+                                        </div>
+                                        <div class="col">
+                                            <a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-ad">Delete</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="divider-h">
+                                    <span class="divider"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <%--</c:forEach>--%>
+                </c:forEach>
+                <%--
+                                <div class="col spacing-top">
+                                    <div class="card">
+                                        <h5 class="mg-md text-lg-center">
+                                            Title
+                                        </h5>
+                                        <div>
+                                            <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
+                                            <div class="divider-h">
+                                                <span class="divider"></span>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <h6 text-align: right;>
+                                                            Company Name
+                                                        </h6>
+                                                    </div>
+
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <h6 text-align: right;>
+                                                            Selected Package
+                                                        </h6>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <h6 text-align: right;>
+                                                            Email
+                                                        </h6>
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <h6 text-align: right;>
+                                                            Contact Number
+                                                        </h6>
+                                                    </div>
+                                                </div>
+                                            </div>
+
+
+
+                                            <div class="text-center">
+                                                <div class="row">
+                                                    <div class="col">
+                                                        <a href="#" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
+                                                    </div>
+                                                    <div class="col">
+                                                        <a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-ad">Delete</a>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="divider-h">
+                                                <span class="divider"></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>--%>
+                <%--        <div class="col spacing-top">
                             <div class="card">
                                 <h5 class="mg-md text-lg-center">
-
-                                    <c:out value="${advertisement.title}" />
+                                   Title
                                 </h5>
                                 <div>
                                     <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
@@ -96,10 +229,9 @@
                                         <div class="row">
                                             <div class="col">
                                                 <h6 text-align: right;>
-                                                    <c:out value="${advertisement.price_range}" />
+                                                    Selected Package
                                                 </h6>
                                             </div>
-
                                         </div>
                                         <div class="row">
                                             <div class="col">
@@ -108,13 +240,6 @@
                                                 </h6>
                                             </div>
                                         </div>
-                                        <div class="row">
-                                            <div class="col">
-                                                <h6 text-align: right;>
-                                                    <c:out value="${advertisement.description}" />
-                                                </h6>
-                                            </div>
-                                        </div>
                                         <div class="row">
                                             <div class="col">
                                                 <h6 text-align: right;>
@@ -123,7 +248,9 @@
                                             </div>
                                         </div>
                                     </div>
+
                                     <div class="text-center">
+                                        <!--<a href="index.jsp" class="btn btn-d btn-lg shop-card-btn btn-43-style btn-rd">Get Discount</a>-->
                                         <div class="row">
                                             <div class="col">
                                                 <a href="#" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
@@ -138,99 +265,37 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-
-                    </c:forEach>
-                </c:forEach>
-
-
-                <%--<div class="col spacing-top">
-                    <div class="card">
-                        <h5 class="mg-md text-lg-center">
-                            Title
-                        </h5>
-                        <div>
-                            <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
-                            <div class="divider-h">
-                                <span class="divider"></span>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Company Name
-                                        </h6>
-                                    </div>
-
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Selected Package
-                                        </h6>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Email
-                                        </h6>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Contact Number
-                                        </h6>
-                                    </div>
-                                </div>
-                            </div>
-
-
+                        </div>--%>
+                <%--    <div class="col spacing-top">
+                        <div class="card">
+                            <h5 class="mg-md text-lg-center">
+                                Title
+                            </h5>
+                            <div>
+                                <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
+                                <div class="divider-h">
+                                    <span class="divider"></span>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                Company Name
+                                            </h6>
+                                        </div>
 
-                            <div class="text-center">
-                                <div class="row">
-                                    <div class="col">
-                                        <a href="#" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
-                                    </div>
-                                    <div class="col">
-                                        <a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-ad">Delete</a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="divider-h">
-                                <span class="divider"></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col spacing-top">
-                    <div class="card">
-                        <h5 class="mg-md text-lg-center">
-                            Title
-                        </h5>
-                        <div>
-                            <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
-                            <div class="divider-h">
-                                <span class="divider"></span>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Company Name
-                                        </h6>
                                     </div>
-
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Selected Package
-                                        </h6>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                Selected Package
+                                            </h6>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Email
-                                        </h6>
+                                    <div class="row">
+                                        <div class="col">
+                                            <h6 text-align: right;>
+                                                Email
+                                            </h6>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="row">
@@ -241,80 +306,22 @@
                                     </div>
                                 </div>
                             </div>
-
-                            <div class="text-center">
-                                <!--<a href="index.jsp" class="btn btn-d btn-lg shop-card-btn btn-43-style btn-rd">Get Discount</a>-->
-                                <div class="row">
-                                    <div class="col">
-                                        <a href="#" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
-                                    </div>
-                                    <div class="col">
-                                        <a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-ad">Delete</a>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="divider-h">
-                                <span class="divider"></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col spacing-top">
-                    <div class="card">
-                        <h5 class="mg-md text-lg-center">
-                            Title
-                        </h5>
-                        <div>
-                            <img src="../../resources/img/lazyload-ph.png" data-src="../../resources/img/placeholder-image.png" class="img-fluid mx-auto d-block lazyload" alt="placeholder image" />
-                            <div class="divider-h">
-                                <span class="divider"></span>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Company Name
-                                        </h6>
-                                    </div>
-
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Selected Package
-                                        </h6>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col">
-                                        <h6 text-align: right;>
-                                            Email
-                                        </h6>
+                                <div class="text-center">
+                                    <!--<a href="index.jsp" class="btn btn-d btn-lg shop-card-btn btn-43-style btn-rd">Get Discount</a>-->
+                                    <div class="row">
+                                        <div class="col">
+                                            <a href="#" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
+                                        </div>
+                                        <div class="col">
+                                            <a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-ad">Delete</a>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="row">
-                                <div class="col">
-                                    <h6 text-align: right;>
-                                        Contact Number
-                                    </h6>
+                                <div class="divider-h">
+                                    <span class="divider"></span>
                                 </div>
                             </div>
-                        </div>
-                        <div class="text-center">
-                            <!--<a href="index.jsp" class="btn btn-d btn-lg shop-card-btn btn-43-style btn-rd">Get Discount</a>-->
-                            <div class="row">
-                                <div class="col">
-                                    <a href="#" class="btn btn-success" data-toggle="modal" data-target="#ad">Confirm</a><br>
-                                </div>
-                                <div class="col">
-                                    <a href="#" class="btn btn-danger" data-toggle="modal" data-target="#delete-ad">Delete</a>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="divider-h">
-                            <span class="divider"></span>
-                        </div>
-                    </div>
-                </div>--%>
+                        </div>--%>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/WEB-INF/view/admin-panel.jsp b/src/main/webapp/WEB-INF/view/admin-panel.jsp
index 4c21ed07..9153bb07 100644
--- a/src/main/webapp/WEB-INF/view/admin-panel.jsp
+++ b/src/main/webapp/WEB-INF/view/admin-panel.jsp
@@ -62,7 +62,7 @@
                         <div class="col">
                             <div class="text-center">
                                 <a href="#" class="btn btn-d btn-lg btn-block" data-toggle="modal" data-target="#approve-teacher">Teacher approves</a>
-                                <a href="${pageContext.request.contextPath}/admins/confirm-advertisement" class="btn btn-d btn-lg btn-block" >Banner Approves</a>
+                                <a href="${pageContext.request.contextPath}/admins/showAdvertisements" class="btn btn-d btn-lg btn-block" >Banner Approves</a>
                                 <a href="${pageContext.request.contextPath}/discounts/Add-Discount" class="btn btn-d btn-lg btn-block" >Add Discount</a>
                             </div>
                         </div>