From f7193c3d32c6a54b948ee120b95a9cbff6adbbeb Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 3 Aug 2018 12:17:44 +0530 Subject: [PATCH] income expense --- .../api/application/models/DayBook_model.php | 27 ++++++++++++------- .../js/controllers/income_reportCtrl.js | 10 +++++-- .../views/income_expense_report_pdf.html | 26 +++++++++--------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index f1c08f6b..07ef0e6e 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -651,12 +651,17 @@ class DayBook_model extends CI_Model public function Income_expense($from,$to,$br) { + + // echo $from.'ff'; + // echo $to.'to'; $incomecode='I002'; $expensecode='I001'; - $fromd= date("d-m-Y",strtotime($from)); - $tod=date("d-m-Y",strtotime($to)); - + $fromd= date("Y-m-d",strtotime($from)); + $tod=date("Y-m-d",strtotime($to)); +// echo $fromd; +// echo $tod; +// die(); $subQuery= 'SELECT DISTINCT(p.Name) AS TID,ListName, SUM(IF(p.Name=?,Amount,0)) AS Income, @@ -668,15 +673,17 @@ class DayBook_model extends CI_Model FROM T_DayBookMaster AS p join T_PickListDetails on T_PickListDetails.ListCode = p.name - where Date>=? and Date<=? and p.IsActive=? and (p.Name=? or p.Name=?) + where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and p.IsActive=? and (p.Name=? or p.Name=?) GROUP BY p.`Name`'; - $query = $this->db->query($subQuery,array($incomecode,$expensecode,$incomecode,$expensecode,$fromd,$tod,'1','I001','I002')); + $query = $this->db->query($subQuery,array($incomecode,$expensecode,$incomecode,$expensecode,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1','I001','I002')); $expense = $query->result(); if(count($query)>0) { $results['expense_data'] = $expense; - } + } + + //print_r( $this->db->last_query()); return $results; @@ -685,8 +692,8 @@ class DayBook_model extends CI_Model public function getIncome_Details($from,$to,$incid) { - $fromd= date("d-m-Y",strtotime($from)); - $tod=date("d-m-Y",strtotime($to)); + $fromd= date("Y-m-d",strtotime($from)); + $tod=date("Y-m-d",strtotime($to)); $expid = 'I001'; // $subQuery = 'select T_DayBookMaster.ID,TypeName,Amount,T_DayBookMaster.Date,Reason,Description from T_DayBookMaster @@ -696,9 +703,9 @@ class DayBook_model extends CI_Model $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,Amount,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_DayBookMaster.Type join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID - where Name in (?,?) and date>=? and date<=?'; + where Name in (?,?) and str_to_date(date,?)>=? and str_to_date(date,?)<=?'; - $query = $this->db->query($subQuery,array($incid,$expid,$fromd,$tod)); + $query = $this->db->query($subQuery,array($incid,$expid,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); // print_r( $this->db->last_query()); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 6391ca73..6a89b2e3 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -325,8 +325,14 @@ var Total_exp = 0; { - kendo.drawing.drawDOM($("#income_expensepdf")).then(function(group) { - kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); + // kendo.drawing.drawDOM($("#income_expensepdf")).then(function(group) { + // kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); + + + kendo.drawing.drawDOM($("#income_expensepdf"), + { paperSize: "A4", + margin:"1cm"} ).then(function(group) { + kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); }); diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index 2c042f50..06c84d16 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -47,7 +47,7 @@
-

Apollo Distance Education

+
Apollo Distance Education

Profit and Loss Report

From: {{income_expensedetails.fdate}} to {{income_expensedetails.tdate}}


@@ -58,7 +58,7 @@
- +
@@ -67,8 +67,8 @@
{{li.ListName }}
-
{{li.TypeName}}
-
{{li.Amount}}
+
{{li.TypeName}}
+
{{li.Amount}}
@@ -78,9 +78,9 @@
- +
-
+
{{de.Total}}
@@ -93,7 +93,7 @@
- +
@@ -101,8 +101,8 @@ {{li.ListName}}
-
{{li.TypeName}}
-
{{li.Amount}}
+
{{li.TypeName}}
+
{{li.Amount}}
@@ -111,9 +111,9 @@
- +
-
+
{{de.Total}}
@@ -131,9 +131,9 @@

- +
-
+
{{sum}}