Merge branch 'master' of codecrew.fi:bortal

code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml

@@ -144,11 +144,16 @@
 			<h2>#{i18n['foodwave.summaryView']}</h2>
 			<h2>#{i18n['foodwave.summaryView']}</h2>
 			<div>
 			<div>
 				<h:outputLabel value="#{i18n['foodwave.price']}: " />
 				<h:outputLabel value="#{i18n['foodwave.price']}: " />
-				<h:outputText value="#{foodWaveView.foodwavePrice}" />
+				<h:outputText value="#{foodWaveView.foodwavePrice}" >
+					<f:convertNumber minFractionDigits="0"/>
+				</h:outputText>
 			</div>
 			</div>
 			<div>
 			<div>
 				<h:outputLabel value="#{i18n['foodwave.foodwaveBuyInPrice']}: " />
 				<h:outputLabel value="#{i18n['foodwave.foodwaveBuyInPrice']}: " />
-				<h:outputText value="#{foodWaveView.foodwaveBuyInPrice}" />
+				<h:outputText value="#{foodWaveView.foodwaveBuyInPrice}" >
+					<f:convertNumber minFractionDigits="0"/>
+				</h:outputText>
+				
 			</div>
 			</div>
 			<p:dataTable var="summ" value="#{foodWaveView.productSummaries}">
 			<p:dataTable var="summ" value="#{foodWaveView.productSummaries}">
 				<p:column>
 				<p:column>

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

@@ -31,7 +31,7 @@ public class HostnameFilter implements Filter {
 
 
 	@EJB
 	@EJB
 	private SessionMgmtBeanLocal sessionmgmt;
 	private SessionMgmtBeanLocal sessionmgmt;
-	private static final String HTTP_TRAIL_NAME = "lanbortal_http_trail";
+	public static final String HTTP_TRAIL_NAME = "lanbortal_http_trail";
 
 
 	/**
 	/**
 	 * Default constructor.
 	 * Default constructor.

code/LanBortalWeb/src/fi/insomnia/bortal/web/ErrorPageView.java

 package fi.insomnia.bortal.web;
 package fi.insomnia.bortal.web;
 
 
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.zip.CRC32;
+
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContext;
 import javax.inject.Inject;
 import javax.inject.Inject;
@@ -9,22 +16,13 @@ import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
-import java.util.Queue;
-
-
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.util.Calendar;
-import java.util.Map;
-
-import java.util.zip.CRC32;
+import fi.insomnia.bortal.HostnameFilter;
 
 
 @Named
 @Named
 @RequestScoped
 @RequestScoped
 public class ErrorPageView implements Serializable {
 public class ErrorPageView implements Serializable {
 
 
-/**
+	/**
 	 * 
 	 * 
 	 */
 	 */
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
@@ -37,7 +35,6 @@ public class ErrorPageView implements Serializable {
 	@SuppressWarnings("unused")
 	@SuppressWarnings("unused")
 	private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class);
 	private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class);
 
 
-	
 	public String getStackTrace() {
 	public String getStackTrace() {
 
 
 		FacesContext context = FacesContext.getCurrentInstance();
 		FacesContext context = FacesContext.getCurrentInstance();
@@ -67,7 +64,7 @@ public class ErrorPageView implements Serializable {
 
 
 	}
 	}
 
 
-	public String getTime(){
+	public String getTime() {
 		String stamp = "0x" + Long.toHexString(Calendar.getInstance().getTimeInMillis());
 		String stamp = "0x" + Long.toHexString(Calendar.getInstance().getTimeInMillis());
 		logger.error("Error occured at {} trail {}", stamp, getTrail());
 		logger.error("Error occured at {} trail {}", stamp, getTrail());
 		return stamp;
 		return stamp;
@@ -75,7 +72,7 @@ public class ErrorPageView implements Serializable {
 
 
 	public String getTrail() {
 	public String getTrail() {
 		HttpServletRequest req = (HttpServletRequest) getContext().getExternalContext().getRequest();
 		HttpServletRequest req = (HttpServletRequest) getContext().getExternalContext().getRequest();
-		Object trail = req.getSession().getAttribute("trail");
+		Object trail = req.getSession().getAttribute(HostnameFilter.HTTP_TRAIL_NAME);
 		return trail != null ? trail.toString() : "";
 		return trail != null ? trail.toString() : "";
 	}
 	}
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveFoodView.java

@@ -144,6 +144,10 @@ public class FoodWaveFoodView extends GenericCDIView {
 		
 		
 		billBean.createBill(bill);
 		billBean.createBill(bill);
 		
 		
+		
+		// TODO: do this right way
+		eventBean.flushCache();
+
 		return bill;
 		return bill;
 	}
 	}