Continued with project:

[pizzaservice-war.git] / web / index.jsp

diff --git a/web/index.jsp b/web/index.jsp
index d6129ad3f77bfeb34d330847b87f8a7903c89433..31610d6b9dcd9f1e70227dc4d116b9d0a06a3f79 100644 (file)
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -58,15 +58,23 @@
 
                                        <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 as ordered
+                                                       app.unmarkProductAsOrdered(product, session);
                                                        %>
                                                        <tr>
                                                                <td>
-                                                                       <input type="checkbox" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_CHOOSE, product.getName())%>" value="1" <%=app.getCheckedHtmlFromProduct(product, request, session)%> />
+                                                                       <input type="checkbox" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_CHOOSE, product.getId())%>" 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="<%=app.getAmountFromSession(product, session)%>" size="3" maxlength="20" />
+                                                                       <input type="text" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_AMOUNT, product.getId())%>" value="<%=app.getAmountFromSession(product, session)%>" size="3" maxlength="20" />
                                                                </td>
                                                                <td>
                                                                        <%=product.getTitle()%>