From 6fd0fdffe22ba80b61fb72cef341f27f31f8a257 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 6 Oct 2018 16:45:56 +0530
Subject: [PATCH] pl report excel

---
 .../js/controllers/income_reportCtrl.js       | 70 ++++++-------------
 1 file changed, 22 insertions(+), 48 deletions(-)

diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js
index f6e42942..7b52fb0b 100644
--- a/Apollo/assets/js/controllers/income_reportCtrl.js
+++ b/Apollo/assets/js/controllers/income_reportCtrl.js
@@ -109,6 +109,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
             $scope.nonopexptotal='';
             $scope.Net_Total = '';
             $scope.PLexceldetails='';
+            $scope.expense ='';
             
 
 
@@ -244,10 +245,6 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
 
            });
 
-           // console.log($scope.opinctotal)
-
-           //  console.log($scope.opexptotal)
-
           angular.forEach(($scope.nonopdetails),function(nonopdetails,key)
            {
 
@@ -267,27 +264,11 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
 
            });
 
-          // console.log($scope.nonopinctotal)
-          //console.log($scope.nonopexptotal)
-
-
+         
  $scope.Net_Total = (parseFloat($scope.opinctotal)+parseFloat($scope.nonopinctotal))-
 
  (parseFloat($scope.opexptotal)+parseFloat($scope.nonopexptotal) );
 
-//console.log($scope.Net_Total)
-
-// console.log($scope.Total_income)
-
-// console.log($scope.nonopinctotal)
-
-// console.log($scope.Total_expense)
-
-// console.log($scope.nonopexptotal)
-
-
-
-
           
         } 
         else 
@@ -298,6 +279,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
             });  
 
 
+    
+
 
 
          var getsubdivision = {
@@ -369,12 +352,6 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
 
             }); 
 
-
-
-
-    
-
-
     }
 
 
@@ -397,33 +374,30 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
 
 
 
-        $scope.Newexcel={
-           // "OperationalIncome":"",
-           // "NonOperationalIncome":"",
-           // "OperationalExpense":"",
-           // "NonOperationalExpense":"",
-           
-        };
-        
-        
-       // $scope.Newexcel=[];
+
+ 
         
         $scope.exportData = function () 
         {
-            //alert()
+            // angular.forEach(($scope.PLexceldetails),function(PLexceldetails,key)
+            //  {
+
+            //      console.log(PLexceldetails.Name)
+
+            //  });
             
+//return false;
 
-            $scope.Newexcel.OperationalIncome=$scope.opinctotal;
-            $scope.Newexcel.NonOperationalIncome=$scope.nonopinctotal;
-            $scope.Newexcel.OperationalExpense=$scope.opexptotal;
-            $scope.Newexcel.NonOperationalExpense=$scope.nonopexptotal;
-           
+             $scope.grandTot = 
+             {
+                      
+                NonOperationalExpense:"Grand Total",
+                ListName: $scope.Net_Total
+              }
+        
+      $scope.expense = $scope.PLexceldetails.concat($scope.grandTot);
 
-         //console.log($scope.Newexcel);
-         //return false;
-
-//console.log($scope.fullincomedetail);
-           alasql('SELECT ListName as Type,Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense  INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.PLexceldetails]);
+           alasql('SELECT Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense,ListName as Type INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]);
 
         };