Continued with project:

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

index 2ad0f23ac7cdae8edad7f42615ef22ea9ecfd1a6..4f574d8b2b4502c9ca000a4697a4e2968fa17b1c 100644 (file)
--- a/web/finished.jsp
+++ b/web/finished.jsp
@@ -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,13 @@
                                         </thead>
                                         <tbody class="table_body">
                                                 <%
-                                               // Get iterator from products
-                                               Iterator<Map.Entry<String, Product>> iterator = app.getProductsIterator();
+                                               // Get Iterator
+                                               Iterator<Product> iterator = app.getAvailableProducts();
  
-                                               // Iterate over all
+                                               // "Walk" through all products and unmark them as ordered
                                                 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);
+                                                       // Get product instance
+                                                       Product product = iterator.next();
                                                         %>
                                                         <tr>
                                                                 <td>