Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit f0ff3d9a
authored
Jan 29, 2015
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vipliststuff
1 parent
2fe2f5a2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
80 additions
and
2 deletions
code/moya-web/WebContent/info/viplist.xhtml
code/moya-web/WebContent/vip/edit.xhtml
code/moya-web/WebContent/vip/viplist.xhtml
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
code/moya-web/WebContent/info/viplist.xhtml
0 → 100644
View file @
f0ff3d9
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"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:f=
"http://java.sun.com/jsf/core"
xmlns:c=
"http://java.sun.com/jsp/jstl/core"
xmlns:p=
"http://primefaces.org/ui"
xmlns:shop=
"http://java.sun.com/jsf/composite/cditools/shop"
xmlns:reader=
"http://java.sun.com/jsf/composite/cditools/reader"
xmlns:tools=
"http://java.sun.com/jsf/composite/cditools"
xmlns:user=
"http://java.sun.com/jsf/composite/cditools/user"
xmlns:infoview=
"http://java.sun.com/jsf/composite/cditools/infoview"
>
<h:body>
<ui:composition
template=
"/resources/templates/#{sessionHandler.infoscreen}/template.xhtml"
>
<ui:param
name=
"ignorenavigationleft"
value=
"true"
/>
<f:metadata>
<f:event
type=
"preRenderView"
listener=
"#{vipListView.initView}"
/>
</f:metadata>
<ui:define
name=
"content"
>
<h:form
id=
"vipform"
>
<p:dataTable
id=
"vip"
value=
"#{vipListView.viplist}"
widgetVar=
"viplist"
styleClass=
"moya_datatable4"
var=
"vip"
filteredValue=
"#{vipListView.filteredVips}"
>
<f:facet
name=
"header"
>
<p:outputPanel>
<h:outputText
value=
"Search all fields:"
/>
<p:inputText
id=
"globalFilter"
onkeyup=
"PF('viplist').filter()"
style=
"width:150px"
placeholder=
"Enter keyword"
/>
</p:outputPanel>
</f:facet>
<p:column
headerText=
"#{i18n['vip.hostsName']}"
filterBy=
"#{vip.host.wholeName}"
filterMatchMode=
"contains"
>
<h:outputText
value=
"#{vip.host.wholeName}"
/>
</p:column>
<p:column
headerText=
"#{i18n['vip.description']}"
filterBy=
"#{vip.description}"
filterMatchMode=
"contains"
>
<h:outputText
id=
"vipdescr"
value=
"#{vip.shortDisplayDescr}"
title=
"#{vip.description}"
/>
<p:tooltip
id=
"toolTipVipdescr"
for=
"vipdescr"
value=
"#{vip.description}"
/>
</p:column>
<p:column
filterBy=
"#{vip.searchableProductnames}"
filterMatchMode=
"contains"
headerText=
"#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}"
>
<h:dataTable
border=
"0"
var=
"prod"
value=
"#{vip.products}"
>
<p:column>
<h:outputText
title=
"#{prod.notes}"
value=
"#{prod.productName}"
/>
</p:column>
<p:column>
<h:outputText
value=
"#{prod.quantity}"
>
<f:convertNumber
maxFractionDigits=
"3"
minFractionDigits=
"0"
/>
</h:outputText>
</p:column>
<p:column>
<h:outputText
value=
"#{prod.delivered}"
>
<f:convertNumber
maxFractionDigits=
"3"
minFractionDigits=
"0"
/>
</h:outputText>
</p:column>
</h:dataTable>
</p:column>
<p:column
style=
"width: 90px; text-align: center;"
>
<p:commandButton
id=
"delivebtn"
rendered=
"#{not empty vip.id}"
value=
"#{i18n['vip.deliver']}"
actionListener=
"#{vipListView.deliverDialog}"
>
<p:ajax
event=
"dialogReturn"
listener=
"#{vipListView.updateViplist()}"
update=
"vip"
/>
</p:commandButton>
</p:column>
<p:column>
<h:link
outcome=
"/vip/edit"
value=
"#{i18n['vip.edit']}"
>
<f:param
name=
"id"
value=
"#{vip.id}"
/>
</h:link>
</p:column>
</p:dataTable>
</h:form>
</ui:define>
<ui:define
name=
"sidebar"
>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/moya-web/WebContent/vip/edit.xhtml
View file @
f0ff3d9
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
<ui:define
name=
"content"
>
<ui:define
name=
"content"
>
<h:link
outcome=
"/vip/viplist"
value=
"#{i18n['vip.backToList']}"
/>
<h:form
id=
"vipcreate"
>
<h:form
id=
"vipcreate"
>
<h:panelGrid
columns=
"2"
>
<h:panelGrid
columns=
"2"
>
<h:outputLabel
value=
"#{i18n['vip.host']}"
for=
"hostselect"
/>
<h:outputLabel
value=
"#{i18n['vip.host']}"
for=
"hostselect"
/>
...
...
code/moya-web/WebContent/vip/viplist.xhtml
View file @
f0ff3d9
...
@@ -49,8 +49,8 @@
...
@@ -49,8 +49,8 @@
</h:dataTable>
</h:dataTable>
</p:column>
</p:column>
<p:column>
<p:column
style=
"width: 90px; text-align: center;"
>
<p:commandButton
id=
"delivebtn"
rendered=
"#{not empty vip.id}"
value=
"#{i18n['vip.deliver']}"
actionListener=
"#{vipListView.deliverDialog}"
>
<p:commandButton
id=
"delivebtn"
rendered=
"#{not empty vip.id}"
value=
"#{i18n['vip.deliver']}"
actionListener=
"#{vipListView.deliverDialog}"
>
<p:ajax
event=
"dialogReturn"
listener=
"#{vipListView.updateViplist()}"
update=
"vip"
/>
<p:ajax
event=
"dialogReturn"
listener=
"#{vipListView.updateViplist()}"
update=
"vip"
/>
</p:commandButton>
</p:commandButton>
</p:column>
</p:column>
...
...
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
View file @
f0ff3d9
...
@@ -508,3 +508,4 @@ vipProduct.name = Tuote
...
@@ -508,3 +508,4 @@ vipProduct.name = Tuote
vipProduct.quantity
=
Lukum
\u
00E4
\u
00E4r
\u
00E4
vipProduct.quantity
=
Lukum
\u
00E4
\u
00E4r
\u
00E4
yes
=
Kyll
\u
00E4
yes
=
Kyll
\u
00E4
vip.backToList
=
Takaisin listaukseen
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
View file @
f0ff3d9
...
@@ -1725,3 +1725,4 @@ voting.create.voteEnd = Voting close
...
@@ -1725,3 +1725,4 @@ voting.create.voteEnd = Voting close
voting.create.voteStart
=
Voting start
voting.create.voteStart
=
Voting start
yes
=
Yes
yes
=
Yes
vip.backToList
=
Back to viplist list
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
View file @
f0ff3d9
...
@@ -1708,3 +1708,4 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
...
@@ -1708,3 +1708,4 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart
=
\u
00C4
\u
00E4nestys auki
voting.create.voteStart
=
\u
00C4
\u
00E4nestys auki
yes
=
Kyll
\u
00E4
yes
=
Kyll
\u
00E4
vip.backToList
=
Takaisin listaukseen
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment