From: Roland Haeder <roland@mxchange.org>
Date: Wed, 2 Sep 2015 07:51:07 +0000 (+0200)
Subject: Continued with project:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=04226fb43732a1df2c1c281848ba36aafc57788d;p=pizzaservice-war.git

Continued with project:
- converted single tables per row into one table with header and body
- added column for showing total price for item (price * amount)
- added mime-type for tpl extension
- renamed CSS id to make it more clear
- updated jshop.jar

NOTE: Please note that this change won't fully work as the product instance needs to be set in item instance now (see jshop.jar, method calculateTotalPrice())
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jshop.jar b/lib/jshop.jar
index 7040946f..c1ba5b85 100644
Binary files a/lib/jshop.jar and b/lib/jshop.jar differ
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 07d3cf50..bfaffe8a 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -23,7 +23,7 @@
 			</ui:insert>
 		</div>
 
-		<div id="left_content">
+		<div id="menu_content">
 			<div id="left">
 				<ui:insert name="menu">Default menu</ui:insert>
 			</div>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index da05191b..185adda9 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -70,6 +70,10 @@
         <servlet-name>Faces Servlet</servlet-name>
         <url-pattern>/faces/*</url-pattern>
     </servlet-mapping>
+	<mime-mapping>
+		<extension>tpl</extension>
+		<mime-type>text/plain</mime-type>
+	</mime-mapping>
     <session-config>
         <session-timeout>
             30
diff --git a/web/index.xhtml b/web/index.xhtml
index 958400df..84ab5058 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -41,65 +41,70 @@
 			</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="4" 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}">
+							<c:set var="isAdded" value="#{controller.basket.isAdded(product)}" />
+
+							<ui:fragment rendered="#{isAdded == true}">
+								<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>
+
+									<td class="table_data_column" align="right">
+										<h:outputText class="price" value="#{controller.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="#{controller.basket.addToBasket(product)}" />
@@ -120,12 +125,16 @@
 											<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
 										</h:outputText>
 									</td>
+
+									<td class="table_data_column">
+										-
+									</td>
 								</tr>
-							</tbody>
-						</table>
-					</h:form>
-				</ui:fragment>
-			</ui:repeat>
+							</ui:fragment>
+						</ui:repeat>
+					</tbody>
+				</table>
+			</h:form>
 		</ui:define>
 
 		<ui:define name="footer">
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 3d3b2cb1..bbc4cead 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -72,6 +72,10 @@ table, .table {
 	width: 500px;
 }
 
+.basket_item_table {
+	width: 600px;
+}
+
 .table_row {
 	width: 100%;
 }