Continued with project:

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

index 70bfa5e3e81689a615d4e16344a89526a78aa545..ffc06eb0183e5ce7c19386758fa1bd4b6fad1f87 100644 (file)
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -7,19 +7,20 @@
  <%@page errorPage="errorHandler.jsp" %>
  <%@page import="java.util.Map"%>
  <%@page import="java.util.Iterator"%>
-<%@page import="org.mxchange.pizzaservice.application.PizzaServiceApplication"%>
-<%@page import="org.mxchange.pizzaservice.application.PizzaApplication"%>
-<%@page import="org.mxchange.pizzaservice.product.Product"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
+<%@page import="org.mxchange.pizzaapplication.product.Product"%>
  <%@page contentType="text/html" pageEncoding="UTF-8"%>
  
  <%
-       // Init service instance
-       PizzaApplication service = PizzaServiceApplication.getInstance(application);
+       // Init application instance
+       PizzaApplication app = PizzaServiceApplication.getInstance(application);
  %>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <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="<%=request.getContextPath()%>/style.css" type="text/css"/>
                 <title><%=PizzaServiceApplication.MAIN_TITLE%> - Eingangsseite</title>
         </head>
  
@@ -28,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">
@@ -38,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>
@@ -56,26 +55,18 @@
                                                         </th>
                                                 </tr>
                                         </thead>
+
                                         <tbody class="table_body">
                                                 <%
-                                               // Get iterator from products
-                                               Iterator<Map.Entry<String, Product>> iterator = service.getProductsIterator();
-
-                                               // Iterate over all
-                                               while (iterator.hasNext()) {
-                                                       // Get entry
-                                                       Map.Entry<String, Product> entry = iterator.next();
-
-                                                       // Get product
-                                                       Product product = entry.getValue();
-                                                       service.unmarkProductAsOrdered(product, session);
+                                               // "Walk" through all products and unmark them as ordered
+                                               for (final Product product : app.getUnmarkedProducts(session)) {
                                                         %>
                                                         <tr>
                                                                 <td>
-                                                                       <input type="checkbox" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_CHOOSE, product.getName())%>" value="1" <%=service.getCheckedHtmlFromProduct(product, request, session)%> />
+                                                                       <input type="checkbox" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_CHOOSE, product.getName())%>" value="1" <%=app.getCheckedHtmlFromProduct(product, request, session)%> />
                                                                 </td>
                                                                 <td>
-                                                                       <input type="text" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_AMOUNT, product.getName())%>" value="<%=service.getAmountFromSession(product, session)%>" size="3" maxlength="20" />
+                                                                       <input type="text" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_AMOUNT, product.getName())%>" value="<%=app.getAmountFromSession(product, session)%>" size="3" maxlength="20" />
                                                                 </td>
                                                                 <td>
                                                                         <%=product.getTitle()%>
@@ -87,6 +78,7 @@
                                                         <%
                                                 }
                                                 %>
+
                                                 <tr>
                                                         <td colspan="4" class="table_footer">
                                                                 <input type="reset" value="Formular zurücksetzen" />