From 5c350b7c6fb100bf8c376d4f890558bbcc8fcd43 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Sep 2015 16:31:14 +0530 Subject: [PATCH] Mifosx 1523 - GUI for Loan Rescheduling --- .../ApproveLoanRescheduleRequestController.js | 4 ++-- .../PreviewLoanRepaymentScheduleController.js | 10 +++++----- .../RejectLoanRescheduleRequestController.js | 4 ++-- .../loanAccount/RescheduleLoansRequestController.js | 2 +- .../loanAccount/ViewRescheduleRequestController.js | 10 +++++----- app/scripts/routes.js | 8 ++++---- app/scripts/services/ResourceFactoryProvider.js | 5 ++--- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/scripts/controllers/loanAccount/ApproveLoanRescheduleRequestController.js b/app/scripts/controllers/loanAccount/ApproveLoanRescheduleRequestController.js index 98576d5b..5a98c153 100644 --- a/app/scripts/controllers/loanAccount/ApproveLoanRescheduleRequestController.js +++ b/app/scripts/controllers/loanAccount/ApproveLoanRescheduleRequestController.js @@ -6,14 +6,14 @@ scope.requestId = routeParams.requestId; scope.cancel = function () { - location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'); + location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'+scope.requestId); }; scope.approve = function(){ this.formData.dateFormat = scope.df; this.formData.locale = scope.optlang.code; this.formData.approvedOnDate = dateFilter(this.formData.approvedOnDate, scope.df); - resourceFactory.loanRescheduleResource.approve({loanId:scope.loanId},this.formData,function (data) { + resourceFactory.loanRescheduleResource.approve({scheduleId:scope.requestId},this.formData,function (data) { location.path('/viewloanaccount/' + scope.loanId); }); }; diff --git a/app/scripts/controllers/loanAccount/PreviewLoanRepaymentScheduleController.js b/app/scripts/controllers/loanAccount/PreviewLoanRepaymentScheduleController.js index cca18669..e288e378 100644 --- a/app/scripts/controllers/loanAccount/PreviewLoanRepaymentScheduleController.js +++ b/app/scripts/controllers/loanAccount/PreviewLoanRepaymentScheduleController.js @@ -5,18 +5,18 @@ scope.loanId = routeParams.loanId; scope.data = {}; - resourceFactory.loanRescheduleResource.preview({loanId:scope.loanId}, function (data) { - scope.data = data.rescheduledRepaymentSchedule; + resourceFactory.loanRescheduleResource.preview({scheduleId:scope.requestId}, function (data) { + scope.data = data; }); scope.reject = function(){ - location.path('/loans/' + scope.loanId + '/rejectreschedulerequest/'); + location.path('/loans/' + scope.loanId + '/rejectreschedulerequest/'+scope.requestId); }; scope.approve = function(){ - location.path('/loans/' + scope.loanId + '/approvereschedulerequest/'); + location.path('/loans/' + scope.loanId + '/approvereschedulerequest/'+scope.requestId); }; scope.back = function () { - location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'); + location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'+scope.requestId); }; } }); diff --git a/app/scripts/controllers/loanAccount/RejectLoanRescheduleRequestController.js b/app/scripts/controllers/loanAccount/RejectLoanRescheduleRequestController.js index 6d4f84a1..346209e7 100644 --- a/app/scripts/controllers/loanAccount/RejectLoanRescheduleRequestController.js +++ b/app/scripts/controllers/loanAccount/RejectLoanRescheduleRequestController.js @@ -6,14 +6,14 @@ scope.requestId = routeParams.requestId; scope.cancel = function () { - location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'); + location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'+scope.requestId); }; scope.reject = function(){ this.formData.dateFormat = scope.df; this.formData.locale = scope.optlang.code; this.formData.rejectedOnDate = dateFilter(this.formData.rejectedOnDate, scope.df); - resourceFactory.loanRescheduleResource.reject({loanId:scope.loanId},this.formData,function (data) { + resourceFactory.loanRescheduleResource.reject({scheduleId:scope.requestId},this.formData,function (data) { location.path('/viewloanaccount/' + scope.loanId); }); }; diff --git a/app/scripts/controllers/loanAccount/RescheduleLoansRequestController.js b/app/scripts/controllers/loanAccount/RescheduleLoansRequestController.js index d27d1ecc..5555b4df 100644 --- a/app/scripts/controllers/loanAccount/RescheduleLoansRequestController.js +++ b/app/scripts/controllers/loanAccount/RescheduleLoansRequestController.js @@ -26,7 +26,7 @@ this.formData.rescheduleReasonComment = scope.comments; resourceFactory.loanRescheduleResource.put(this.formData, function (data) { scope.requestId = data.resourceId; - location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'); + location.path('/loans/' + scope.loanId + '/viewreschedulerequest/'+ data.resourceId); }); }; diff --git a/app/scripts/controllers/loanAccount/ViewRescheduleRequestController.js b/app/scripts/controllers/loanAccount/ViewRescheduleRequestController.js index 1148cdb9..db9580a4 100644 --- a/app/scripts/controllers/loanAccount/ViewRescheduleRequestController.js +++ b/app/scripts/controllers/loanAccount/ViewRescheduleRequestController.js @@ -4,8 +4,8 @@ scope.requestId = routeParams.requestId; scope.loanId = routeParams.loanId; - resourceFactory.loanRescheduleResource.get({loanId:scope.loanId}, function (data) { - scope.loanRescheduleDetails = data.rescheduleRequest; + resourceFactory.loanRescheduleResource.get({scheduleId:scope.requestId}, function (data) { + scope.loanRescheduleDetails = data; scope.rescheduleFromDate = new Date(scope.loanRescheduleDetails.rescheduleFromDate); scope.rescheduleFromDate = dateFilter(scope.rescheduleFromDate,"dd MMMM yyyy"); scope.submittedOnDate = new Date(scope.loanRescheduleDetails.timeline.submittedOnDate); @@ -30,10 +30,10 @@ }); scope.reject = function(){ - location.path('/loans/' + scope.loanId + '/rejectreschedulerequest/'); + location.path('/loans/' + scope.loanId + '/rejectreschedulerequest/'+scope.requestId); }; scope.approve = function(){ - location.path('/loans/' + scope.loanId + '/approvereschedulerequest/'); + location.path('/loans/' + scope.loanId + '/approvereschedulerequest/'+scope.requestId); }; scope.cancel = function () { @@ -41,7 +41,7 @@ }; scope.submit = function () { - location.path('/loans/' + scope.loanId + '/previewloanrepaymentschedule/'); + location.path('/loans/' + scope.loanId + '/previewloanrepaymentschedule/'+scope.requestId); }; } diff --git a/app/scripts/routes.js b/app/scripts/routes.js index bd4fe0b4..c4a2fe98 100755 --- a/app/scripts/routes.js +++ b/app/scripts/routes.js @@ -763,16 +763,16 @@ .when('/loans/:loanId/reschedule/', { templateUrl: 'views/loans/rescheduleloans.html' }) - .when('/loans/:loanId/viewreschedulerequest/', { + .when('/loans/:loanId/viewreschedulerequest/:requestId', { templateUrl: 'views/loans/viewreschedulerequest.html' }) - .when('/loans/:loanId/approvereschedulerequest/', { + .when('/loans/:loanId/approvereschedulerequest/:requestId', { templateUrl: 'views/loans/approveloanreschedule.html' }) - .when('/loans/:loanId/rejectreschedulerequest/', { + .when('/loans/:loanId/rejectreschedulerequest/:requestId', { templateUrl: 'views/loans/rejectloanreschedule.html' }) - .when('/loans/:loanId/previewloanrepaymentschedule/', { + .when('/loans/:loanId/previewloanrepaymentschedule/:requestId', { templateUrl: 'views/loans/previewloanrepaymentschedule.html' }); $locationProvider.html5Mode(false); diff --git a/app/scripts/services/ResourceFactoryProvider.js b/app/scripts/services/ResourceFactoryProvider.js index c8b955d2..142da262 100755 --- a/app/scripts/services/ResourceFactoryProvider.js +++ b/app/scripts/services/ResourceFactoryProvider.js @@ -420,9 +420,8 @@ template: {method: 'GET',params:{}}, preview:{method:'GET',params:{command:'previewLoanReschedule'}}, put: {method: 'POST', params: {command:'reschedule'}}, - reject:{method:'POST',params:{command:'rejectRescheduleRequest'}}, - approve:{method:'POST',params:{command:'approveRescheduleRequest'}}, - preview:{method:'GET',params:{associations:'rescheduledRepaymentSchedule'}} + reject:{method:'POST',params:{command:'reject'}}, + approve:{method:'POST',params:{command:'approve'}}, }), auditResource: defineResource(apiVer + "/audits/:templateResource", {templateResource: '@templateResource'}, { get: {method: 'GET', params: {}},