better bill sensoring

code/MoyaWeb/WebContent/resources/cditools/bills/showBill.xhtml

@@ -15,8 +15,8 @@
 			<h:outputLabel for="billnr" value="#{i18n['bill.billNumber']}:" />
 			<h:outputLabel for="billnr" value="#{i18n['bill.billNumber']}:" />
 			<h:outputText id="billnr" value="#{cc.attrs.bill.billNumber}" />
 			<h:outputText id="billnr" value="#{cc.attrs.bill.billNumber}" />
 
 
-			<h:outputLabel for="refnr" value="#{i18n['bill.referencenumber']}" />
-			<h:outputText id="refnr" value="#{cc.attrs.bill.expired ? i18n['bill.isExpired'] : cc.attrs.bill.referenceNumber}" />
+			<h:outputLabel rendered="{!cc.attrs.bill.expired}" for="refnr" value="#{i18n['bill.referencenumber']}" />
+			<h:outputText  rendered="{!cc.attrs.bill.expired}"  id="refnr" value="#{cc.attrs.bill.referenceNumber}" />
 
 
 			<h:outputLabel for="billAmount" value="#{i18n['bill.billAmount']}" />
 			<h:outputLabel for="billAmount" value="#{i18n['bill.billAmount']}" />
 			<h:outputText id="billAmount" value="#{cc.attrs.bill.totalPrice()}">
 			<h:outputText id="billAmount" value="#{cc.attrs.bill.totalPrice()}">
@@ -29,10 +29,10 @@
 			</h:outputText>
 			</h:outputText>
 
 
 			<h:outputLabel for="paymenttime" value="#{i18n['bill.paymentTime']}:" />
 			<h:outputLabel for="paymenttime" value="#{i18n['bill.paymentTime']}:" />
-			<h:outputText id="paymenttime" value="#{cc.attrs.bill.expired ? i18n['bill.isExpired'] : (cc.attrs.bill.paymentTime eq 0 ? i18n['bill.paymentTime.now'] : cc.attrs.bill.paymentTime)}" />
+			<h:outputText id="paymenttime" value="#{cc.attrs.bill.paymentTime eq 0 ? i18n['bill.paymentTime.now'] : cc.attrs.bill.paymentTime}" />
 
 
-			<h:outputLabel for="noticetime" value="#{i18n['bill.noticetime']}:" />
-			<h:outputText id="noticetime" value="#{cc.attrs.bill.noticetime}" />
+			<h:outputLabel rendered="{!cc.attrs.bill.expired}"  for="noticetime" value="#{i18n['bill.noticetime']}:" />
+			<h:outputText rendered="{!cc.attrs.bill.expired}"  id="noticetime" value="#{cc.attrs.bill.noticetime}" />
 			
 			
 			<h:outputLabel rendered="#{cc.attrs.bill != null}" for="expires" value="#{i18n['bill.expires']}:" />
 			<h:outputLabel rendered="#{cc.attrs.bill != null}" for="expires" value="#{i18n['bill.expires']}:" />
 			<h:outputText rendered="#{cc.attrs.bill != null}" id="expires" value="#{cc.attrs.bill.expires.time}">
 			<h:outputText rendered="#{cc.attrs.bill != null}" id="expires" value="#{cc.attrs.bill.expires.time}">
@@ -66,15 +66,15 @@
 				<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.billAddress4}" value="&lt;br />" escape="false" />
 				<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.billAddress4}" value="&lt;br />" escape="false" />
 				<h:outputText id="recAddr4" value="#{cc.attrs.bill.event.organiser.billAddress4}" />
 				<h:outputText id="recAddr4" value="#{cc.attrs.bill.event.organiser.billAddress4}" />
 			</h:panelGroup>
 			</h:panelGroup>
-			<h:outputLabel rendered="#{!empty cc.attrs.bill.event.organiser.bankName1}" for="bankname1" value="#{i18n['eventorg.bankName1']}" />
-			<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.bankName1}" id="bankname1" value="#{cc.attrs.bill.event.organiser.bankName1}" />
-			<h:outputLabel rendered="#{!empty cc.attrs.bill.event.organiser.bankNumber1}" for="banknumber1" value="#{i18n['eventorg.bankNumber1']}" />
-			<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.bankNumber1}" id="banknumber1" value="#{cc.attrs.bill.event.organiser.bankNumber1}" />
-
-			<h:outputLabel rendered="#{!empty cc.attrs.bill.event.organiser.bankName2}" for="bankname2" value="#{i18n['eventorg.bankName2']}" />
-			<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.bankName2}" id="bankname2" value="#{cc.attrs.bill.event.organiser.bankName2}" />
-			<h:outputLabel rendered="#{!empty cc.attrs.bill.event.organiser.bankNumber2}" for="banknumber2" value="#{i18n['eventorg.bankNumber2']}" />
-			<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.bankNumber2}" id="banknumber2" value="#{cc.attrs.bill.event.organiser.bankNumber2}" />
+			<h:outputLabel rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankName1}" for="bankname1" value="#{i18n['eventorg.bankName1']}" />
+			<h:outputText rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankName1}" id="bankname1" value="#{cc.attrs.bill.event.organiser.bankName1}" />
+			<h:outputLabel rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankNumber1}" for="banknumber1" value="#{i18n['eventorg.bankNumber1']}" />
+			<h:outputText rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankNumber1}" id="banknumber1" value="#{cc.attrs.bill.event.organiser.bankNumber1}" />
+
+			<h:outputLabel rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankName2}" for="bankname2" value="#{i18n['eventorg.bankName2']}" />
+			<h:outputText rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankName2}" id="bankname2" value="#{cc.attrs.bill.event.organiser.bankName2}" />
+			<h:outputLabel rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankNumber2}" for="banknumber2" value="#{i18n['eventorg.bankNumber2']}" />
+			<h:outputText rendered="#{!cc.attrs.bill.expired and !empty cc.attrs.bill.event.organiser.bankNumber2}" id="banknumber2" value="#{cc.attrs.bill.event.organiser.bankNumber2}" />
 
 
 
 
 		</h:panelGrid>
 		</h:panelGrid>