remove need for undo resource - align undo of state transitions with state transitions allowing for note to be added through ui.

mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/global-translations/messages.properties

@@ -115,16 +115,13 @@ validation.msg.loan.repayment.must.be.greater.than.zero=The repayment amount mus
 validation.msg.loan.adjustment.must.be.zero.or.greater=The repayment amount must be a number greater than or equal to zero.
 
 # loan event and transactions screens
+label.loan.on=On:
 label.loan.action.note=Note:
 dialog.title.reject.loan=Reject loan
-label.loan.rejected.on=Rejected on:
 dialog.title.loan.withdrawn.by.client=Withdrawn by client
-label.loan.withdrawn.by.client.on=Withdrawn on:
 dialog.title.approve.loan=Approve loan
-label.loan.approved.on=Approved on:
 dialog.title.undo.loan.approval=Undo loan approval: confirmation required
 dialog.title.disburse.loan=Disburse loan
-label.loan.disbursed.on=Disbursed on:
 dialog.title.undo.loan.disbursal=Undo loan disbursal: confirmation required
 dialog.title.loan.repayment=Loan repayment
 dialog.title.adjust.loan.repayment=Adjust loan repayment

mifosng-individual-lending-app/src/main/webapp/WEB-INF/static/global-translations/messages_fr.properties

@@ -114,16 +114,13 @@ validation.msg.loan.repayment.must.be.greater.than.zero=The repayment amount mus
 validation.msg.loan.adjustment.must.be.zero.or.greater=The repayment amount must be a number greater than or equal to zero.(fr)
 
 # loan event and transactions screens
+label.loan.on=On:(fr)
 label.loan.action.note=Note:(fr)
 dialog.title.reject.loan=Reject loan(fr)
-label.loan.rejected.on=Rejected on:(fr)
 dialog.title.loan.withdrawn.by.client=Withdrawn by client(fr)
-label.loan.withdrawn.by.client.on=Withdrawn on:(fr)
 dialog.title.approve.loan=Approve loan(fr)
-label.loan.approved.on=Approved on:(fr)
 dialog.title.undo.loan.approval=Undo loan approval: confirmation required(fr)
 dialog.title.disburse.loan=Disburse loan(fr)
-label.loan.disbursed.on=Disbursed on:(fr)
 dialog.title.undo.loan.disbursal=Undo loan disbursal: confirmation required(fr)
 dialog.title.loan.repayment=Loan repayment(fr)
 dialog.title.adjust.loan.repayment=Adjust loan repayment(fr)

mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp

@@ -240,7 +240,6 @@ $(document).ready(function() {
 					  contentType: 'application/json',
 					  dataType: 'json',
 					  beforeSend: function(xhr) {
-							console.log("base64: " + base64);
 				            xhr.setRequestHeader("Authorization", "Basic " + base64);
 					  },
 					  success: function(data, textStatus, jqXHR) {
@@ -594,8 +593,21 @@ $(document).ready(function() {
 					});
 					$('button.approveloan span').text(jQuery.i18n.prop('dialog.button.approve.loan'));
 					
-					$('.deleteloan').button().click(function(e) {
+					$('.undoapproveloan').button().click(function(e) {
 						
+						var linkId = this.id;
+						var loanId = linkId.replace("undoapprovebtn", "");
+						var postUrl = baseApiUrl + 'loans/' + loanId + '?command=undoapproval';
+						var templateSelector = "#undoStateTransitionLoanFormTemplate";
+						var width = 500; 
+						var height = 350;
+						var defaultOffset = offsetToSubmittedDate;
+						popupDialogWithPostOnlyFormView(postUrl, 'dialog.title.undo.loan.approval', templateSelector, width, height, currentTabIndex, offsetToSubmittedDate, defaultOffset, maxOffset)
+					    e.preventDefault();
+					});
+					$('button.undoapproveloan span').text(jQuery.i18n.prop('dialog.button.undo.loan.approval'));
+					
+					$('.deleteloan').button().click(function(e) {
 						var linkId = this.id;
 						var loanId = linkId.replace("deletebtn", "");
 						var url = baseApiUrl + 'loans/' + loanId;
@@ -609,30 +621,6 @@ $(document).ready(function() {
 					});
 					$('button.deleteloan span').text(jQuery.i18n.prop('dialog.button.delete.loan'));
 					
-					$('.undoapproveloan').button().click(function(e) {
-						
-						var linkId = this.id;
-						var loanId = linkId.replace("undoapprovebtn", "");
-						var postUrl = baseApiUrl + 'loans/' + loanId + '/undo?command=undoapproval';
-						var width = 400; 
-						var height = 225;
-						popupConfirmationDialogAndPost(postUrl, 'POST', 'dialog.title.undo.loan.approval', width, height, currentTabIndex);
-					    e.preventDefault();
-					});
-					$('button.undoapproveloan span').text(jQuery.i18n.prop('dialog.button.undo.loan.approval'));
-					
-					$('.undodisbursalloan').button().click(function(e) {
-						
-						var linkId = this.id;
-						var loanId = linkId.replace("undodisbursalbtn", "");
-						var postUrl = baseApiUrl + 'loans/' + loanId + '/undo?command=undodisbursal';
-						var width = 400; 
-						var height = 150;
-						popupConfirmationDialogAndPost(postUrl, 'POST', 'dialog.title.undo.loan.disbursal', width, height, currentTabIndex);
-					    e.preventDefault();
-					});
-					$('button.undodisbursalloan span').text(jQuery.i18n.prop('dialog.button.undo.loan.disbursal'));
-					
 					$('.disburseloan').button().click(function(e) {
 						
 						var linkId = this.id;
@@ -647,6 +635,20 @@ $(document).ready(function() {
 					});
 					$('button.disburseloan span').text(jQuery.i18n.prop('dialog.button.disburse.loan'));
 					
+					$('.undodisbursalloan').button().click(function(e) {
+						
+						var linkId = this.id;
+						var loanId = linkId.replace("undodisbursalbtn", "");
+						var postUrl = baseApiUrl + 'loans/' + loanId + '?command=undodisbursal';
+						var templateSelector = "#undoStateTransitionLoanFormTemplate";
+						var width = 500; 
+						var height = 350;
+						var defaultOffset = offsetToApprovalDate;
+						popupDialogWithPostOnlyFormView(postUrl, 'dialog.title.undo.loan.disbursal', templateSelector, width, height, currentTabIndex, offsetToSubmittedDate, defaultOffset, maxOffset)
+					    e.preventDefault();
+					});
+					$('button.undodisbursalloan span').text(jQuery.i18n.prop('dialog.button.undo.loan.disbursal'));
+					
 					$('.repaymentloan').button().click(function(e) {
 						
 						var linkId = this.id;

mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp

@@ -804,7 +804,7 @@
     <div id="formerrors"></div>
 
 	<input type="hidden" id="dateFormat" name="dateFormat" value="dd MMMM yyyy" />
-	<label for="eventDateFormatted"><spring:message code="label.loan.rejected.on"/></label>
+	<label for="eventDateFormatted"><spring:message code="label.loan.on"/></label>
 	<input id="eventDateFormatted" name="eventDateFormatted" title="" class="datepickerfield" />
 
 	<label for="comment"><spring:message code="label.loan.action.note"/></label>
@@ -812,6 +812,15 @@
 </form>
 </script>
 
+<script id="undoStateTransitionLoanFormTemplate" type="text/x-jquery-tmpl">
+<form id="entityform">
+    <div id="formerrors"></div>
+
+	<label for="comment"><spring:message code="label.loan.action.note"/></label>
+	<textarea rows="6" cols="53" id="comment" name="comment"></textarea>
+</form>
+</script>
+
 <script id="transactionLoanFormTemplate" type="text/x-jquery-tmpl">
 <form id="entityform">
     <div id="formerrors"></div>