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

pl report

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-06 14:39:06 +05:30
parent 75d95a35b6
commit 748e0dd33b
7 changed files with 196 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Apollo/api/application/controllers/DayBook_Controller.php
View File

@ -324,9 +324,17 @@ public function updateNonOperationalDetails_post() {
$reqData = $this->post('data');
$reqbyData = $this->post('localReqDetails');
//echo $reqData['type'].['ID'];die();
/// $typealone = json_decode($reqData['type']);
//print_r($typealone);die();
// echo $typealone->ID;die();
$req['Name'] = $reqData['name'];
$req['Type'] = $reqData['type'];
$req['Type'] = $reqData['type'];
//$req['Type'] = $typealone->ID;
$req['Amount'] = $reqData['amount'];
// $d = new DateTime($reqData['date']);
$req['Date'] = $reqData['date'];
@ -347,7 +355,32 @@ public function updateNonOperationalDetails_post() {
else
{
$req['Isdaybook']=0;
}
$non['Name'] = $reqData['name'];
$non['Type'] = $reqData['type'];
//$non['Type'] = $typealone->ID;
$non['Amount'] = $reqData['amount'];
// $d = new DateTime($reqData['date']);
$non['Date'] = $reqData['date'];
$non['Status'] = $reqData['status'];
$non['Description'] = $reqData['description'];
$non['BranchCode'] = $reqbyData['localBranchID'];
$non['CreatedBy'] = $reqbyData['localUserID'];
$non['PaidTo'] = $reqData['paidTo'];
$non['PaidDescription'] = $reqData['description_paid'];
$non['VoucherNumber'] = $reqData['voucherNumber'];
$date = date('Y-m-d H:i:s');
$non['CreatedOn'] = $date;
$non['Isdaybook'] = 0;
$this->daybook_model->add_NonOperational($non);
// print_r($req);exit();
$addDayBookDetails = $this->daybook_model->add_dayBook($req);// Check if the employee exist
if ($addDayBookDetails)
@ -389,6 +422,7 @@ public function updateNonOperationalDetails_post() {
$req['VoucherNumber'] = $reqData['voucherNumber'];
$date = date('Y-m-d H:i:s');
$req['CreatedOn'] = $date;
$req['Isdaybook']=1;
// print_r($req);exit();
$addDayBookDetails = $this->daybook_model->add_NonOperational($req);// Check if the employee exist
if ($addDayBookDetails)

82
Apollo/api/application/models/DayBook_model.php
View File

@ -911,10 +911,10 @@ class DayBook_model extends CI_Model
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID=q.Type
join T_PickListDetails on T_PickListDetails.ListCode = q.name
where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and q.IsActive=? and (q.Name=? or q.Name=?)
and Status !=? and q.BranchCode=? GROUP BY q.Name';
and Status !=? and q.BranchCode=? and q.Isdaybook=? GROUP BY q.Name';
$querynon = $this->db->query($subQueryNON,array($incomecode,$expensecode,$incomecode,$expensecode,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1','I001','I002','Cancel',$br));
$querynon = $this->db->query($subQueryNON,array($incomecode,$expensecode,$incomecode,$expensecode,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1','I001','I002','Cancel',$br,'1'));
$expensenon = $querynon->result();
if(count($querynon)>0)
@ -958,10 +958,10 @@ from T_NonOperationalMaster
left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_NonOperationalMaster.Type
join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID
where str_to_date(date,?)>=? and str_to_date(date,?)<=?
and Status!=? and T_NonOperationalMaster.BranchCode=? group by Type,Name';
and Status!=? and T_NonOperationalMaster.BranchCode=? and T_NonOperationalMaster.Isdaybook=? group by Type,Name';
$queryNon = $this->db->query($subQueryNON,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Cancel',$branch));
$queryNon = $this->db->query($subQueryNON,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Cancel',$branch,'1'));
$expenseNon = $queryNon->result();
@ -987,44 +987,60 @@ public function GetPLexcelDetails($from,$to,$branch)
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
$subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(p.Name=? ,Amount,0)) AS OperationalIncome,
SUM(IF(p.Name=? ,Amount,0)) AS OperationalExpense,
SUM(IF(p.Name=? ,Amount,0)) AS NonOperationalIncome,
SUM(IF(p.Name=? ,Amount,0)) AS NonOperationalExpense
from T_DayBookMaster as p
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= p.Type
Join T_PickListDetails on T_PickListDetails.ListCode=p.Name
where str_to_date(Date,?)>=?
and str_to_date(Date,?)<=?
and p.Isdaybook=?
and p.BranchCode=?
group by Name,Month(str_to_date(Date,?))
// $subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
// SUM(IF(p.Name=? ,Amount,0)) AS OperationalIncome,
// SUM(IF(p.Name=? ,Amount,0)) AS OperationalExpense,
// SUM(IF(p.Name=? ,Amount,0)) AS NonOperationalIncome,
// SUM(IF(p.Name=? ,Amount,0)) AS NonOperationalExpense
// from T_DayBookMaster as p
// Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= p.Type
// Join T_PickListDetails on T_PickListDetails.ListCode=p.Name
// where str_to_date(Date,?)>=?
// and str_to_date(Date,?)<=?
// and p.Isdaybook=?
// and p.BranchCode=?
// group by Name,Month(str_to_date(Date,?))
union
// union
select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(q.Name=?,Amount,0)) AS OperationalIncome,
SUM(IF(q.Name=?,Amount,0)) AS OperationalExpense,
SUM(IF(q.Name=?,Amount,0)) AS NonOperationalIncome,
SUM(IF(q.Name=?,Amount,0)) AS NonOperationalExpense
from T_NonOperationalMaster as q
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
where str_to_date(Date,?)>=?
and str_to_date(Date,?)<=?
and q.BranchCode=?
group by Name,Month(str_to_date(Date,?)) ;
// select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
// SUM(IF(q.Name=?,Amount,0)) AS OperationalIncome,
// SUM(IF(q.Name=?,Amount,0)) AS OperationalExpense,
// SUM(IF(q.Name=?,Amount,0)) AS NonOperationalIncome,
// SUM(IF(q.Name=?,Amount,0)) AS NonOperationalExpense
// from T_NonOperationalMaster as q
// Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
// Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
// where str_to_date(Date,?)>=?
// and str_to_date(Date,?)<=?
// and q.BranchCode=?
// group by Name,Month(str_to_date(Date,?)) ;
';
// ';
$query = $this->db->query($subQuery,array('I002','I001','I003','I003','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','I003','I004','I002','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
// $query = $this->db->query($subQuery,array('I002','I001','I003','I003','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','I003','I004','I002','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
$subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(q.Name=? and TypeID =?,Amount,0)) AS OperationalIncome,
SUM(IF(q.Name=? and TypeID = ?,Amount,0)) AS OperationalExpense,
SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalIncome,
SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalExpense
from T_NonOperationalMaster as q
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and q.BranchCode=? group by Name,Month(str_to_date(Date,?));';
$query = $this->db->query($subQuery,array('I002','I002','I001','I001','I002','I002','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
// $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
// print_r($this->db->last_query()); die();
$expenseNon = $query->result();

34
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -652,6 +652,40 @@ $scope.dayBookApprovalAccess = '';
// add a new daybook entry
$scope.daybookAdd = {
submit: function (form, myModelAdd) {
angular.forEach(($scope.incomeExpenseType),function(incomeExpenseType,key)
{
//console.log(incomeExpenseType);
if(incomeExpenseType.ID == myModelAdd.type )
{
$scope.typename = incomeExpenseType.TypeName;
}
//break;
});
$scope.noSpaces = $scope.typename.replace(/ /g, '');
//console.log($scope.noSpaces);
if(($scope.noSpaces == 'CASHTONAGARAJ')||($scope.noSpaces == 'CASHTOBANK'))
{
$scope.myModelAdd.Isdaybook = 0;
}
else
{
$scope.myModelAdd.Isdaybook = 1;
}
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;

35
Apollo/assets/js/controllers/daybookadminCtrl.js
View File

@ -637,9 +637,44 @@ $scope.dayBookApprovalAccess = '';
"Isdaybook":""
}
$scope.typename='';
$scope.noSpaces ='';
// add a new daybook entry
$scope.daybookAdd = {
submit: function (form, myModelAdd) {
angular.forEach(($scope.incomeExpenseType),function(incomeExpenseType,key)
{
//console.log(incomeExpenseType);
if(incomeExpenseType.ID == myModelAdd.type )
{
$scope.typename = incomeExpenseType.TypeName;
}
//break;
});
$scope.noSpaces = $scope.typename.replace(/ /g, '');
//console.log($scope.noSpaces);
if(($scope.noSpaces == 'CASHTONAGARAJ')||($scope.noSpaces == 'CASHTOBANK'))
{
$scope.myModelAdd.Isdaybook = 0;
}
else
{
$scope.myModelAdd.Isdaybook = 1;
}
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;

40
Apollo/assets/js/controllers/daybooksuperadminCtrl.js
View File

@ -776,12 +776,48 @@ $scope.loadStaring = true;
"Isdaybook":""
}
$scope.typename='';
$scope.noSpaces ='';
// add a new daybook entry
$scope.daybookAdd = {
submit: function (form, myModelAdd) {
// console.log(myModelAdd);
// return false;
console.log(myModelAdd.type);
// console.log($scope.incomeExpenseType);
//var typename='';
angular.forEach(($scope.incomeExpenseType),function(incomeExpenseType,key)
{
//console.log(incomeExpenseType);
if(incomeExpenseType.ID == myModelAdd.type )
{
$scope.typename = incomeExpenseType.TypeName;
}
//break;
});
$scope.noSpaces = $scope.typename.replace(/ /g, '');
//console.log($scope.noSpaces);
if(($scope.noSpaces == 'CASHTONAGARAJ')||($scope.noSpaces == 'CASHTOBANK'))
{
$scope.myModelAdd.Isdaybook = 0;
}
else
{
$scope.myModelAdd.Isdaybook = 1;
}
// $scope.myModelAdd.
//return false;
var firstError = null;
if (form.$invalid) {

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

@ -419,11 +419,11 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.Newexcel.NonOperationalExpense=$scope.nonopexptotal;
console.log($scope.Newexcel);
//console.log($scope.Newexcel);
//return false;
//console.log($scope.fullincomedetail);
alasql('SELECT ListName,Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.PLexceldetails]);
alasql('SELECT ListName as Type,Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.PLexceldetails]);
};

8
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -472,10 +472,8 @@
<div class="col-md-4">
<!-- <label>
Need To show in Profit Lose Report
</label> -->
<!-- <div class="col-md-4">
<div class="checkbox clip-check check-primary">
<input type="checkbox" id="checkbox6" name="Isdaybook" ng-model="myModelAdd.Isdaybook">
@ -486,7 +484,7 @@
</div>
-->