]> git.mxchange.org Git - pizzaservice-war.git/blobdiff - web/index.xhtml
Added missing init() method + renamed localInit() -> genericInit()
[pizzaservice-war.git] / web / index.xhtml
index 958400dfec02c81d0a9b3fbc7f9a4a8f5c6277a6..74acebc078e20b1208a5272fe0f0cc263d9d30f0 100644 (file)
@@ -1,5 +1,3 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!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"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -7,18 +5,12 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <f:metadata>
-               <f:viewAction action="#{controller.init()}" />
-       </f:metadata>
-
-       <c:set var="basePath" value="#{request.contextPath}" />
-
        <!--
        TODO: Not used:
        xmlns:basket="http://mxchange.org/jshop/tags/basket"
        //-->
 
-       <ui:composition template="/WEB-INF/templates/base.tpl">
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">Willkommen!</ui:define>
 
                <ui:define name="menu">
                <ui:define name="content">
                        <!--
                        TODO Not used!
-                       <basket:mini_basket basket="#{basket}" />
-
-                       <h:panelGrid class="table" columnClasses="table_data_column" headerClass="table_header_column">
+                       <h:panelGrid class="basket_item_table" columnClasses="table_data_column" headerClass="table_header_column">
                                <f:facet name="header">
                                        Bestellen? Bestellmenge: Produkt: Einzelpreis:
                                </f:facet>
                        </h:panelGrid>
                        //-->
 
-                       <table class="table">
-                               <thead>
-                                       <tr>
-                                               <th colspan="4" class="table_header">
-                                                       Folgendes kann bestellt werden:
-                                               </th>
-                                       </tr>
-                               </thead>
-
-                               <tbody>
-                                       <tr>
-                                               <th class="table_header_column">
-                                                       Bestellen?
-                                               </th>
-                                               <th class="table_header_column">
-                                                       Anzahl:
-                                               </th>
-                                               <th class="table_header_column">
-                                                       Produkt:
-                                               </th>
-                                               <th class="table_header_column">
-                                                       Einzelpreis:
-                                               </th>
-                                       </tr>
-                               </tbody>
-                       </table>
-
-                       <ui:repeat var="product" value="#{controller.availableProducts}">
-                               <c:set var="isAdded" value="#{controller.basket.isAdded(product)}" />
-
-                               <ui:fragment rendered="#{isAdded == true}">
-                                       <table class="table">
-                                               <tbody>
-                                                       <tr>
-                                                               <td class="table_data_column">
-                                                                       <a href="#{basePath}/basket.jsp" title="Zum Warenkorb">Warenkorb</a>
-                                                               </td>
-
-                                                               <td class="table_data_column">
-                                                                       #{controller.basket.item.amount}
-                                                               </td>
-
-                                                               <td class="table_data_column">
-                                                                       #{product.title}
-                                                               </td>
-
-                                                               <td class="table_data_column" align="right">
-                                                                       <h:outputText class="price" value="#{product.price}">
-                                                                               <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
-                                                                       </h:outputText>
-                                                               </td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </ui:fragment>
-                               <ui:fragment rendered="#{isAdded == false}">
-                                       <h:form acceptcharset="utf-8" id="add_item">
-                                               <table class="table">
-                                                       <tbody>
+                       <h:form acceptcharset="utf-8" id="add_item">
+                               <table class="basket_item_table">
+                                       <thead>
+                                               <tr>
+                                                       <th colspan="5" class="table_header">
+                                                               Folgendes kann bestellt werden:
+                                                       </th>
+                                               </tr>
+
+                                               <tr>
+                                                       <th class="table_header_column">
+                                                               Bestellen?
+                                                       </th>
+
+                                                       <th class="table_header_column">
+                                                               Anzahl:
+                                                       </th>
+
+                                                       <th class="table_header_column">
+                                                               Produkt:
+                                                       </th>
+
+                                                       <th class="table_header_column">
+                                                               Einzelpreis:
+                                                       </th>
+
+                                                       <th class="table_header_column">
+                                                               Zwischensumme:
+                                                       </th>
+                                               </tr>
+                                       </thead>
+
+                                       <tbody>
+                                               <ui:repeat var="product" value="#{controller.availableProducts}">
+                                                       <!-- Cache isAdded call to reduce calls //-->
+                                                       <c:set var="isAdded" value="#{basket.isAdded(product)}" />
+
+                                                       <ui:fragment rendered="#{isAdded == true}">
                                                                <tr>
                                                                        <td class="table_data_column">
-                                                                               <h:commandButton class="submit" id="add" value="Hinzufügen" action="#{controller.basket.addToBasket(product)}" />
+                                                                               <h:link outcome="basket" title="Zum Warenkorb" value="Warenkorb" />
+                                                                       </td>
+
+                                                                       <td class="table_data_column">
+                                                                               #{basket.item.amount}
+                                                                       </td>
+
+                                                                       <td class="table_data_column">
+                                                                               #{product.title}
+                                                                       </td>
+
+                                                                       <td class="table_data_column" align="right">
+                                                                               <h:outputText class="price" value="#{product.price}">
+                                                                                       <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
+                                                                               </h:outputText>
+                                                                       </td>
+
+                                                                       <td class="table_data_column" align="right">
+                                                                               <h:outputText class="price" value="#{basket.item.calculateTotalPrice()}">
+                                                                                       <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
+                                                                               </h:outputText>
+                                                                       </td>
+                                                               </tr>
+                                                       </ui:fragment>
+
+                                                       <ui:fragment rendered="#{isAdded == false}">
+                                                               <tr>
+                                                                       <td class="table_data_column">
+                                                                               <h:commandButton class="submit" id="add" value="Hinzufügen" action="#{basket.addToBasket(product)}" />
                                                                                <h:inputHidden id="itemId" value="#{product.itemId}" />
                                                                                <h:inputHidden id="itemType" value="Product" />
                                                                        </td>
 
                                                                        <td class="table_data_column">
-                                                                               <h:inputText class="input" id="amount" size="3" maxlength="20" />
+                                                                               <h:inputText class="input" id="amount" size="3" maxlength="20">
+                                                                                       <!--
+                                                                                       If the customer wants to order more, he need to call in.
+                                                                                       //-->
+                                                                                       <f:validateLongRange minimum="1" maximum="10" />
+                                                                               </h:inputText>
                                                                        </td>
 
                                                                        <td class="table_data_column">
                                                                                        <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
                                                                                </h:outputText>
                                                                        </td>
+
+                                                                       <td class="table_data_column" align="right">
+                                                                               -
+                                                                       </td>
                                                                </tr>
-                                                       </tbody>
-                                               </table>
-                                       </h:form>
-                               </ui:fragment>
-                       </ui:repeat>
+                                                       </ui:fragment>
+                                               </ui:repeat>
+                                       </tbody>
+                               </table>
+                       </h:form>
                </ui:define>
 
                <ui:define name="footer">