Added footer for admin area + error include file "direct_call.jsp"

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

index 0339ebe6fe411ceab238b53a140da7c4d496439d..26d3b050d7dc558882aa46e51c7421ef4a45aea7 100644 (file)
--- a/web/finished.jsp
+++ b/web/finished.jsp
@@ -26,18 +26,18 @@
  <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>
  
         <body>
-               <div id="title">
-                       <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Vielen Dank!</h1>
+               <div id="header"> 
+                       <div id="title">
+                               <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Vielen Dank!</h1>
+                       </div>
                 </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">
@@ -46,7 +46,7 @@
  
                         <div id="content">
                                 <table class="table">
-                                       <thead class="table_header">
+                                       <thead>
                                                 <tr>
                                                         <th class="table_header_column">
                                                                 Bestellen?
@@ -65,21 +65,15 @@
                                                         </th>
                                                 </tr>
                                         </thead>
-                                       <tbody class="table_body">
+                                       <tbody>
                                                 <%
-                                               // 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>
@@ -94,13 +88,12 @@
                                                                 <td>
                                                                         <%=product.getPrice()%>
                                                                 </td>
-                                                               <td>
+                                                               <td align="right">
                                                                         <%=app.getTotalPositionPriceFromRequestSession(product, request, session)%>
                                                                 </td>
                                                         </tr>
                                                         <%
                                                 }
-                                               float totalPrice = app.calculateTotalPrice(request, session);
                                                 %>
                                                 <tr>
                                                         <td id="table_total_amount_left">
@@ -109,14 +102,14 @@
                                                         <td id="table_total_amount_right">
                                                                 <%=app.calculateTotalAmount(request, session)%>
                                                         </td>
-                                                       <td class="spacer">
+                                                       <td>
                                                                 &nbsp;
                                                         </td>
                                                         <td id="table_total_sum_left">
                                                                 Gesamtpreis:
                                                         </td>
-                                                       <td id="table_total_sum_right">
-                                                               <%=totalPrice%>
+                                                       <td id="table_total_sum_right" align="right">
+                                                               <%=app.calculateTotalPrice(request, session)%>
                                                         </td>
                                                 </tr>
  
@@ -129,6 +122,10 @@
                                                 <tr>
                                                         <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>
@@ -164,5 +161,7 @@
                                 </table>
                         </div>
                 </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
         </body>
  </html>