Continued with project:

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

index d2c0ea7fad9894a8a49dcaa292ef516ede960c1e..ffc06eb0183e5ce7c19386758fa1bd4b6fad1f87 100644 (file)
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -20,7 +20,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%> - Eingangsseite</title>
         </head>
  
@@ -29,9 +29,7 @@
                         <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Eingangsseite</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">
@@ -39,7 +37,7 @@
                         </div>
  
                         <div id="content">
-                               <form action="<%=request.getContextPath()%>/order.jsp" accept-charset="utf-8" id="form" method="post">
+                               <form action="<%=request.getContextPath()%>/form_handler/do_preview.jsp" accept-charset="utf-8" id="form" method="post">
                                 <table class="table">
                                         <thead class="table_header">
                                                 <tr>
@@ -60,17 +58,8 @@
  
                                         <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();
-                                                       app.unmarkProductAsOrdered(product, session);
+                                               // "Walk" through all products and unmark them as ordered
+                                               for (final Product product : app.getUnmarkedProducts(session)) {
                                                         %>
                                                         <tr>
                                                                 <td>