From bf7783fc9483616325b3d21014ea7e71040268ec Mon Sep 17 00:00:00 2001
From: Keith Woodlock <keithwoodlock@gmail.com>
Date: Wed, 16 May 2012 01:42:54 +0100
Subject: [PATCH] move functionality around new loan application to loan
 resource.

---
 .../data/NewLoanWorkflowStepOneData.java      |  49 ++++++++
 .../org/mifosng/ui/CommonRestOperations.java  |   5 -
 .../mifosng/ui/CommonRestOperationsImpl.java  |  44 -------
 .../ApplicationPagesRoutesController.java     |  18 +++
 .../org/mifosng/ui/loan/LoanController.java   |  32 -----
 .../views/client/viewClientAccount.jsp        |   1 +
 .../WEB-INF/views/newloanapplication.jsp      | 113 +++++++++++-------
 .../webapp/WEB-INF/views/view-templates.jsp   |   9 +-
 .../mifosng/platform/ReadPlatformService.java |   3 -
 .../platform/ReadPlatformServiceImpl.java     |  54 ---------
 .../platform/api/LoansApiResource.java        |  13 ++
 .../loan/service/LoanReadPlatformService.java |   3 +
 .../service/LoanReadPlatformServiceImpl.java  |  62 +++++++++-
 .../mifosng/platform/rest/LoanResource.java   |  48 --------
 14 files changed, 218 insertions(+), 236 deletions(-)

diff --git a/mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java b/mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java
index 162abe705..6fc0cbbd7 100644
--- a/mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java
+++ b/mifosng-data/src/main/java/org/mifosng/data/NewLoanWorkflowStepOneData.java
@@ -21,12 +21,18 @@ public class NewLoanWorkflowStepOneData implements Serializable {
 	private List<LoanProductData> allowedProducts = new ArrayList<LoanProductData>();
 	
 	// extra
+	private String dateFormat;
+	private String submittedOnDateFormatted;
 	private LocalDate submittedOnDate;
 	private String submittedOnNote = "";
 	
+	private String expectedDisbursementDateFormatted;
 	private LocalDate expectedDisbursementDate = new LocalDate();
+	
+	private String repaymentsStartingFromDateFormatted;
 	private LocalDate repaymentsStartingFromDate;
 	
+	private String interestCalculatedFromDateFormatted;
 	private LocalDate interestCalculatedFromDate;
 	
 	private LoanSchedule repaymentSchedule;
@@ -148,4 +154,47 @@ public class NewLoanWorkflowStepOneData implements Serializable {
 	public void setRepaymentSchedule(LoanSchedule repaymentSchedule) {
 		this.repaymentSchedule = repaymentSchedule;
 	}
+
+	public String getDateFormat() {
+		return dateFormat;
+	}
+
+	public void setDateFormat(String dateFormat) {
+		this.dateFormat = dateFormat;
+	}
+
+	public String getSubmittedOnDateFormatted() {
+		return submittedOnDateFormatted;
+	}
+
+	public void setSubmittedOnDateFormatted(String submittedOnDateFormatted) {
+		this.submittedOnDateFormatted = submittedOnDateFormatted;
+	}
+
+	public String getExpectedDisbursementDateFormatted() {
+		return expectedDisbursementDateFormatted;
+	}
+
+	public void setExpectedDisbursementDateFormatted(
+			String expectedDisbursementDateFormatted) {
+		this.expectedDisbursementDateFormatted = expectedDisbursementDateFormatted;
+	}
+
+	public String getRepaymentsStartingFromDateFormatted() {
+		return repaymentsStartingFromDateFormatted;
+	}
+
+	public void setRepaymentsStartingFromDateFormatted(
+			String repaymentsStartingFromDateFormatted) {
+		this.repaymentsStartingFromDateFormatted = repaymentsStartingFromDateFormatted;
+	}
+
+	public String getInterestCalculatedFromDateFormatted() {
+		return interestCalculatedFromDateFormatted;
+	}
+
+	public void setInterestCalculatedFromDateFormatted(
+			String interestCalculatedFromDateFormatted) {
+		this.interestCalculatedFromDateFormatted = interestCalculatedFromDateFormatted;
+	}
 }
\ No newline at end of file
diff --git a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperations.java b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperations.java
index b718b4b0a..5f6efe356 100644
--- a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperations.java
+++ b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperations.java
@@ -6,7 +6,6 @@ import org.mifosng.data.EntityIdentifier;
 import org.mifosng.data.LoanProductData;
 import org.mifosng.data.LoanRepaymentData;
 import org.mifosng.data.LoanSchedule;
-import org.mifosng.data.NewLoanWorkflowStepOneData;
 import org.mifosng.data.command.AdjustLoanTransactionCommand;
 import org.mifosng.data.command.CalculateLoanScheduleCommand;
 import org.mifosng.data.command.LoanStateTransitionCommand;
@@ -26,8 +25,6 @@ public interface CommonRestOperations {
 
 	LoanSchedule calculateLoanSchedule(CalculateLoanScheduleCommand command);
 
-	NewLoanWorkflowStepOneData retrieveNewLoanApplicationStepOneDetails(Long clientId);
-
 	Long submitLoanApplication(SubmitLoanApplicationCommand command);
 
 	EntityIdentifier deleteLoan(Long loanId);
@@ -55,6 +52,4 @@ public interface CommonRestOperations {
 	LoanRepaymentData retrieveNewLoanWaiverDetails(Long loanId);
 
 	EntityIdentifier waiveLoanAmount(LoanTransactionCommand command);
-
-	NewLoanWorkflowStepOneData retrieveNewLoanApplicationDetails(Long clientId, Long productId);
 }
\ No newline at end of file
diff --git a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperationsImpl.java b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperationsImpl.java
index 2077f147d..4e4267a85 100644
--- a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperationsImpl.java
+++ b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/CommonRestOperationsImpl.java
@@ -14,7 +14,6 @@ import org.mifosng.data.LoanProductData;
 import org.mifosng.data.LoanProductList;
 import org.mifosng.data.LoanRepaymentData;
 import org.mifosng.data.LoanSchedule;
-import org.mifosng.data.NewLoanWorkflowStepOneData;
 import org.mifosng.data.command.AdjustLoanTransactionCommand;
 import org.mifosng.data.command.CalculateLoanScheduleCommand;
 import org.mifosng.data.command.LoanStateTransitionCommand;
@@ -138,49 +137,6 @@ public class CommonRestOperationsImpl implements CommonRestOperations {
 		}
 	}
 
-	@Override
-	public NewLoanWorkflowStepOneData retrieveNewLoanApplicationStepOneDetails(
-			final Long clientId) {
-		try {
-			URI restUri = URI.create(getBaseServerUrl().concat(
-					"api/protected/loan/new/" + clientId.toString()
-							+ "/workflow/one"));
-
-			ResponseEntity<NewLoanWorkflowStepOneData> s = this.oauthRestServiceTemplate
-					.exchange(restUri, HttpMethod.GET, emptyRequest(),
-							NewLoanWorkflowStepOneData.class);
-
-			// for now ensure user must select product on step one (even if
-			// there is only one product!)
-			NewLoanWorkflowStepOneData data = s.getBody();
-			data.setProductId(null);
-
-			return s.getBody();
-		} catch (HttpStatusCodeException e) {
-			ErrorResponseList errorList = parseErrors(e);
-			throw new ClientValidationException(errorList.getErrors());
-		}
-	}
-
-	@Override
-	public NewLoanWorkflowStepOneData retrieveNewLoanApplicationDetails(
-			Long clientId, Long productId) {
-		try {
-			URI restUri = URI.create(getBaseServerUrl().concat(
-					"api/protected/loan/new/" + clientId.toString()
-							+ "/product/" + productId.toString()));
-
-			ResponseEntity<NewLoanWorkflowStepOneData> s = this.oauthRestServiceTemplate
-					.exchange(restUri, HttpMethod.GET, emptyRequest(),
-							NewLoanWorkflowStepOneData.class);
-
-			return s.getBody();
-		} catch (HttpStatusCodeException e) {
-			ErrorResponseList errorList = parseErrors(e);
-			throw new ClientValidationException(errorList.getErrors());
-		}
-	}
-
 	@Override
 	public Long submitLoanApplication(final SubmitLoanApplicationCommand command) {
 		try {
diff --git a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/admin/ApplicationPagesRoutesController.java b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/admin/ApplicationPagesRoutesController.java
index a0c61f39a..2c737c157 100644
--- a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/admin/ApplicationPagesRoutesController.java
+++ b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/admin/ApplicationPagesRoutesController.java
@@ -1,8 +1,12 @@
 package org.mifosng.ui.admin;
 
+import java.security.Principal;
+
+import org.mifosng.oauth.ConsumerUserDetails;
 import org.mifosng.ui.reporting.ReportingRestOperations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -71,4 +75,18 @@ public class ApplicationPagesRoutesController {
 	public String userSettingsScreen() {
 		return "admin/accountsettings";
 	}
+	
+	@RequestMapping(value = "/portfolio/client/{clientId}/loan/new", method = RequestMethod.GET)
+	public String loadLoanCreationWorkflow(final Model model, @PathVariable("clientId") final Long clientId, final Principal principal) {
+		
+		UsernamePasswordAuthenticationToken authenticationToken = (UsernamePasswordAuthenticationToken) principal;
+    	ConsumerUserDetails user =  (ConsumerUserDetails) authenticationToken.getPrincipal();
+    	if (user.hasNoAuthorityToSumitLoanApplication()) {
+    		throw new AccessDeniedException("");
+    	}
+		
+		model.addAttribute("clientId", clientId);
+		
+		return "newloanapplication";
+	}
 }
\ No newline at end of file
diff --git a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/loan/LoanController.java b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/loan/LoanController.java
index 34aa6dec8..8bd49369e 100644
--- a/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/loan/LoanController.java
+++ b/mifosng-individual-lending-app/src/main/java/org/mifosng/ui/loan/LoanController.java
@@ -1,7 +1,6 @@
 package org.mifosng.ui.loan;
 
 import java.math.BigDecimal;
-import java.security.Principal;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -17,20 +16,15 @@ import org.joda.time.format.DateTimeFormat;
 import org.mifosng.data.EntityIdentifier;
 import org.mifosng.data.ErrorResponse;
 import org.mifosng.data.LoanSchedule;
-import org.mifosng.data.NewLoanWorkflowStepOneData;
 import org.mifosng.data.command.CalculateLoanScheduleCommand;
 import org.mifosng.data.command.SubmitLoanApplicationCommand;
-import org.mifosng.oauth.ConsumerUserDetails;
 import org.mifosng.ui.CommonRestOperations;
 import org.mifosng.ui.loanproduct.ClientValidationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -97,20 +91,6 @@ public class LoanController {
 		}
 	}
 	
-	@RequestMapping(value = "/portfolio/client/{clientId}/loan/new", method = RequestMethod.GET)
-	public String loadLoanCreationWorkflow(final Model model, @PathVariable("clientId") final Long clientId, final Principal principal) {
-		
-		UsernamePasswordAuthenticationToken authenticationToken = (UsernamePasswordAuthenticationToken) principal;
-    	ConsumerUserDetails user =  (ConsumerUserDetails) authenticationToken.getPrincipal();
-    	if (user.hasNoAuthorityToSumitLoanApplication()) {
-    		throw new AccessDeniedException("");
-    	}
-		
-		model.addAttribute("clientId", clientId);
-		
-		return "newloanapplication";
-	}
-	
 	@RequestMapping(consumes="application/x-www-form-urlencoded", produces="application/json", value = "/portfolio/client/{clientId}/loan/new", method = RequestMethod.POST)
 	public @ResponseBody EntityIdentifier submitNewLoanApplication(
 					@RequestParam(value="clientId", required=false) Long applicantId,
@@ -196,16 +176,4 @@ public class LoanController {
 		
 		return this.commonRestOperations.calculateLoanSchedule(command);
 	}
-	
-	@RequestMapping(consumes="application/json", produces="application/json", value = "/portfolio/client/{clientId}/product/{productId}/new", method = RequestMethod.GET)
-	public @ResponseBody NewLoanWorkflowStepOneData retrieveNewLoan(@PathVariable("clientId") Long clientId, @PathVariable("productId") Long productId) {
-
-		return this.commonRestOperations.retrieveNewLoanApplicationDetails(clientId, productId);
-	}
-	
-	@RequestMapping(consumes="application/json", produces="application/json", value = "/portfolio/client/{clientId}/loan/new/workflow/one", method = RequestMethod.GET)
-	public @ResponseBody NewLoanWorkflowStepOneData retrieveNewLoan(@PathVariable("clientId") Long clientId) {
-
-		return this.commonRestOperations.retrieveNewLoanApplicationStepOneDetails(clientId);
-	}
 }
\ No newline at end of file
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
index 561698151..91fadb97e 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/client/viewClientAccount.jsp
@@ -461,6 +461,7 @@ $(document).ready(function() {
 					$('.newloanbtn').button().click(function(e) {
 						var linkId = this.id;
 						var clientId = linkId.replace("newloanbtn", "");
+						// switch to jsp page focussed on new loan application flow.
 						var url = '${rootContext}portfolio/client/' + clientId + '/loan/new';
 						window.location.href = url;
 					    e.preventDefault();
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp
index 47d771947..df8090c32 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/newloanapplication.jsp
@@ -10,11 +10,10 @@
 <head>
 <jsp:include page="common-head.jsp" />
 <c:url value="/" var="rootContext" />
-<c:url value="/portfolio/client/${clientId}/loan/new/workflow/one" var="newLoanUrl" />
 <script>
 $(document).ready(function() {
 
-	$.views.registerHelpers({
+$.views.registerHelpers({
 		
 		money: function(monetaryObj) {
 			
@@ -31,19 +30,19 @@ $(document).ready(function() {
 			return Globalize.format(monetaryObj.amount, "c" + digits); 
 		},
 		decimal: function(number, digits) {
-		      try {
-		    	return Globalize.format(number, "n" + digits); 
-		      } catch(e) {
-		        return number +"(NaN)";
-		      }
-		},
+	      try {
+	    	return Globalize.format(number, "n" + digits); 
+	      } catch(e) {
+	        return number +"(NaN)";
+	      }
+	    },
 		number: function(number) {
-		      try {
-		    	  return Globalize.format(number, "n0"); 
-		      } catch(e) {
-		        return number +"(NaN)";
-		      }
-		},
+	      try {
+	    	  return Globalize.format(number, "n0"); 
+	      } catch(e) {
+	        return number +"(NaN)";
+	      }
+	    },
 	    numberGreaterThanZero: function(number) {
 		      try {
 		    	var num = number.toFixed(0);
@@ -52,40 +51,33 @@ $(document).ready(function() {
 		        return false;
 		      }
 		},
-		globalDate: function(dateParts) {
+		globalDate: function(localDateAsISOString) {
 		      try {
-		    	  if (dateParts === null) {
-		    		  return "";
-		    	  } else {
-			    	  var year = dateParts[0];
-			    	  var month = parseInt(dateParts[1]) - 1; // month is zero indexed
-			    	  var day = dateParts[2];
-			    	  
-			    	  var d = new Date();
-			    	  d.setFullYear(year,month,day);
-			    	  
-			    	  return Globalize.format(d,"dd MMMM yyyy");
-		    	  }
+		    	  if (localDateAsISOString === null) return "";
+		    	  var dateParts = localDateAsISOString.split("-")
+		    	  var year = dateParts[0];
+		    	  var month = parseInt(dateParts[1]) - 1; // month is zero indexed
+		    	  var day = dateParts[2];
+		    	  
+		    	  var d = new Date();
+		    	  d.setFullYear(year,month,day);
+		    	  
+		    	  return Globalize.format(d,"dd MMMM yyyy");
 		      } catch(e) {
 		        return "??";
 		      }
 		},
-		globalDateTime: function(dateParts) {
+		globalDateTime: function(dateInMillis) {
 		      try {
-		    	  if (dateParts === null) {
-		    		  return "";
-		    	  } else {
-		    		  var d = new Date(dateParts);
-			    	  
-			    	  return Globalize.format(d,"F");
-		    	  }
+		    	  var d = new Date(dateInMillis);
+		    	  
+		    	  return Globalize.format(d,"F");
 		      } catch(e) {
 		        return "??";
 		      }
 		}
-		
 	});
-
+	
 	function removeErrors(placeholderDiv) {
 		// remove error class from all input fields
 		var $inputs = $('#entityform :input');
@@ -119,17 +111,25 @@ $(document).ready(function() {
 			removeErrors(placeholderDiv);
 			
 		  	var jsonErrors = JSON.parse(jqXHR.responseText);
-		  	
+		  	var valErrors = jsonErrors.errors;
 		  	var errorArray = new Array();
 		  	var arrayIndex = 0;
-		  	$.each(jsonErrors, function() {
-		  	  var fieldId = '#' + this.field;
+		  	$.each(valErrors, function() {
+		  	  var fieldId = '#' + this.parameterName;
 		  	  $(fieldId).addClass("ui-state-error");
 		  	  
 		  	  var errorObj = new Object();
-		  	  errorObj.field = this.field;
-		  	  errorObj.code = this.code;
-		  	  errorObj.message = jQuery.i18n.prop(this.code, this.args);
+		  	  errorObj.field = this.parameterName;
+		  	  errorObj.code = this.userMessageGlobalisationCode;
+		  	  
+		  	  var argArray = new Array();
+		  	  var argArrayIndex = 0;
+		  	  $.each(this.args, function() {
+		  		argArray[argArrayIndex] = this.value;
+		  		argArrayIndex++;
+		  	  });
+		  	  // hardcoded support for six arguments
+		  	  errorObj.message = jQuery.i18n.prop(this.userMessageGlobalisationCode, argArray[0], argArray[1], argArray[2], argArray[3], argArray[4], argArray[5]);
 		  	  errorObj.value = this.value;
 		  	  
 		  	  errorArray[arrayIndex] = errorObj;
@@ -149,6 +149,29 @@ $(document).ready(function() {
 		}
 	}
 	
+	$.fn.serializeObject = function()
+	{
+	    var o = {};
+	    var a = this.serializeArray();
+	    $.each(a, function() {
+	        if (o[this.name] !== undefined) {
+	            if (!o[this.name].push) {
+	                o[this.name] = [o[this.name]];
+	            }
+	            o[this.name].push(this.value || '');
+	        } else {
+	        	
+	        	if (this.name === 'selectedItems' || this.name === 'notSelectedItems') {
+	        		o[this.name] = new Array();
+	        		o[this.name].push(this.value || '');
+	        	} else {
+	        		o[this.name] = this.value || '';	
+	        	}
+	        }
+	    });
+	    return o;
+	};
+	
 	function calculateAnnualPercentageRate() {
 		var periodInterestRate = parseFloat($('#nominalInterestRate').val());
 		if (isNaN(periodInterestRate)) {
@@ -171,7 +194,7 @@ $(document).ready(function() {
 	
 	function repopulateFullForm(clientId, productId) {
 		
-		var url = '${rootContext}portfolio/client/' + clientId + '/product/' + productId + '/new';
+		var url = 'http://localhost:8080/mifosng-provider/api/v1/loans/template?clientId=' + clientId + '&productId=' + productId;
 		
 		var jqxhr = $.ajax({
 			url: url,
@@ -312,7 +335,7 @@ $(document).ready(function() {
 	
 	
 	var jqxhr = $.ajax({
-		url: '${newLoanUrl}',
+		url: 'http://localhost:8080/mifosng-provider/api/v1/loans/template?clientId=${clientId}',
 		type: 'GET',
 		contentType: 'application/json',
 		dataType: 'json',
diff --git a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp
index afd5dd14b..57659b09c 100644
--- a/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp
+++ b/mifosng-individual-lending-app/src/main/webapp/WEB-INF/views/view-templates.jsp
@@ -83,8 +83,9 @@
 					</td>
 					<td style="text-align:right;vertical-align:bottom;width:50px;">&nbsp;</td>
 					<td valign="top">
-						<label for="submittedOnDate"><spring:message code="form.label.loan.submitted.on"/></label>
-						<input id="submittedOnDate" name="submittedOnDate" title="" type="text" class="datepickerfield" value="{{=$ctx.globalDate(submittedOnDate)}}" />
+						<input type="hidden" id="dateFormat" name="dateFormat" value="dd MMMM yyyy" />
+						<label for="submittedOnDateFormatted"><spring:message code="form.label.loan.submitted.on"/></label>
+						<input id="submittedOnDateFormatted" name="submittedOnDateFormatted" title="" type="text" class="datepickerfield" value="{{=$ctx.globalDate(submittedOnDate)}}" />
 
 						<label for="submittedOnNote"><spring:message code="form.label.loan.submitted.on.note"/></label>
 						<textarea id="submittedOnNote" name="submittedOnNote" rows="2" cols="50" draggable="false">{{=submittedOnNote}}</textarea>
@@ -131,13 +132,13 @@
 						<tr>
 							<td><spring:message code="form.label.loan.expected.disbursement.date.on"/></td>
 							<td>
-							<input id="expectedDisbursementDate" name="expectedDisbursementDate" title="" type="text" class="datepickerfield" value="{{=$ctx.globalDate(expectedDisbursementDate)}}" style="width:172px;"/>
+							<input id="expectedDisbursementDateFormatted" name="expectedDisbursementDateFormatted" title="" type="text" class="datepickerfield" value="{{=$ctx.globalDate(expectedDisbursementDate)}}" style="width:172px;"/>
 							</td>
 						</tr>
 						<tr>
 							<td><spring:message code="form.label.loan.first.repayment.on"/></td>
 							<td>
-							<input id="repaymentsStartingFromDate" name="repaymentsStartingFromDate" title="" type="text" class="datepickerfield" value="{{=$ctx.globalDate(repaymentsStartingFromDate)}}" style="width:172px;"/>
+							<input id="repaymentsStartingFromDateFormatted" name="repaymentsStartingFromDateFormatted" title="" type="text" class="datepickerfield" value="{{=$ctx.globalDate(repaymentsStartingFromDate)}}" style="width:172px;"/>
 							</td>
 						</tr>
 					</table>
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformService.java
index 5a6fbce27..ff009223c 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformService.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformService.java
@@ -3,15 +3,12 @@ package org.mifosng.platform;
 import java.util.Collection;
 
 import org.mifosng.data.LoanRepaymentData;
-import org.mifosng.data.NewLoanWorkflowStepOneData;
 import org.mifosng.data.OrganisationReadModel;
 
 public interface ReadPlatformService {
 
 	Collection<OrganisationReadModel> retrieveAll();
 
-	NewLoanWorkflowStepOneData retrieveClientAndProductDetails(Long clientId, Long productId);
-
 	LoanRepaymentData retrieveNewLoanRepaymentDetails(Long loanId);
 
 	LoanRepaymentData retrieveNewLoanWaiverDetails(Long loanId);
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java
index 6f4c6d68b..74b5c587f 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/ReadPlatformServiceImpl.java
@@ -196,58 +196,4 @@ public class ReadPlatformServiceImpl implements ReadPlatformService {
 
 		return loanRepaymentData;
 	}
-
-	@Override
-	public NewLoanWorkflowStepOneData retrieveClientAndProductDetails(
-			final Long clientId, final Long productId) {
-
-		AppUser currentUser = extractAuthenticatedUser();
-
-		NewLoanWorkflowStepOneData workflowData = new NewLoanWorkflowStepOneData();
-		workflowData.setOrganisationId(currentUser.getOrganisation().getId());
-		workflowData.setOrganisationName(currentUser.getOrganisation()
-				.getName());
-
-		Collection<LoanProductData> loanProducts = this.loanProductReadPlatformService
-				.retrieveAllLoanProducts();
-		workflowData.setAllowedProducts(new ArrayList<LoanProductData>(
-				loanProducts));
-
-		if (loanProducts.size() == 1) {
-			LoanProductData selectedProduct = this.loanProductReadPlatformService
-					.retrieveLoanProduct(workflowData.getAllowedProducts()
-							.get(0).getId());
-
-			workflowData.setProductId(selectedProduct.getId());
-			workflowData.setProductName(selectedProduct.getName());
-			workflowData.setSelectedProduct(selectedProduct);
-		} else {
-			LoanProductData selectedProduct = findLoanProductById(loanProducts,
-					productId);
-
-			workflowData.setProductId(selectedProduct.getId());
-			workflowData.setProductName(selectedProduct.getName());
-			workflowData.setSelectedProduct(selectedProduct);
-		}
-
-		ClientData clientAccount = this.clientReadPlatformService.retrieveIndividualClient(clientId);
-		workflowData.setClientId(clientAccount.getId());
-		workflowData.setClientName(clientAccount.getDisplayName());
-
-		return workflowData;
-	}
-
-	private LoanProductData findLoanProductById(
-			Collection<LoanProductData> loanProducts, Long productId) {
-		LoanProductData match = this.loanProductReadPlatformService
-				.retrieveNewLoanProductDetails();
-		for (LoanProductData loanProductData : loanProducts) {
-			if (loanProductData.getId().equals(productId)) {
-				match = this.loanProductReadPlatformService
-						.retrieveLoanProduct(loanProductData.getId());
-				break;
-			}
-		}
-		return match;
-	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
index 2c38c7170..4bd8cc516 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
@@ -5,10 +5,12 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.mifosng.data.LoanAccountData;
+import org.mifosng.data.NewLoanWorkflowStepOneData;
 import org.mifosng.platform.ReadPlatformService;
 import org.mifosng.platform.loan.service.LoanReadPlatformService;
 import org.mifosng.platform.user.domain.AppUser;
@@ -43,6 +45,17 @@ public class LoansApiResource {
 		context.setAuthentication(auth);
 	}
 	
+	@GET
+	@Path("template")
+	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+	@Produces({ MediaType.APPLICATION_JSON})
+	public Response retrieveDetailsForNewLoanApplicationStepOne(@QueryParam("clientId") final Long clientId, @QueryParam("productId") final Long productId) {
+
+		NewLoanWorkflowStepOneData workflowData = this.loanReadPlatformService.retrieveClientAndProductDetails(clientId, productId);
+
+		return Response.ok().entity(workflowData).build();
+	}
+	
 	@GET
 	@Path("{loanId}")
 	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java
index 189be73c5..5e7de73fb 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformService.java
@@ -1,8 +1,11 @@
 package org.mifosng.platform.loan.service;
 
 import org.mifosng.data.LoanAccountData;
+import org.mifosng.data.NewLoanWorkflowStepOneData;
 
 public interface LoanReadPlatformService {
 
 	LoanAccountData retrieveLoanAccountDetails(Long loanId);
+	
+	NewLoanWorkflowStepOneData retrieveClientAndProductDetails(Long clientId, Long productId);
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java
index 1509cac64..80a8627b6 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java
@@ -2,18 +2,26 @@ package org.mifosng.platform.loan.service;
 
 import static org.mifosng.platform.Specifications.loansThatMatch;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import javax.sql.DataSource;
 
 import org.joda.time.LocalDate;
+import org.mifosng.data.ClientData;
 import org.mifosng.data.CurrencyData;
 import org.mifosng.data.DerivedLoanData;
 import org.mifosng.data.LoanAccountData;
+import org.mifosng.data.LoanProductData;
 import org.mifosng.data.MoneyData;
+import org.mifosng.data.NewLoanWorkflowStepOneData;
+import org.mifosng.platform.client.service.ClientReadPlatformService;
 import org.mifosng.platform.currency.domain.ApplicationCurrency;
 import org.mifosng.platform.currency.domain.ApplicationCurrencyRepository;
 import org.mifosng.platform.currency.domain.Money;
 import org.mifosng.platform.loan.domain.Loan;
 import org.mifosng.platform.loan.domain.LoanRepository;
+import org.mifosng.platform.loanproduct.service.LoanProductReadPlatformService;
 import org.mifosng.platform.security.PlatformSecurityContext;
 import org.mifosng.platform.user.domain.AppUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,13 +35,18 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
 	private final PlatformSecurityContext context;
 	private final LoanRepository loanRepository;
 	private final ApplicationCurrencyRepository applicationCurrencyRepository;
+	private final LoanProductReadPlatformService loanProductReadPlatformService;
+	private final ClientReadPlatformService clientReadPlatformService;
 
 	@Autowired
 	public LoanReadPlatformServiceImpl(final PlatformSecurityContext context, final DataSource dataSource, 
-			final LoanRepository loanRepository, final ApplicationCurrencyRepository applicationCurrencyRepository) {
+			final LoanRepository loanRepository, final ApplicationCurrencyRepository applicationCurrencyRepository, 
+			final LoanProductReadPlatformService loanProductReadPlatformService, final ClientReadPlatformService clientReadPlatformService) {
 		this.context = context;
 		this.loanRepository = loanRepository;
 		this.applicationCurrencyRepository = applicationCurrencyRepository;
+		this.loanProductReadPlatformService = loanProductReadPlatformService;
+		this.clientReadPlatformService = clientReadPlatformService;
 		this.jdbcTemplate = new SimpleJdbcTemplate(dataSource);
 	}
 	
@@ -145,4 +158,51 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
 				tolerance, loanData, waiveAllowed, interestRebateOwed);
 	}
 	
+	@Override
+	public NewLoanWorkflowStepOneData retrieveClientAndProductDetails(final Long clientId, final Long productId) {
+
+		AppUser currentUser = context.authenticatedUser();
+
+		NewLoanWorkflowStepOneData workflowData = new NewLoanWorkflowStepOneData();
+		workflowData.setOrganisationId(currentUser.getOrganisation().getId());
+		workflowData.setOrganisationName(currentUser.getOrganisation().getName());
+
+		Collection<LoanProductData> loanProducts = this.loanProductReadPlatformService.retrieveAllLoanProducts();
+		workflowData.setAllowedProducts(new ArrayList<LoanProductData>(loanProducts));
+
+		if (loanProducts.size() == 1) {
+			Long allowedProductId = workflowData.getAllowedProducts().get(0).getId();
+			LoanProductData selectedProduct = this.loanProductReadPlatformService.retrieveLoanProduct(allowedProductId);
+
+			workflowData.setProductId(selectedProduct.getId());
+			workflowData.setProductName(selectedProduct.getName());
+			workflowData.setSelectedProduct(selectedProduct);
+		} else {
+			LoanProductData selectedProduct = findLoanProductById(loanProducts, productId);
+
+			workflowData.setProductId(selectedProduct.getId());
+			workflowData.setProductName(selectedProduct.getName());
+			workflowData.setSelectedProduct(selectedProduct);
+		}
+
+		ClientData clientAccount = this.clientReadPlatformService.retrieveIndividualClient(clientId);
+		workflowData.setClientId(clientAccount.getId());
+		workflowData.setClientName(clientAccount.getDisplayName());
+
+		return workflowData;
+	}
+
+	private LoanProductData findLoanProductById(
+			Collection<LoanProductData> loanProducts, Long productId) {
+		LoanProductData match = this.loanProductReadPlatformService
+				.retrieveNewLoanProductDetails();
+		for (LoanProductData loanProductData : loanProducts) {
+			if (loanProductData.getId().equals(productId)) {
+				match = this.loanProductReadPlatformService
+						.retrieveLoanProduct(loanProductData.getId());
+				break;
+			}
+		}
+		return match;
+	}
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanResource.java
index 2943450c4..a4811812a 100644
--- a/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanResource.java
+++ b/mifosng-provider/src/main/java/org/mifosng/platform/rest/LoanResource.java
@@ -21,7 +21,6 @@ import org.mifosng.data.ErrorResponse;
 import org.mifosng.data.ErrorResponseList;
 import org.mifosng.data.LoanRepaymentData;
 import org.mifosng.data.LoanSchedule;
-import org.mifosng.data.NewLoanWorkflowStepOneData;
 import org.mifosng.data.command.AdjustLoanTransactionCommand;
 import org.mifosng.data.command.CalculateLoanScheduleCommand;
 import org.mifosng.data.command.LoanStateTransitionCommand;
@@ -56,56 +55,9 @@ public class LoanResource {
 	@Autowired
 	private ReadPlatformService readPlatformService;
 
-
 	@Autowired
 	private WritePlatformService writePlatformService;
 	
-	@GET
-	@Path("new/{clientId}/workflow/one")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	public Response retrieveDetailsForNewLoanApplicationStepOne(@PathParam("clientId") final Long clientId) {
-
-		try {
-			NewLoanWorkflowStepOneData workflowData = this.readPlatformService.retrieveClientAndProductDetails(clientId, null);
-
-			return Response.ok().entity(workflowData).build();
-		} catch (UnAuthenticatedUserException e) {
-			throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build());
-		} catch (AccessDeniedException e) {
-			ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id");
-			ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse));
-			throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build());
-		} catch (ApplicationDomainRuleException e) {
-			throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build());
-		} catch (NewDataValidationException e) {
-			throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build());
-		}
-	}
-	
-	@GET
-	@Path("new/{clientId}/product/{productId}")
-	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-	public Response retrieveDetailsForNewLoanApplicationStepOne(@PathParam("clientId") final Long clientId, @PathParam("productId") final Long productId) {
-
-		try {
-			NewLoanWorkflowStepOneData workflowData = this.readPlatformService.retrieveClientAndProductDetails(clientId, productId);
-
-			return Response.ok().entity(workflowData).build();
-		} catch (UnAuthenticatedUserException e) {
-			throw new WebApplicationException(Response.status(Status.UNAUTHORIZED).build());
-		} catch (AccessDeniedException e) {
-			ErrorResponse errorResponse = new ErrorResponse("error.msg.no.permission", "id");
-			ErrorResponseList list = new ErrorResponseList(Arrays.asList(errorResponse));
-			throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(list).build());
-		} catch (ApplicationDomainRuleException e) {
-			throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getErrors())).build());
-		} catch (NewDataValidationException e) {
-			throw new WebApplicationException(Response.status(Status.BAD_REQUEST).entity(new ErrorResponseList(e.getValidationErrors())).build());
-		}
-	}
-
 	@POST
 	@Path("calculate")
 	@Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })