Skip to content

Max Mecklin / Moya

Go to a project
Commit db5d5f50 by Juho Juopperi
Options

Merge branch 'infologFixes' into 'master' 

Infolog fixes

linkki

See merge request !246
2 parents 1a1dec84 1208da1a
Inline Side-by-side
Showing with 44 additions and 23 deletions
code/moya-web/WebContent/actionlog/index.xhtml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<h:outputText value="#{i18n['actionlog.create.taskradio']}" /> <h:outputText value="#{i18n['actionlog.create.taskradio']}" />
<h:outputText /> <h:outputText />
<p:inputText value="#{actionLogCreateView.message}" style="width: 400px;" /> <p:inputTextarea value="#{actionLogCreateView.message}" style="width: 500px;" />
<p:selectBooleanCheckbox value="#{actionLogCreateView.task}" /> <p:selectBooleanCheckbox value="#{actionLogCreateView.task}" />
<h:commandButton class="sendbutton" <h:commandButton class="sendbutton"
action="#{actionLogCreateView.send}" action="#{actionLogCreateView.send}"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
paginator="true" rows="30" paginator="true" rows="30"
paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
rowsPerPageTemplate="30,50,100"> rowsPerPageTemplate="30,50,100">
<p:column> <p:column style="width: 130px;">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.time']}" /> <h:outputText value="#{i18n['actionlog.time']}" />
</f:facet> </f:facet>
...@@ -71,27 +71,27 @@ ...@@ -71,27 +71,27 @@
timeZone="#{sessionHandler.timezone}" /> timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column style="width: 80px;">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.user']}" /> <h:outputText value="#{i18n['actionlog.user']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.user.nick}" /> <h:outputText value="#{message.user.nick}" />
</p:column> </p:column>
<p:column> <p:column >
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.message']}" /> <h:outputText value="#{i18n['actionlog.message']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.message}" /> <h:outputText value="#{message.message}" />
</p:column> </p:column>
<p:column> <p:column style="width: 50px;">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.state']}" /> <h:outputText value="#{i18n['actionlog.state']}" />
</f:facet> </f:facet>
<h:outputText value="#{i18n[message.state.key]}" /> <h:outputText value="#{i18n[message.state.key]}" />
</p:column> </p:column>
<p:column> <p:column style="width: 90px;">
<h:link rendered="#{!empty message.state}" outcome="taskview"> <h:link rendered="#{!empty message.state}" outcome="taskview">
<f:param name="id" value="#{message.id}" /> <f:param name="id" value="#{message.id}" />
Näytä tehtävä Näytä tehtävä
......
code/moya-web/WebContent/actionlog/taskview.xhtml
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
<f:event type="preRenderView" listener="#{taskModificationView.initView}" /> <f:event type="preRenderView" listener="#{taskModificationView.initView}" />
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<h:link outcome="index" value="#{i18n['vip.backToList']}" />
<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css"></h:outputStylesheet> <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css"></h:outputStylesheet>
<h1> <h1>
Task id: #{taskModificationView.message.id} Task id: #{taskModificationView.message.id}
<!-- #{i18n['actionlog.messagelist.header']} --> <!-- #{i18n['actionlog.messagelist.header']} -->
...@@ -92,6 +94,7 @@ ...@@ -92,6 +94,7 @@
<h:commandButton class="sendbutton2" value="#{i18n['actionlog.create.submitbutton']}" action="#{taskModificationView.createResponse()}" /> <h:commandButton class="sendbutton2" value="#{i18n['actionlog.create.submitbutton']}" action="#{taskModificationView.createResponse()}" />
</h:form> </h:form>
</div> </div>
<h:link outcome="index" value="#{i18n['vip.backToList']}" />
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/moya-web/WebContent/info/viplist.xhtml
...@@ -15,23 +15,31 @@ ...@@ -15,23 +15,31 @@
<h:form id="vipform"> <h:form id="vipform">
<p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}"> <p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}">
<f:facet name="header"> <!-- f:facet name="header">
<p:outputPanel> <p:outputPanel>
<h:outputText value="Search all fields:" /> <h:outputText value="Search all fields:" />
<p:inputText id="globalFilter" onkeyup="PF('viplist').filter()" style="width:150px" placeholder="Enter keyword" /> <p:inputText id="globalFilter" onkeyup="PF('viplist').filter()" style="width:150px" placeholder="Enter keyword" />
</p:outputPanel> </p:outputPanel>
</f:facet> </f:facet -->
<p:column headerText="#{i18n['vip.hostsName']}" filterBy="#{vip.host.wholeName}" filterMatchMode="contains"> <!-- p:column headerText="#{i18n['vip.hostsName']}" filterBy="#{vip.host.wholeName}" filterMatchMode="contains" style="width: 140px;" -->
<p:column headerText="#{i18n['vip.hostsName']}" style="width: 140px;">
<h:outputText id="viphostsname" value="#{vip.host.wholeName}" /> <h:outputText id="viphostsname" value="#{vip.host.wholeName}" />
<p:tooltip id="viphostsnamephone" for="viphostsname" value="#{vip.host.phone}" /> <p:tooltip id="viphostsnamephone" for="viphostsname" value="#{vip.host.phone}" />
</p:column> </p:column>
<p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains">
<!-- p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains" -->
<p:column headerText="#{i18n['vip.description']}" style="width: 170px;">
<h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" /> <h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" />
<p:tooltip id="toolTipVipdescr" for="vipdescr" value="#{vip.description}" /> <p:tooltip id="toolTipVipdescr" for="vipdescr" value="#{vip.description}" />
</p:column>
<p:column headerText="#{i18n['vip.description']}" >
<h:outputText value="#{vip.description}"/>
</p:column> </p:column>
<p:column filterBy="#{vip.searchableProductnames}" filterMatchMode="contains" headerText="#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}">
<!-- p:column filterBy="#{vip.searchableProductnames}" filterMatchMode="contains" headerText="#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}" -->
<p:column headerText="#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}">
<h:dataTable border="0" var="prod" value="#{vip.products}"> <h:dataTable border="0" var="prod" value="#{vip.products}">
<p:column> <p:column>
<h:outputText title="#{prod.notes}" value="#{prod.productName}" /> <h:outputText title="#{prod.notes}" value="#{prod.productName}" />
...@@ -54,8 +62,8 @@ ...@@ -54,8 +62,8 @@
<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>
<p:column> <p:column style="width: 90px;">
<h:link outcome="/vip/edit" value="#{i18n['vip.edit']}"> <h:link outcome="/vip/edit" value="#{i18n['vip.edit']}" >
<f:param name="id" value="#{vip.id}" /> <f:param name="id" value="#{vip.id}" />
</h:link> </h:link>
</p:column> </p:column>
......
code/moya-web/WebContent/vip/viplist.xhtml
...@@ -14,24 +14,34 @@ ...@@ -14,24 +14,34 @@
<h:link rendered="#{vipListView.canCreate()}" outcome="/vip/create" value="#{i18n['vip.createNew']}" /> <h:link rendered="#{vipListView.canCreate()}" outcome="/vip/create" value="#{i18n['vip.createNew']}" />
<br /> <br />
<h:form id="vipform"> <h:form id="vipform">
<p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}"> <p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}">
<f:facet name="header"> <!-- f:facet name="header">
<p:outputPanel> <p:outputPanel>
<h:outputText value="Search all fields:" /> <h:outputText value="Search all fields:" />
<p:inputText id="globalFilter" onkeyup="PF('viplist').filter()" style="width:150px" placeholder="Enter keyword" /> <p:inputText id="globalFilter" onkeyup="PF('viplist').filter()" style="width:150px" placeholder="Enter keyword" />
</p:outputPanel> </p:outputPanel>
</f:facet> </f:facet -->
<p:column headerText="#{i18n['vip.hostsName']}" filterBy="#{vip.host.wholeName}" filterMatchMode="contains"> <!-- p:column headerText="#{i18n['vip.hostsName']}" filterBy="#{vip.host.wholeName}" filterMatchMode="contains" style="width: 140px;" -->
<h:outputText value="#{vip.host.wholeName}" />
<p:column headerText="#{i18n['vip.hostsName']}" style="width: 140px;">
<h:outputText id="viphostsname" value="#{vip.host.wholeName}" />
<p:tooltip id="viphostsnamephone" for="viphostsname" value="#{vip.host.phone}" />
</p:column> </p:column>
<p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains">
<!-- p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains" -->
<p:column headerText="#{i18n['vip.description']}" style="width: 170px;">
<h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" /> <h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" />
<p:tooltip id="toolTipVipdescr" for="vipdescr" value="#{vip.description}" /> <p:tooltip id="toolTipVipdescr" for="vipdescr" value="#{vip.description}" />
</p:column>
<p:column headerText="#{i18n['vip.description']}" >
<h:outputText value="#{vip.description}"/>
</p:column> </p:column>
<p:column filterBy="#{vip.searchableProductnames}" filterMatchMode="contains" headerText="#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}">
<!-- p:column filterBy="#{vip.searchableProductnames}" filterMatchMode="contains" headerText="#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}" -->
<p:column headerText="#{i18n['vip.products']} | #{i18n['vip.productQuantity']} | #{i18n['vip.productDelivered']}">
<h:dataTable border="0" var="prod" value="#{vip.products}"> <h:dataTable border="0" var="prod" value="#{vip.products}">
<p:column> <p:column>
<h:outputText title="#{prod.notes}" value="#{prod.productName}" /> <h:outputText title="#{prod.notes}" value="#{prod.productName}" />
...@@ -54,8 +64,8 @@ ...@@ -54,8 +64,8 @@
<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>
<p:column> <p:column style="width: 90px;">
<h:link outcome="/vip/edit" value="#{i18n['vip.edit']}"> <h:link outcome="/vip/edit" value="#{i18n['vip.edit']}" >
<f:param name="id" value="#{vip.id}" /> <f:param name="id" value="#{vip.id}" />
</h:link> </h:link>
</p:column> </p:column>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!