bill confirmation

code/MoyaWeb/WebContent/WEB-INF/web.xml

@@ -10,7 +10,7 @@
 	<context-param>
 	<context-param>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		<param-name>javax.faces.PROJECT_STAGE</param-name>
 		<!-- Production | Development -->
 		<!-- Production | Development -->
-		<param-value>Production</param-value>
+		<param-value>Development</param-value>
 	</context-param>
 	</context-param>
 	<context-param>
 	<context-param>
 		<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
 		<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>

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

@@ -10,6 +10,12 @@
 <composite:implementation>
 <composite:implementation>
 
 
 	<h:outputText rendered="#{billListView.bills.rowCount le 0}" value="#{i18n['bills.noBills']}" />
 	<h:outputText rendered="#{billListView.bills.rowCount le 0}" value="#{i18n['bills.noBills']}" />
+	
+	<!--  koyhan miehen confirmaationappi: -->
+	<input type="button" class="ui-button ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" style="padding: 3px;" value="#{i18n['bill.markPaid.show']}" onclick="showMarkPaidButtons();" />
+		
+	
+	
 	<h:form rendered="#{billListView.bills.rowCount gt 0}">
 	<h:form rendered="#{billListView.bills.rowCount gt 0}">
 	    
 	    
 		<p:dataTable styleClass="bordertable" id="billList" value="#{billListView.bills}" var="bill" 
 		<p:dataTable styleClass="bordertable" id="billList" value="#{billListView.bills}" var="bill" 
@@ -17,7 +23,7 @@
 		
 		
 			<p:column rendered="#{billListView.canWriteBill}">
 			<p:column rendered="#{billListView.canWriteBill}">
 				<f:facet name="header">
 				<f:facet name="header">
-					<h:outputText value="${i18n['bill.payer']}" />
+					<h:outputText value="#{i18n['bill.payer']}" />
 				</f:facet>
 				</f:facet>
 				<h:link rendered="#{billListView.canWriteBill}" outcome="/useradmin/edit" value="#{bill.addr1}">
 				<h:link rendered="#{billListView.canWriteBill}" outcome="/useradmin/edit" value="#{bill.addr1}">
 					<f:param name="userid" value="#{bill.user.user.id}" />
 					<f:param name="userid" value="#{bill.user.user.id}" />
@@ -71,7 +77,7 @@
 				</h:link>
 				</h:link>
 			</p:column>
 			</p:column>
 			<p:column rendered="#{billListView.canWriteBill}">
 			<p:column rendered="#{billListView.canWriteBill}">
-				<h:commandButton rendered="#{bill.paidDate == null}" action="#{billListView.markPaid()}" value="#{i18n['bill.markPaid']}">
+				<h:commandButton rendered="#{bill.paidDate == null}" styleClass="markPaidButton" action="#{billListView.markPaid()}" value="#{i18n['bill.markPaid']}">
 					<f:ajax render="@form" />
 					<f:ajax render="@form" />
 				</h:commandButton>
 				</h:commandButton>
 				<h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" />
 				<h:outputText rendered="#{bill.paidDate != null}" value="#{i18n['bill.isPaid']}" />
@@ -81,6 +87,12 @@
 
 
 	</h:form>
 	</h:form>
 
 
+<script type="text/javascript">
+	function showMarkPaidButtons() {
+		$(".markPaidButton").removeAttr('disabled');
+	}
+	$(".markPaidButton").attr('disabled', 'disabled');
+</script>
 
 
 
 
 </composite:implementation>
 </composite:implementation>

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -16,12 +16,13 @@ actionlog.tasklist.header         = Tasklist
 actionlog.time                    = Time
 actionlog.time                    = Time
 actionlog.user                    = User
 actionlog.user                    = User
 
 
-bill.billAmount = Amount
-bill.billNumber = Number
-bill.cancel     = Cancel bill
-bill.expires    = Expires
-bill.isExpired  = Bill is expired
-bill.save       = Save
+bill.billAmount    = Amount
+bill.billNumber    = Number
+bill.cancel        = Cancel bill
+bill.expires       = Expires
+bill.isExpired     = Bill is expired
+bill.markPaid.show = Show Mark paid -buttons
+bill.save          = Save
 
 
 bortalApplication.BILL                      = Creating, and managing bills
 bortalApplication.BILL                      = Creating, and managing bills
 bortalApplication.COMPO                     = Managing compos
 bortalApplication.COMPO                     = Managing compos

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -68,6 +68,7 @@ bill.expires              = Expires
 bill.isExpired            = Bill is expired
 bill.isExpired            = Bill is expired
 bill.isPaid               = Paid
 bill.isPaid               = Paid
 bill.markPaid             = Mark paid
 bill.markPaid             = Mark paid
+bill.markPaid.show        = Show Mark paid -buttons
 bill.markedPaid           = Bill marked paid
 bill.markedPaid           = Bill marked paid
 bill.notes                = Notes
 bill.notes                = Notes
 bill.noticetime           = Notice time
 bill.noticetime           = Notice time

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -70,6 +70,7 @@ bill.expires                    = Vanhentuu
 bill.isExpired                  = Lasku on vanhentunut
 bill.isExpired                  = Lasku on vanhentunut
 bill.isPaid                     = Maksettu
 bill.isPaid                     = Maksettu
 bill.markPaid                   = Maksettu
 bill.markPaid                   = Maksettu
+bill.markPaid.show              = N\u00E4yt\u00E4 Maksettu -napit
 bill.markedPaid                 = Lasku merkitty maksetuksi.
 bill.markedPaid                 = Lasku merkitty maksetuksi.
 bill.notes                      = Huomioita
 bill.notes                      = Huomioita
 bill.noticetime                 = Huomautusaika
 bill.noticetime                 = Huomautusaika