diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 5eb8ae52..c19ade63 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -990,9 +990,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } else{ - $scope.setModel.feesType.BatchCode = $scope.BatchDetails[0].BatchCode; - $scope.BatchDate = new Date($scope.BatchDetails[0].BatchDate.substring(6,10)+'-'+$scope.BatchDetails[0].BatchDate.substring(3,5)+'-'+$scope.BatchDetails[0].BatchDate.substring(0,2)); + $scope.obj = model.batchDetails.find(x => x.IsDefault == true); + if($scope.obj==undefined || $scope.obj=='' || $scope.obj==null){ + $scope.setModel.feesType.BatchCode = $scope.BatchDetails[0].BatchCode; + + $scope.BatchDate = new Date($scope.BatchDetails[0].BatchDate.substring(6,10)+'-'+$scope.BatchDetails[0].BatchDate.substring(3,5)+'-'+$scope.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.myModelInstallemt.ID=""; $scope.myModelInstallemt.name="";