From 6f303c639a8aae6bba86bbe6740c56f68d9b2368 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 3 Aug 2018 16:49:36 +0530
Subject: [PATCH] income total

---
 .../js/controllers/income_reportCtrl.js       | 57 +++++++++++++++++--
 .../assets/views/income_expense_report.html   |  9 ++-
 .../views/income_expense_report_pdf.html      |  3 +-
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js
index 6a89b2e3..4913c900 100644
--- a/Apollo/assets/js/controllers/income_reportCtrl.js
+++ b/Apollo/assets/js/controllers/income_reportCtrl.js
@@ -59,6 +59,9 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
             $scope.message = '';
             $scope.incomedetail = '';
             $scope.Subtypes = '';
+            $scope.Total_expense = '';
+            $scope.Total_income = '';
+
            
             var response_data = {
                 method: 'POST',
@@ -76,14 +79,59 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
 
             $http(response_data).then(function (response) {
                 //console.log(response.data);
-                if (response.data.status == '200') {
+                if (response.data.status == '200') 
+    {
 
                     $scope.expense_data = response.data.expense_data;
-                console.log($scope.expense_data)
+
+                    console.log($scope.expense_data);
+      if(($scope.expense_data.length)==2)  
+    {          
+            
+        if($scope.expense_data[0].Total == 'undefined' || $scope.expense_data[0].Total ==  null)
+        {
+           $scope.Total_expense=0;
+        }
+        else
+        {
+            $scope.Total_expense = $scope.expense_data[0].Total;
+        }
+
+        if($scope.expense_data[1].Total == 'undefined' || $scope.expense_data[1].Total ==  null)
+        {
+            $scope.Total_income=0;
+        }
+        else
+        {
+            $scope.Total_income = $scope.expense_data[1].Total;
+        }
+
+    }
 
 
-                } else {
-                    $scope.message = response.data.message;
+    else
+    {  
+        if($scope.expense_data[0].TID == 'I002')
+        {
+           $scope.Total_income = $scope.expense_data[0].Total;
+           $scope.Total_expense = 0;
+
+        }
+
+        else
+        {
+          $scope.Total_expense = $scope.expense_data[0].Total;
+           $scope.Total_income = 0;
+        }
+      
+    }
+
+        $scope.Net_Total = $scope.Total_income -$scope.Total_expense;
+
+
+   } 
+   else {
+                $scope.message = response.data.message;
                 }
 
             });
@@ -286,6 +334,7 @@ var Total_exp = 0;
        $rootScope.listdetails = Subtypes;
        $rootScope.fdate = $scope.fdate;
        $rootScope.tdate = $scope.tdate
+       $rootScope.net_totalamount = $scope.Net_Total;
        //$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 f46ede82..ab9c2bb7 100644
--- a/Apollo/assets/views/income_expense_report.html
+++ b/Apollo/assets/views/income_expense_report.html
@@ -214,8 +214,9 @@
           <label style="color: black; font-size: 17px">Net Profit/Loss</label></b> 
         </div>
         <div class="col-md-offset-10" style="color: black; font-size: 17px"><b>
-          {{expense_data[1].Total - expense_data[0].Total}}
-
+         <!--  {{expense_data[1].Total - expense_data[0].Total}}
+ -->
+      {{Net_Total}}
         </b></div>
 
       </div>
@@ -224,6 +225,10 @@
     
        </div>
         </div> 
+
+<div ng-if="expense_data.length<=0">
+<b><h1 style="color:black;"><center> No Records Found</h1></center></b>
+</div>
         <dir-pagination-controls  direction-links="true" boundary-links="true">
         </dir-pagination-controls>
     </div>
diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html
index 06c84d16..4e857229 100644
--- a/Apollo/assets/views/income_expense_report_pdf.html
+++ b/Apollo/assets/views/income_expense_report_pdf.html
@@ -134,7 +134,8 @@
           <label style="color: black; font-size: 15px">Net Profit/Loss</label></b> 
         </div>
         <div class="col-md-offset-10" style="color: black; font-size: 15px"><b>
-          {{sum}}
+        <!--   {{sum}} -->
+        {{net_totalamount}}
 
         </b></div>