Skip to content

Antti Väyrynen / Moya

Go to a project
Commit e984bdf2 by Tuukka Kivilahti
Options

asdf

1 parent 865f949a
Inline Side-by-side
Showing with 28 additions and 8 deletions
code/moya-web/WebContent/bill/list.xhtml
......@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:bills="http://java.sun.com/jsf/composite/cditools/bills"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"
>
<h:body>
<ui:composition template="#{sessionHandler.template}">
......@@ -13,6 +13,14 @@
</f:metadata>
<ui:define name="content">
<bills:list />
<br /><br />
<p:outputPanel rendered="#{placeGroupView.useEticket}" >
<p>
<p:button outcome="/place/myEtickets" value="#{i18n['placegroup.showEticket']}" />
</p>
</p:outputPanel>
<br /><br />
</ui:define>
</ui:composition>
</h:body>
......
code/moya-web/WebContent/neomap/view.xhtml
......@@ -79,19 +79,19 @@
<h:panelGrid columns="3" cellpadding="10">
<h:panelGrid columns="2">
<div
style="border-color: black; border-style: solid; border-width: 1px; background-color: grey; width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(83, 83, 83); width: 10px; height: 10px;">&nbsp;</div>
<h:outputText value="#{i18n['placeSelect.legend.grey']}" />
<div
style="border-color: black; border-style: solid; border-width: 1px; background-color: white; width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(204, 204, 204); width: 10px; height: 10px;">&nbsp;</div>
<h:outputText value="#{i18n['placeSelect.legend.white']}" />
<div
style="border-color: black; border-style: solid; border-width: 1px; background-color: red; width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(180, 1, 0); width: 10px; height: 10px;">&nbsp;</div>
<h:outputText value="#{i18n['placeSelect.legend.red']}" />
<div
style="border-color: black; border-style: solid; border-width: 1px; background-color: green; width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(47, 165, 37); width: 10px; height: 10px;">&nbsp;</div>
<h:outputText value="#{i18n['placeSelect.legend.green']}" />
<div
style="border-color: black; border-style: solid; border-width: 1px; background-color: blue; width: 10px; height: 10px;">&nbsp;</div>
style="border-color: black; border-style: solid; border-width: 1px; background-color: rgb(67, 66, 193); width: 10px; height: 10px;">&nbsp;</div>
<h:outputText value="#{i18n['placeSelect.legend.blue']}" />
</h:panelGrid>
......
code/moya-web/WebContent/place/myEtickets.xhtml
......@@ -7,7 +7,7 @@
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:event type="preRenderView" listener="#{eticketView.initView()}" />
</f:metadata>
<ui:define name="title">
......
code/moya-web/WebContent/place/myGroups.xhtml
......@@ -84,15 +84,19 @@
<p:button outcome="/place/myEtickets" value="#{i18n['placegroup.showEticket']}" />
</p>
</p:outputPanel>
<p:outputPanel rendered="#{!placeGroupView.printOnlyOwn}">
<h2>#{i18n['placetoken.pageHeader']}</h2>
<p>#{i18n['placetoken.topText']}</p>
<h:form id="placeTokenForm" rendered="#{!placeGroupView.printOnlyOwn}">
<h:form id="placeTokenForm">
<h:outputLabel value="#{i18n['placetoken.token']}:" />
<h:inputText value="#{tokenView.token}" />
<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
</h:form>
</p:outputPanel>
</ui:define>
</ui:composition>
</h:body>
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java
......@@ -91,6 +91,13 @@ public class EticketView extends GenericCDIView {
}
public void initView() {
List<GroupMembership> gmlist = ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser());
if(gmlist == null || gmlist.size() <= 0)
super.navihandler.forward("/shop/createBill?faces-redirect=true");
}
public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser()));
return memberlist;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
......@@ -90,6 +90,7 @@ public class PlacegroupView extends GenericCDIView {
return eventBean.getPropertyBoolean(LanEventPropertyKey.USE_ETICKET);
}
public boolean isPrintOnlyOwn() {
return eventBean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_PRINT_ONLY_OWN);
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!