Skip to content

Riina Antikainen / Moya

Go to a project
Commit b3938c62 by Antti Tonkyra
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents 10f0d1ae 17ba21f7
Inline Side-by-side
Showing with 85 additions and 44 deletions
code/MoyaAuthModule/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaAuthModule/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaAuthModuleClient/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaAuthModuleClient/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaBeans/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaBeans/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaBeansClient/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaBeansClient/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaCardPrinter/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaCardPrinter/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaDatabase/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaDatabase/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaEar/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaEar/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaUtilities/.settings/org.eclipse.core.resources.prefs 0 → 100644
eclipse.preferences.version=1
encoding/<project>=UTF-8
code/MoyaUtilities/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaWeb/.settings/org.eclipse.core.resources.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//WebContent/resources/templates/template1/css/style.css=UTF-8 encoding//WebContent/resources/templates/template1/css/style.css=UTF-8
encoding/<project>=UTF-8
code/MoyaWeb/.settings/org.eclipse.core.runtime.prefs 0 → 100644
eclipse.preferences.version=1
line.separator=\n
code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
<composite:interface> <composite:interface>
...@@ -16,30 +15,23 @@ ...@@ -16,30 +15,23 @@
<!-- <h:outputScript target="head" library="script" name="shopscript.js" /> --> <!-- <h:outputScript target="head" library="script" name="shopscript.js" /> -->
<h:outputScript library="primefaces" name="jquery/jquery.js" /> <h:outputScript library="primefaces" name="jquery/jquery.js" />
<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" id="billcart" value="#{cc.attrs.items}" var="cart"> <p:dataTable columnClasses="nowrap,numalign,numalign,numalign,nowrap" id="billcart" value="#{cc.attrs.items}" var="cart">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText id="name" value="${i18n['product.name']}" /> <h:outputText id="name" value="${i18n['product.name']}" />
</f:facet> </f:facet>
<h:outputText value="#{cart.product.name}" /> <h:outputText value="#{cart.product.name}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['product.price']}" /> <h:outputText value="${i18n['product.price']}" />
</f:facet> </f:facet>
<h:outputText id="price" value="#{cart.product.price.abs()}"> <h:outputText id="price" value="#{cart.product.price.abs()}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column>
<f:facet name="header"> <p:column style="text-align: center;">
<h:outputText value="${i18n['product.totalPrice']}" />
</f:facet>
<h:outputText id="total" value="#{cart.price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText id="count" value="${i18n['product.cart.count']}" /> <h:outputText id="count" value="${i18n['product.cart.count']}" />
</f:facet> </f:facet>
...@@ -55,48 +47,61 @@ ...@@ -55,48 +47,61 @@
<f:ajax render="@form" /> <f:ajax render="@form" />
</h:commandButton> </h:commandButton>
</h:column> </p:column>
<h:column rendered="#{productShopView.hasLimits}"> <p:column rendered="#{productShopView.hasLimits}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['productshop.limits']}" /> <h:outputText value="#{i18n['productshop.limits']}" />
</f:facet> </f:facet>
<h:outputText value="#{cart.limit}"> <h:outputText value="#{cart.limit}">
<f:convertNumber maxIntegerDigits="2" minFractionDigits="0" /> <f:convertNumber maxIntegerDigits="2" minFractionDigits="0" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<h:dataTable border="0" var="disc" value="#{cart.discounts}"> <h:dataTable border="0" var="disc" value="#{cart.discounts}">
<h:column> <p:column>
<h:outputText value="#{disc.shortdesc}" /> <h:outputText value="#{disc.shortdesc}" />
</h:column> </p:column>
<h:column> <p:column>
<h:outputText value="#{cart.getDiscount(disc.id)}"> <h:outputText value="#{cart.getDiscount(disc.id)}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText> </h:outputText>
</h:column> </p:column>
</h:dataTable> </h:dataTable>
</h:column> </p:column>
<p:column>
</h:dataTable> <f:facet name="header">
<h:outputText value="${i18n['product.totalPrice']}" />
<hr /> </f:facet>
<div> <h:outputText id="total" value="#{cart.price}">
<h:outputText value="#{i18n['productshop.total']} " /> <f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
<h:outputText value="#{productShopView.cartPrice}"> </h:outputText>
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" /> </p:column>
</h:outputText> <p:columnGroup type="footer">
</div> <p:row>
<h:panelGrid columns="3" > <p:column style="text-align: right;" colspan="4" footerText="#{i18n['productshop.total']}" />
<p:column footerText="#{productShopView.cartPrice}" />
</p:row>
</p:columnGroup>
</p:dataTable>
<br />
<h:panelGrid columns="3">
<h:outputText for="allowStats" value="#{i18n['bill.allowStatistics']}" /> <h:outputText for="allowStats" value="#{i18n['bill.allowStatistics']}" />
<h:selectBooleanCheckbox id="allowStats" value="#{productShopView.allowStatistics}" /> <h:selectBooleanCheckbox id="allowStats" value="#{productShopView.allowStatistics}" />
<h:message for="allowStats" /> <h:message for="allowStats" />
</h:panelGrid> </h:panelGrid>
<br />
<p:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
<p:inputTextarea cols="50" rendered="#{productShopView.gatherBillInfo}" value="#{productShopView.otherInfo}" label="#{i18n['otherInfo']}" /> <p:inputTextarea cols="50" rendered="#{productShopView.gatherBillInfo}" value="#{productShopView.otherInfo}" label="#{i18n['otherInfo']}" />
<div> <h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" /></div>
</composite:implementation> </composite:implementation>
</html> </html>
......
code/MoyaWeb/WebContent/resources/cditools/shop/productlist.xhtml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools"> xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
<composite:interface> <composite:interface>
...@@ -14,22 +14,22 @@ ...@@ -14,22 +14,22 @@
<h:form> <h:form>
<h:dataTable border="1" id="productListTable" <p:dataTable border="1" id="productListTable"
value="#{productView.userShoppableProducts}" var="product"> value="#{productView.userShoppableProducts}" var="product">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['product.name']}" /> <h:outputText value="#{i18n['product.name']}" />
</f:facet> </f:facet>
<h:outputText value="#{product.name}" /> <h:outputText value="#{product.name}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['product.price']}" /> <h:outputText value="#{i18n['product.price']}" />
</f:facet> </f:facet>
<h:outputText value="#{product.price}" /> <h:outputText value="#{product.price}" />
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/resources/templates/template1/css/style.css
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#main { #main {
font-family: Oxygen, Calibri; font-family: Oxygen, Calibri;
font-size: 10pt; font-size: 10pt;
padding-right: 1em;
} }
#main p { #main p {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!