From 31d9a75d105a65f095639b0c6767911d32bdf2d7 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 15 Oct 2018 17:02:32 +0530 Subject: [PATCH 1/5] pl excel --- .../api/application/models/DayBook_model.php | 36 +++++++++++++------ .../js/controllers/income_reportCtrl.js | 9 +++-- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 128d9a43..bddc0216 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -1035,22 +1035,36 @@ public function GetPLexcelDetails($from,$to,$branch) -$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,?));'; +// $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('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')); +$subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as month,year(str_to_date(Date,?)) as Year, + 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 + left Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type + left Join T_PickListDetails on T_PickListDetails.ListCode=q.Name + where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? + and q.BranchCode=? group by month'; + + $query = $this->db->query($subQuery,array('%d-%m-%Y','%d-%m-%Y','I002','I002','I001','I001','I002','I002','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch)); + + // print_r($this->db->last_query()); die(); $expenseNon = $query->result(); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index ae25c657..ed02c17a 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -378,13 +378,16 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.grandTot = { - NonOperationalExpense:"Grand Total", - ListName: $scope.Net_Total + OperationalExpense:"Grand Total", + NonOperationalExpense: $scope.Net_Total } $scope.expense = $scope.PLexceldetails.concat($scope.grandTot); - alasql('SELECT Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense,ListName as Type INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]); + for (var i = 0; i < $scope.PLexceldetails.length; i++) + $scope.expense[i].SL_NO = i + 1; + + alasql('SELECT SL_NO,concat(month,"/",Year)as Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]); }; From 7b22a619b61dff205d03525816f0598b960c1e74 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 15 Oct 2018 18:13:03 +0530 Subject: [PATCH 2/5] pl report excel --- Apollo/api/application/models/DayBook_model.php | 6 ++++-- Apollo/assets/js/controllers/income_reportCtrl.js | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index bddc0216..bc727a60 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -1055,14 +1055,16 @@ $subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as mont 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 + SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalExpense, + (SUM(IF(q.Name=? and TypeID =?,Amount,0))+SUM(IF(q.Name=? and TypeID != ?,Amount,0)))- + (SUM(IF(q.Name=? and TypeID = ?,Amount,0))+SUM(IF(q.Name=? and TypeID != ?,Amount,0))) as Net from T_NonOperationalMaster as q left Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type left Join T_PickListDetails on T_PickListDetails.ListCode=q.Name where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and q.BranchCode=? group by month'; - $query = $this->db->query($subQuery,array('%d-%m-%Y','%d-%m-%Y','I002','I002','I001','I001','I002','I002','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch)); + $query = $this->db->query($subQuery,array('%d-%m-%Y','%d-%m-%Y','I002','I002','I001','I001','I002','I002','I001','I001','I002','I002','I002','I002','I001','I001','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch)); // print_r($this->db->last_query()); die(); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index ed02c17a..a6cf52bd 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -378,8 +378,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.grandTot = { - OperationalExpense:"Grand Total", - NonOperationalExpense: $scope.Net_Total + NonOperationalExpense:"Grand Total", + Net: $scope.Net_Total } $scope.expense = $scope.PLexceldetails.concat($scope.grandTot); @@ -387,7 +387,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", for (var i = 0; i < $scope.PLexceldetails.length; i++) $scope.expense[i].SL_NO = i + 1; - alasql('SELECT SL_NO,concat(month,"/",Year)as Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]); + alasql('SELECT SL_NO,concat(month,"/",Year)as Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense,Net as Profit_or_Loss INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]); }; From 165745a2975b9e9e2db7d2f29fa18ce213bae9f8 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 16 Oct 2018 11:01:42 +0530 Subject: [PATCH 3/5] pc tto ppc change --- Apollo/api/application/models/Fees_status_model.php | 4 ++-- Apollo/assets/js/controllers/feesStatusCtrl.js | 2 +- Apollo/assets/views/status-update/setFeesForStudent.html | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 4f2f4c86..93f41c9c 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1041,7 +1041,7 @@ class Fees_status_model extends CI_Model $myArray = array(); if($endFeesDetails->result()){ foreach ($endFeesDetails->result() as $value ){ - $pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PC', 'ActualFees'=>$value->PC); + $pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PPC', 'ActualFees'=>$value->PC); $tc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'TC', 'ActualFees'=>$value->TC); $dc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'DC', 'ActualFees'=>$value->DC); $mc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'MC', 'ActualFees'=>$value->MC); @@ -1264,7 +1264,7 @@ class Fees_status_model extends CI_Model $fromd= date("d-m-Y",strtotime($details['CreatedOn'])); -if(($details['FeesType']=='PC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC') +if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC') || ($details['FeesType'] == 'DC')) { diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 7b976b96..fe854e16 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -1279,7 +1279,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.changeInstallemt = function (model,form) { //alert('in') - if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){ + if(model.Sem_Year!='TC' && model.Sem_Year!='PPC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){ $scope.BatchDetails=[]; $rootScope.updateMoreItems=[]; angular.forEach(model.batchDetails,function (values,key) { diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index 54f6f369..658138cc 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -39,7 +39,7 @@
+ ng-class="{'has-error':Form.batchCode.$dirty && Form.batchCode.$invalid, 'has-success':Form.batchCode.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PPC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'"> @@ -52,7 +52,7 @@ Batch is required
-
+
@@ -71,7 +71,7 @@
+ ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PPC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">