Continued with project:

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

index 7002f658c191033e57cf366deb5ed76717634de2..ca5a32d7d14f14e58407a0d07829778c30c89dcf 100644 (file)
--- a/web/preview.jsp
+++ b/web/preview.jsp
@@ -1,5 +1,5 @@
  <%-- 
-       Document   : order
+       Document   : preview
         Created on : 04.08.2015, 10:55:10
         Author     : Roland Haeder
  --%>
@@ -25,7 +25,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%> - Bestellung anzeigen</title>
         </head>
  
@@ -42,7 +42,7 @@
                         </div>
  
                         <div id="content">
-                               <form action="<%=request.getContextPath()%>/form_handler/order.jsp" accept-charset="utf-8" id="form" method="post">
+                               <form action="<%=request.getContextPath()%>/form_handler/do_order.jsp" accept-charset="utf-8" id="form" method="post">
                                 <table class="table">
                                         <thead class="table_header">
                                                 <tr>
@@ -65,8 +65,16 @@
                                         </thead>
                                         <tbody class="table_body">
                                                 <%
+                                               // Get Iterator
+                                               Iterator<Product> iterator = app.getAvailableProducts();
+
                                                 // "Walk" through all products and unmark them as ordered
-                                               for (final Product product : app.getUnmarkedProducts(session)) {
+                                               while (iterator.hasNext()) {
+                                                       // Get product instance
+                                                       Product product = iterator.next();
+
+                                                       // Unmark it as ordered
+                                                       app.unmarkProductAsOrdered(product, session);
                                                         %>
                                                         <tr>
                                                                 <td>
@@ -113,7 +121,7 @@
  
                                                 <tr>
                                                         <td colspan="5">
-                                                               <fieldset>
+                                                               <fieldset id="personal_data">
                                                                         <legend title="Bitte geben Sie Ihre Daten ein.">Bitte Ihre Daten eingeben:</legend>
  
                                                                         <div class="data_row">
@@ -122,28 +130,10 @@
                                                                                 </div>
  
                                                                                 <div class="data_right">
-                                                                                       <select name="gender" id="gender" size="1" <%=app.getDisabledHtmlFromSession(request, session)%>>
-                                                                                               <%
-                                                                                               // "Walk" through all genders and output them
-                                                                                               for (final Gender gender : Gender.values()) {
-                                                                                                       %>
-                                                                                                       <option value="<%=gender.name()%>"<%
-                                                                                                       // Get gender from bean
-                                                                                                       Gender value=  customer.getGender();
-
-                                                                                                       // Test it
-                                                                                                       if (value.equals(gender)) {
-                                                                                                               // Output selected="selected"
-                                                                                                               out.print("selected=\"selected\"");
-                                                                                                       }
-                                                                                                       %>><%=gender%></option>
-                                                                                                       <%
-                                                                                               }
-                                                                                               %> 
-                                                                                       </select>
+                                                                                       <jsp:include page="/static/gender_selection_box.jsp" flush="true" />
                                                                                 </div>
  
-                                                                                       <div class="clear"></div>
+                                                                               <div class="clear"></div>
                                                                         </div>
  
                                                                         <div class="data_row">