Skip to content

Linnea Samila / Moya

Go to a project
Commit 31fdc4a0 by Antti Tönkyrä
Options

AL fixes

1 parent 9c27721e
Inline Side-by-side
Showing with 22 additions and 24 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ActionLogFacade.java
...@@ -29,8 +29,6 @@ public class ActionLogFacade extends IntegerPkGenericFacade<ActionLogMessage> { ...@@ -29,8 +29,6 @@ public class ActionLogFacade extends IntegerPkGenericFacade<ActionLogMessage> {
cq.orderBy(cb.desc(root.get("time"))); cq.orderBy(cb.desc(root.get("time")));
TypedQuery<ActionLogMessage> tq = getEm().createQuery(cq); TypedQuery<ActionLogMessage> tq = getEm().createQuery(cq);
tq.setMaxResults(10);
tq.setFirstResult(0);
return tq.getResultList(); return tq.getResultList();
} }
......
code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml
...@@ -46,41 +46,41 @@ ...@@ -46,41 +46,41 @@
<div id="actionlog"> <div id="actionlog">
<h:form id="refresh"> <h:form id="refresh">
<p:poll interval="1" update="actionlogtable" /> <p:poll interval="1" update="actionlogtable" />
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message"> <p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.time']}" /> <h:outputText value="#{i18n['actionlog.time']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.time}"> <h:outputText value="#{message.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<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}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.crew']}" /> <h:outputText value="#{i18n['actionlog.crew']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.crew.name}" /> <h:outputText value="#{message.crew.name}" />
</h:column> </p:column>
<h: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}" />
</h:column> </p:column>
<h:column> <p:column>
<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ä
</h:link> </h:link>
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
</div> </div>
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/actionlog/taskview.xhtml
...@@ -49,35 +49,35 @@ ...@@ -49,35 +49,35 @@
<div> <div>
<h:form> <h:form>
<p:poll interval="1" update="messageresponsetable" /> <p:poll interval="1" update="messageresponsetable" />
<h:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response"> <p:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Aika" /> <h:outputText value="Aika" />
</f:facet> </f:facet>
<h:outputText value="#{response.time}"> <h:outputText value="#{response.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Submitter" /> <h:outputText value="Submitter" />
</f:facet> </f:facet>
<h:outputText value="#{response.user.nick}" /> <h:outputText value="#{response.user.nick}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Message" /> <h:outputText value="Message" />
</f:facet> </f:facet>
<h:outputText value="#{response.message}" /> <h:outputText value="#{response.message}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="tilanvaihdos" /> <h:outputText value="tilanvaihdos" />
</f:facet> </f:facet>
<h:outputText value="#{i18n[response.stateChange.key]}" /> <h:outputText value="#{i18n[response.stateChange.key]}" />
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!