Skip to content

Linnea Samila / Moya

Go to a project
Commit 5840a05e by Tuomas Riihimäki
Options

Change bill list functions to use refactored bill.sentDate instead of removed he… 

…lper function bill.sentDateTime
1 parent 2a7e43af
Inline Side-by-side
Showing with 5 additions and 5 deletions
code/moya-web/WebContent/bill/list.xhtml
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<ui:define name="content"> <ui:define name="content">
<h:form id="billList" styleClass="moya_datatable3"> <h:form id="billList" styleClass="moya_datatable3">
<p:dataTable sortBy="#{user.sentDateTime}" sortOrder="descending" sortField="sentDate" paginator="true" lazy="true" rows="100" styleClass="bordertable" id="billList" value="#{billListView.lazyBillList}" var="bill" <p:dataTable sortBy="#{bill.sentDate}" sortOrder="descending" sortField="sentDate" paginator="true" lazy="true" rows="100" styleClass="bordertable" id="billList" value="#{billListView.lazyBillList}" var="bill"
rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}" expandedRow="true"> rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}" expandedRow="true">
<p:column > <p:column >
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['bill.sentDate']}" /> <h:outputText value="${i18n['bill.sentDate']}" />
</f:facet> </f:facet>
<h:outputText value="#{bill.sentDateTime}"> <h:outputText value="#{bill.sentDate}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
......
code/moya-web/WebContent/bill/listAll.xhtml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<h:form id="billList" styleClass="moya_datatable3"> <h:form id="billList" styleClass="moya_datatable3">
<p:dataTable sortBy="#{user.sentDateTime}" sortOrder="descending" sortField="sentDate" paginator="true" lazy="true" rows="100" styleClass="bordertable" id="billList" value="#{billListView.lazyBillList}" var="bill" <p:dataTable sortBy="#{bill.sentDate}" sortOrder="descending" sortField="sentDate" paginator="true" lazy="true" rows="100" styleClass="bordertable" id="billList" value="#{billListView.lazyBillList}" var="bill"
rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}"> rowStyleClass="#{bill.expired ? 'expired' : (bill.paidDate != null ? 'paid' : null)}">
<p:column width="35"> <p:column width="35">
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
</h:link> </h:link>
</p:column> </p:column>
<p:column field="sentDate" sortBy="#{bill.sentDateTime}"> <p:column field="sentDate" sortBy="#{bill.sentDate}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['bill.sentDate']}" /> <h:outputText value="${i18n['bill.sentDate']}" />
</f:facet> </f:facet>
<h:outputText value="#{bill.sentDateTime}"> <h:outputText value="#{bill.sentDate}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</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!