From fbde6abf0987e92005cc39dbf4dd9a59c3b7414c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 23 Mar 2018 17:07:45 +0530 Subject: [PATCH] batch changes done --- Apollo/assets/js/controllers/feesStatusCtrl.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index c0dbb35a..5eb8ae52 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -745,8 +745,20 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $rootScope.updateMoreItems=[]; if($scope.feesStructureInfo[0].InstallmentDetails == '') { - $scope.setModel.feesType.BatchCode = $scope.feesStructureInfo[0].batchDetails[0].BatchCode; - $scope.BatchDate = new Date($scope.feesStructureInfo[0].batchDetails[0].BatchDate.substring(6,10)+'-'+$scope.feesStructureInfo[0].batchDetails[0].BatchDate.substring(3,5)+'-'+$scope.feesStructureInfo[0].batchDetails[0].BatchDate.substring(0,2)); + + $scope.obj = $scope.feesStructureInfo[0].batchDetails.find(x => x.IsDefault == true); + if($scope.obj==undefined || $scope.obj=='' || $scope.obj==null){ + $scope.setModel.feesType.BatchCode = $scope.feesStructureInfo[0].batchDetails[0].BatchCode; + $scope.BatchDate = new Date($scope.feesStructureInfo[0].batchDetails[0].BatchDate.substring(6,10)+'-'+$scope.feesStructureInfo[0].batchDetails[0].BatchDate.substring(3,5)+'-'+$scope.feesStructureInfo[0].batchDetails[0].BatchDate.substring(0,2)); + + } + else{ + + $scope.setModel.feesType.BatchCode = $scope.obj.BatchCode; + $scope.BatchDate = new Date($scope.obj.BatchDate.substring(6,10)+'-'+$scope.obj.BatchDate.substring(3,5)+'-'+$scope.obj.BatchDate.substring(0,2)); + + + } $scope.calculateInstallemnts($scope.feesStructureInfo[0],$scope.setTotalAmount,0,'1');