diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 1511a7e0..9dac148e 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -50,7 +50,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", // } // }); // } - +//$scope.opinctotal=''; $scope.onSubmit = function () { @@ -65,6 +65,10 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.isLoaderShow = ''; $scope.fromda = ''; $scope.toda =''; + $scope.opinctotal=''; + $scope.nonopinctotal=''; + $scope.opexptotal=''; + $scope.nonopexptotal=''; var response_data = { @@ -102,7 +106,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.load = "No Records Found"; } - console.log($scope.expense_data); + //console.log($scope.expense_data); if(($scope.expense_data.length)==2) { @@ -179,6 +183,47 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.incomedetail = response.data; $scope.fullincomedetail = response.data.fullexpense_detail; console.log($scope.fullincomedetail); + $scope.opinctotal =0; + $scope.nonopinctotal =0; + $scope.opexptotal = 0; + $scope.nonopexptotal =0; + angular.forEach(($scope.fullincomedetail),function(fullincomedetail,key) + { + //console.log('in') + + if((fullincomedetail.Name == 'I002')&&(fullincomedetail.OrgType=='I002')) + { + $scope.opinctotal = parseFloat(fullincomedetail.Total)+parseFloat($scope.opinctotal); + + + } + + if((fullincomedetail.Name == 'I002')&&((fullincomedetail.OrgType=='I003')||(fullincomedetail.OrgType=='I004') + ||(fullincomedetail.OrgType=='I005')||(fullincomedetail.OrgType=='I006'))) + { + $scope.nonopinctotal = parseFloat(fullincomedetail.Total)+parseFloat($scope.nonopinctotal); + + + } + + + if((fullincomedetail.Name == 'I001')&&(fullincomedetail.OrgType=='I001')) + { + $scope.opexptotal = parseFloat(fullincomedetail.Total)+parseFloat($scope.opexptotal); + + } + + if((fullincomedetail.Name == 'I001')&&((fullincomedetail.OrgType=='I003')||(fullincomedetail.OrgType=='I004') + ||(fullincomedetail.OrgType=='I005')||(fullincomedetail.OrgType=='I006'))) + { + $scope.nonopexptotal = parseFloat(fullincomedetail.Total)+parseFloat($scope.nonopexptotal); + + + } + + }); + + } @@ -296,6 +341,16 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", } + +// $scope.to=0; +// $scope.totaladd = function() +// { +// $scope.fullincomedetail + +// to + +// } + $scope.fdate =''; $scope.tdate =''; //$scope.Subtypes = ''; @@ -348,12 +403,21 @@ var Total_exp = 0; // console.log(incomeexpensedetails); // console.log(Subtypes); + // $scope.opinctotal =0; + // $scope.nonopinctotal =0; + // $scope.opexptotal = 0; + // $scope.nonopexptotal =0; + $rootScope.income_expendelist = incomeexpenselist; $rootScope.income_expensedetails = incomeexpensedetails; $rootScope.listdetails = Subtypes; $rootScope.fdate = $scope.fdate; $rootScope.tdate = $scope.tdate $rootScope.net_totalamount = $scope.Net_Total; + $rootScope.opeinctot = $scope.opinctotal; + $rootScope.nonopeinctot = $scope.nonopinctotal; + $rootScope.opeexptot = $scope.opexptotal; + $rootScope.nonopexptot = $scope.nonopexptotal; //$rootScope.sum = incomeexpenselist[1].Total - incomeexpenselist[0].Total; $rootScope.sum = Total_inc -Total_exp; diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index 89cb4f9b..2a04b8c9 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -182,36 +182,14 @@ - - -
- -
- -
- - -
- -
-
{{li.TypeName}}
-
{{li.Total}}
-
-
- - - -
- - - +
- +
-
- {{de.Total}} +
+ {{opinctotal}}
@@ -230,9 +208,10 @@
-
+
{{li.TypeName}}
{{li.Total}}
+
@@ -240,7 +219,55 @@
- + + + + +
+
+ +
+
+ {{opexptotal}} +
+
+ + + + + + + + +
+ +
+ +
+ +
+ +
+
{{li.TypeName}}
+
{{li.Total}}
+
+
+
+ + + + + + +
+
+ +
+
+ {{nonopinctotal}} +
+
+ @@ -265,18 +292,21 @@
- - + +
- +
-
- {{de.Total}} +
+ {{nonopexptotal}}
- + + + + diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index 4566146d..2ccaf556 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -86,39 +86,15 @@ -
-
- -
- - -
- -
-
{{li.TypeName}}
-
{{li.Total}}
-
-
- - - -
- - - - -
- +
-
- {{de.Total}} +
+ {{opeinctot}}
- - @@ -129,24 +105,55 @@
-
- +
{{li.TypeName}}
{{li.Total}}
-
- - - +
+
+
+ +
+
+ {{opeexptot}} +
+
+ + + +
+ +
+ +
+
+ +
+
{{li.TypeName}}
+
{{li.Total}}
+
+
+
+ + + +
+
+ +
+
+ {{nonopeinctot}} +
+
+ -
@@ -154,30 +161,95 @@
-
- + +
+
{{li.TypeName}}
+
{{li.Total}}
+
+
+ + + + +
+
+ +
+
+ {{nonopexptot}} +
+
+ + + + + + + + + + + + + + + + + + + + + + + - + --> -
+