diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 7108913c..e6725fa5 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -319,6 +319,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n }); } + angular.forEach($rootScope.updateMoreItems, function (value, key) { + if(isNaN(value.DueDate)){ + + } + else{ + + $scope.convertGetDate2=new Date(value.DueDate).toDateString(); + $scope.pushDueDate2 = $filter('date')(new Date($scope.convertGetDate2), 'dd-MM-yyyy'); + $rootScope.updateMoreItems[key].DueDate=$scope.pushDueDate2; + } + }); $scope.ldloading5 = {}; @@ -448,9 +459,27 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n if (response.data.status==200 && response.data.feesStatus) { $scope.feesStructureInfo=response.data.feesDetails; $scope.setModel = { - "feesType": "", + "feesType": $scope.feesStructureInfo[0], }; + $scope.setTotalAmount=$scope.feesStructureInfo[0].PayableFees; + + $rootScope.updateMoreItems=[]; + + if($scope.feesStructureInfo[0].InstallmentDetails != ''){ + $scope.myModelInstallemt.ID=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].ID; + + $scope.myModelInstallemt.name=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].Name; + $scope.myModelInstallemt.amount=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].Amount; + $scope.myModelInstallemt.date=$scope.feesStructureInfo[0].InstallmentDetails[$scope.feesStructureInfo[0].InstallmentDetails.length-1].DueDate; + $rootScope.lastInstallemtDate = $scope.myModelInstallemt.date; + for(var i=0; i < $scope.feesStructureInfo[0].InstallmentDetails.length-1; i++){ + $rootScope.updateMoreItems.push($scope.feesStructureInfo[0].InstallmentDetails[i]); + + } + } + + } else { $scope.feesStructureInfo=""; @@ -508,7 +537,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } else { - if(isNaN(model.date)){ $scope.pushDueDate= $rootScope.lastInstallemtDate; }