Continued with project:

[pizzaservice-war.git] / web / finished.jsp
diff --git a/web/finished.jsp b/web/finished.jsp

index ab7d949842e876e49a6e5a5ba58198766edb27c3..c2ca53b6a45f09b73115d08b294a29ec37b82ed3 100644 (file)
--- a/web/finished.jsp
+++ b/web/finished.jsp
@@ -4,10 +4,10 @@
         Author     : Roland Haeder
  --%>
  
-<%@page import="java.lang.reflect.Field"%>
  <%--<%@page errorPage="errorHandler.jsp" %>--%>
  <%@page contentType="text/html" pageEncoding="UTF-8"%>
  
+<%@page import="java.lang.reflect.Field"%>
  <%@page import="java.util.Map"%>
  <%@page import="java.util.Iterator"%>
  <%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
@@ -15,7 +15,7 @@
  <%@page import="org.mxchange.pizzaapplication.beans.CustomerBean" %>
  <%@page import="org.mxchange.pizzaapplication.product.Product"%>
  
-<jsp:useBean id="customer" scope="request" class="org.mxchange.pizzaapplication.customer.bean.PizzaServiceCustomerBean" type="CustomerBean" />
+<jsp:useBean id="customer" scope="session" class="org.mxchange.pizzaapplication.customer.bean.PizzaServiceCustomerBean" type="CustomerBean" />
  <jsp:setProperty name="customer" property="*" />
  
  <%
@@ -26,7 +26,7 @@
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
         <head>
                 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-               <link rel="stylesheet" href="style.css" type="text/css"/>
+               <link rel="stylesheet" href="<%=request.getContextPath()%>/style.css" type="text/css"/>
                 <title><%=PizzaServiceApplication.MAIN_TITLE%> - Vielen Dank!</title>
         </head>
  
@@ -35,9 +35,7 @@
                         <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Vielen Dank!</h1>
                 </div>
  
-               <div id="menu">
-                       <jsp:include page="static/menu.jsp" flush="true" />
-               </div>
+               <jsp:include page="/static/menu.jsp" flush="true" />
  
                 <div id="content_outer">
                         <div id="content_title">
@@ -67,19 +65,8 @@
                                         </thead>
                                         <tbody class="table_body">
                                                 <%
-                                               // Get iterator from products
-                                               Iterator<Map.Entry<String, Product>> iterator = app.getProductsIterator();
-
-                                               // Iterate over all
-                                               while (iterator.hasNext()) {
-                                                       // Get entry
-                                                       Map.Entry<String, Product> entry = iterator.next();
-
-                                                       // Get product
-                                                       Product product = entry.getValue();
-
-                                                       // Mark product as ordered
-                                                       app.markProductAsOrdered(product, session);
+                                               // "Walk" over all products
+                                               for (final Product product : app.getProducts()) {
                                                         %>
                                                         <tr>
                                                                 <td>
@@ -127,8 +114,12 @@
                                                 </tr>
  
                                                 <tr>
-                                                       <td colspan="5" class="table_header">
+                                                       <td colspan="5" class="table_row">
                                                                 <%
+                                                               // Debug message
+                                                               app.getLogger().debug("customer=" + customer);
+
+                                                               // Get iterator on all fields/attributes
                                                                 Iterator<Map.Entry<Field, Object>> fieldIterator = customer.iterator();
                                                                 %>
                                                                 <ul>
@@ -138,10 +129,6 @@
                                                                         %>
                                                                         <li><%=entry.getKey().getName()%> set to: <%=entry.getValue()%></li>
                                                                         <%
-                                                                       // Set it in session
-                                                                       synchronized (session) {
-                                                                               session.setAttribute(entry.getKey().getName(), entry.getValue());
-                                                                       }
                                                                 }
                                                                 %>
                                                                 </ul>