diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 17874d2a..de8fd070 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -831,12 +831,16 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n "feesType": $scope.feesStructureInfo[0], }; angular.forEach($scope.feesStructureInfo[0].batchDetails,function (values,key) { + var parts = values.BatchDate.split("-"); $scope.BatchDetails.push({ "BatchCode":values.BatchCode, "BatchName":values.BatchName + '('+ values.BatchCode + ')', - "BatchDate":values.BatchDate + "BatchDate":values.BatchDate, + "givenDateObject":new Date(parts[2], parts[1] - 1, parts[0]) }) }); + // call service for make a list in desc order based on date + $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails); $scope.setTotalAmount=$scope.feesStructureInfo[0].PayableFees; $rootScope.updateMoreItems=[]; @@ -1063,12 +1067,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.BatchDetails=[]; $rootScope.updateMoreItems=[]; angular.forEach(model.batchDetails,function (values,key) { + var parts1 = values.BatchDate.split("-"); $scope.BatchDetails.push({ "BatchCode":values.BatchCode, "BatchName":values.BatchName + '('+ values.BatchCode + ')', - "BatchDate":values.BatchDate - }) + "BatchDate":values.BatchDate, + "givenDateObject":new Date(parts1[2], parts1[1] - 1, parts1[0]) + + }) }); + $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails); + if(model.InstallmentDetails != ''){ /*$scope.myModelInstallemt.ID=model.InstallmentDetails[model.InstallmentDetails.length-1].ID;