Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

profit loss format change

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-08-08 13:44:48 +05:30
parent a96838cb52
commit b1e9f8b1d9
3 changed files with 242 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Apollo/assets/js/controllers/income_reportCtrl.js
View File

@ -50,7 +50,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
// } // }
// }); // });
// } // }
//$scope.opinctotal='';
$scope.onSubmit = function () { $scope.onSubmit = function () {
@ -65,6 +65,10 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.isLoaderShow = ''; $scope.isLoaderShow = '';
$scope.fromda = ''; $scope.fromda = '';
$scope.toda =''; $scope.toda ='';
$scope.opinctotal='';
$scope.nonopinctotal='';
$scope.opexptotal='';
$scope.nonopexptotal='';
var response_data = { var response_data = {
@ -102,7 +106,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.load = "No Records Found"; $scope.load = "No Records Found";
} }
console.log($scope.expense_data); //console.log($scope.expense_data);
if(($scope.expense_data.length)==2) if(($scope.expense_data.length)==2)
{ {
@ -179,6 +183,47 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.incomedetail = response.data; $scope.incomedetail = response.data;
$scope.fullincomedetail = response.data.fullexpense_detail; $scope.fullincomedetail = response.data.fullexpense_detail;
console.log($scope.fullincomedetail); 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.fdate ='';
$scope.tdate =''; $scope.tdate ='';
//$scope.Subtypes = ''; //$scope.Subtypes = '';
@ -348,12 +403,21 @@ var Total_exp = 0;
// console.log(incomeexpensedetails); // console.log(incomeexpensedetails);
// console.log(Subtypes); // console.log(Subtypes);
// $scope.opinctotal =0;
// $scope.nonopinctotal =0;
// $scope.opexptotal = 0;
// $scope.nonopexptotal =0;
$rootScope.income_expendelist = incomeexpenselist; $rootScope.income_expendelist = incomeexpenselist;
$rootScope.income_expensedetails = incomeexpensedetails; $rootScope.income_expensedetails = incomeexpensedetails;
$rootScope.listdetails = Subtypes; $rootScope.listdetails = Subtypes;
$rootScope.fdate = $scope.fdate; $rootScope.fdate = $scope.fdate;
$rootScope.tdate = $scope.tdate $rootScope.tdate = $scope.tdate
$rootScope.net_totalamount = $scope.Net_Total; $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 = incomeexpenselist[1].Total - incomeexpenselist[0].Total;
$rootScope.sum = Total_inc -Total_exp; $rootScope.sum = Total_inc -Total_exp;

90
Apollo/assets/views/income_expense_report.html
View File

@ -183,35 +183,13 @@
<!--- operating Income end --> <!--- operating Income end -->
<!--NON operating Income -->
<div class="col-md-12">
<div class="col-md-3"><b>
<label style="color: black; font-size: 15px">Non Operating Income</label></b>
</div>
<!-- <div ng-repeat="f in fullincomedetail" ng-if="f.OrgType =='I004' || f.OrgType=='I005' ||f.OrgType=='I006' || f.OrgType=='I003'"> -->
<div class="col-md-12" ng-repeat="li in fullincomedetail " ng-if="li.Name=='I002' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003' )">
<!-- {{li.ListName }} -->
<div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div>
</div>
</div>
<!-- </div> -->
</div>
<!-- NON operating income end-->
<!--Total --> <!--Total -->
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"><b> <div class="col-md-6"><b>
<label style="color: black; font-size: 17px">Total Income</label></b> <label style="color: black; font-size: 17px">Total Operational Income</label></b>
</div> </div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" ng-repeat="de in expense_data" ng-if="de.TID=='I002'" > <div class="col-md-offset-10">
{{de.Total}} {{opinctotal}}
</div> </div>
</div> </div>
<!--Total End --> <!--Total End -->
@ -230,9 +208,10 @@
<!-- <div ng-repeat="f in fullincomedetail" ng-if="f.OrgType =='I001'"> --> <!-- <div ng-repeat="f in fullincomedetail" ng-if="f.OrgType =='I001'"> -->
<div class="col-md-12" ng-repeat="li in fullincomedetail " ng-if="li.Name=='I001' && li.OrgType == 'I001'"> <div class="col-md-12" ng-repeat="li in fullincomedetail " ng-if="li.Name=='I001' && li.OrgType == 'I001'">
<!-- {{li.ListName }} --> <!-- {{li.ListName }} -->
<div id="test" class="pad"> <div id="test" class="pad" ng-init="totaladd();">
<div id="a" class="fif">{{li.TypeName}}</div> <div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div> <div id="b" class="right">{{li.Total}}</div>
</div> </div>
</div> </div>
@ -243,6 +222,54 @@
<!-- Expense Completed--> <!-- Expense Completed-->
<!--Total -->
<div class="col-md-12">
<div class="col-md-6"><b>
<label style="color: black; font-size: 17px">Total Operational Expense</label></b>
</div>
<div class="col-md-offset-10">
{{opexptotal}}
</div>
</div>
<!--Total End -->
<!--NON operating Income -->
<div class="col-md-12">
<div class="col-md-3"><b>
<label style="color: black; font-size: 15px">Non Operating Income</label></b>
</div>
<div class="col-md-12" ng-repeat="li in fullincomedetail " ng-if="li.Name=='I002' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003' )">
<div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div>
</div>
</div>
</div>
<!-- NON operating income end-->
<!--Total -->
<div class="col-md-12">
<div class="col-md-6"><b>
<label style="color: black; font-size: 17px">Total Non-Operational Income</label></b>
</div>
<div class="col-md-offset-10">
{{nonopinctotal}}
</div>
</div>
<!--Total End -->
<!-- non operating expense --> <!-- non operating expense -->
@ -265,20 +292,23 @@
</div> </div>
<!-- Non operating expense end -->
<!--Total --> <!--Total -->
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"><b> <div class="col-md-6"><b>
<label style="color: black; font-size: 17px">Total Expense</label></b> <label style="color: black; font-size: 17px">Total Non-Operational Expense</label></b>
</div> </div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" ng-repeat="de in expense_data" ng-if="de.TID=='I001'" > <div class="col-md-offset-10">
{{de.Total}} {{nonopexptotal}}
</div> </div>
</div> </div>
<!--Total End --> <!--Total End -->
<!--Net Profit start --> <!--Net Profit start -->
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"><b> <div class="col-md-6"><b>

150
Apollo/assets/views/income_expense_report_pdf.html
View File

@ -86,39 +86,15 @@
<!--- operating Income end --> <!--- operating Income end -->
<div class="col-md-12">
<div class="col-md-12"><b>
<label style="color: black; font-size: 12px">Non Operating Income</label></b>
</div>
<!-- <div ng-repeat="f in fullincomedetail" ng-if="f.OrgType =='I004' || f.OrgType=='I005' ||f.OrgType=='I006' || f.OrgType=='I003'"> -->
<div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I002' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003')">
<!-- {{li.ListName }} -->
<div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div>
</div>
</div>
<!-- </div> -->
</div>
<!--Total -->
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"><b> <div class="col-md-6"><b>
<label style="color: black; font-size: 15px">Total Income</label></b> <label style="color: black; font-size: 15px">Total Operational Income</label></b>
</div> </div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" ng-repeat="de in income_expendelist" ng-if="de.TID=='I002'" > <div class="col-md-offset-10" style="color: black; font-size: 17px" >
{{de.Total}} {{opeinctot}}
</div> </div>
</div> </div>
<!--Total End -->
@ -129,24 +105,55 @@
<label style="color: black; font-size: 12px">Operating Expense</label></b> <label style="color: black; font-size: 12px">Operating Expense</label></b>
</div> </div>
<!-- <div ng-repeat="f in income_expensedetails" ng-if="f.OrgType =='I001'"> -->
<div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I001' && li.OrgType == 'I001'"> <div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I001' && li.OrgType == 'I001'">
<!-- {{li.ListName }} -->
<div id="test" class="pad"> <div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div> <div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div> <div id="b" class="right">{{li.Total}}</div>
</div> </div>
</div> </div>
<!-- </div> -->
</div> </div>
<!-- Expense Completed--> <!-- Expense Completed-->
<div class="col-md-12">
<div class="col-md-6"><b>
<label style="color: black; font-size: 15px">Total Operational Expense</label></b>
</div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" >
{{opeexptot}}
</div>
</div>
<div class="col-md-12">
<div class="col-md-12"><b>
<label style="color: black; font-size: 12px">Non Operating Income</label></b>
</div>
<div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I002' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003')">
<div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6"><b>
<label style="color: black; font-size: 15px">Total NonOperational Income</label></b>
</div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" >
{{nonopeinctot}}
</div>
</div>
<!-- non operating expense -->
<div class="col-md-12"> <div class="col-md-12">
@ -154,30 +161,95 @@
<label style="color: black; font-size: 12px">Non Operating Expense</label></b> <label style="color: black; font-size: 12px">Non Operating Expense</label></b>
</div> </div>
<!-- <div ng-repeat="f in fullincomedetail" ng-if="f.OrgType =='I004' || f.OrgType=='I005' ||f.OrgType=='I006' || f.OrgType =='I003'"> -->
<div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I001' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003' )"> <div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I001' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003' )">
<!-- {{li.ListName }} -->
<div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6"><b>
<label style="color: black; font-size: 15px">Total NonOperational Expense</label></b>
</div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" >
{{nonopexptot}}
</div>
</div>
<!--Total -->
<!-- <div class="col-md-12">
<div class="col-md-6"><b>
<label style="color: black; font-size: 15px">Total Income</label></b>
</div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" ng-repeat="de in income_expendelist" ng-if="de.TID=='I002'" >
{{de.Total}}
</div>
</div> -->
<!--Total End -->
<!--Expense Part -->
<!-- <div class="col-md-12">
<div class="col-md-12"><b>
<label style="color: black; font-size: 12px">Operating Expense</label></b>
</div>
<div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I001' && li.OrgType == 'I001'">
<div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div>
</div>
</div>
</div> -->
<!-- Expense Completed-->
<!-- non operating expense -->
<!-- <div class="col-md-12">
<div class="col-md-12"><b>
<label style="color: black; font-size: 12px">Non Operating Expense</label></b>
</div>
<div class="col-md-12" ng-repeat="li in income_expensedetails " ng-if="li.Name=='I001' && (li.OrgType == 'I004' || li.OrgType=='I005' ||li.OrgType=='I006' || li.OrgType=='I003' )">
<div id="test" class="pad"> <div id="test" class="pad">
<div id="a" class="fif">{{li.TypeName}}</div> <div id="a" class="fif">{{li.TypeName}}</div>
<div id="b" class="right">{{li.Total}}</div> <div id="b" class="right">{{li.Total}}</div>
</div> </div>
</div> </div>
<!-- </div> -->
</div> </div>
-->
<!-- Non operating expense end --> <!-- Non operating expense end -->
<!--Total --> <!--Total -->
<div class="col-md-12"> <!-- <div class="col-md-12">
<div class="col-md-6"><b> <div class="col-md-6"><b>
<label style="color: black; font-size: 15px">Total Expense</label></b> <label style="color: black; font-size: 15px">Total Expense</label></b>
</div> </div>
<div class="col-md-offset-10" style="color: black; font-size: 17px" ng-repeat="de in income_expendelist" ng-if="de.TID=='I001'" > <div class="col-md-offset-10" style="color: black; font-size: 17px" ng-repeat="de in income_expendelist" ng-if="de.TID=='I001'" >
{{de.Total}} {{de.Total}}
</div> </div>
</div> </div> -->
<!--Total End --> <!--Total End -->
<br/> <br/>