From 78c5c561e4d5f235f3dbc87d80d8263d347e01fe Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 21 Dec 2017 18:39:24 +0530 Subject: [PATCH] dashboard issues and attachments on inward --- application/controllers/user.php | 7 +- application/models/dahsboard_model.php | 86 ++++++------------- .../views/Report_consolidate_inward.php | 2 +- application/views/dashboard.php | 43 +++++----- 4 files changed, 52 insertions(+), 86 deletions(-) diff --git a/application/controllers/user.php b/application/controllers/user.php index 0e6a54ae..d3b0041e 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -72,13 +72,10 @@ class user extends BaseController //dashboard pie chart $data['importbudgt'] = $this->dahsboard_Model->importbudgt(); - $data['importbal'] = $this->dahsboard_Model->importbal(); - $data['servicebudgt'] = $this->dahsboard_Model->servicebudgt(); - $data['servicebal'] = $this->dahsboard_Model->servicebal(); + $data['servicebudgt'] = $this->dahsboard_Model->servicebudgt(); $data['revenuebudgt'] = $this->dahsboard_Model->revenuebudgt(); - $data['revenuebal'] = $this->dahsboard_Model->revenuebal(); $data['capitalbud'] = $this->dahsboard_Model->capitalbud(); - $data['capitalbal'] = $this->dahsboard_Model->capitalbal(); + $data['typebal'] = $this->dahsboard_Model->typebal(); /* HR DASHBOARD Controller Start*/ diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 0c50b998..371db0e0 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -306,7 +306,7 @@ function getTotalServicePoCount(){ $sql="SELECT count(cmast.PONO) as totalService FROM T_PurchaseOrder_Master cmast left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO left join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='SERVICE' and month(PODate) = $i + where POType='SERVICE' and month(PODate) = $i and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'"; $query = $this->db->query($sql); @@ -336,7 +336,7 @@ function getTotalimportPoCount(){ $sql="SELECT count(cmast.PONO) as totalImport FROM T_PurchaseOrder_Master cmast left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO left join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='IMPORT' and month(PODate) = $i + where POType='IMPORT' and month(PODate) = $i and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'"; $query = $this->db->query($sql); @@ -364,7 +364,7 @@ function getTotalcapitalPoCount(){ $sql="SELECT count(cmast.PONO) as totalcapital FROM T_PurchaseOrder_Master cmast left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO left join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='CAPITAL' and month(PODate) = $i + where POType='CAPITAL' and month(PODate) = $i and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'"; $query = $this->db->query($sql); @@ -392,7 +392,7 @@ $i++; $sql="SELECT count(cmast.PONO) as totalrevenue FROM T_PurchaseOrder_Master cmast left join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO left join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='REVENUE' and month(PODate) = $i + where POType='REVENUE' and month(PODate) = $i and date(cmast.PODate) >= '".$fa."-04-01' and date(cmast.PODate) <= '".$aa."-03-31'"; $query = $this->db->query($sql); @@ -486,81 +486,49 @@ function importbudgt () $query = $this->db->query($sql); return $query->result(); } -function importbal () -{ - $sql="SELECT ROUND(sum(BudgetAmount)-(SELECT -ifnull((sum(distinct(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0) -as Util_Amount -from T_CostCenter_Budget Cost_Center_Budget -join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode -JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.POType=Cost_Center_Budget.BudgetType -WHERE Cost_Center_Budget.BudgetType='IMPORT' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())),2) as balimportbudget FROM T_CostCenter_Budget where BudgetType ='IMPORT' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW()) "; - $query = $this->db->query($sql); - return $query->result(); -} + function capitalbud () { $sql="SELECT sum(BudgetAmount) as totalcapitalbudget FROM T_CostCenter_Budget where BudgetType ='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW()) "; $query = $this->db->query($sql); return $query->result(); } -function capitalbal () -{ - $sql="SELECT ROUND(sum(BudgetAmount)-(SELECT -ifnull(sum(distinct if(CapitalRange=0,(( PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate),( PO_Line_Item.Quantity * PO_Line_Item.Rate) - st.Afterdiscountval)),0) -as Util_Amount -from T_CostCenter_Budget Cost_Center_Budget -join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode -JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.POType=Cost_Center_Budget.BudgetType and po.Status !='ST030' -left JOIN T_Service_Tax st on st.LineItemNo = PO_Line_Item.LineItemNo -WHERE Cost_Center_Budget.BudgetType='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())),2) as balcapitalbudget FROM T_CostCenter_Budget where BudgetType ='CAPITAL' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW()) -"; - $query = $this->db->query($sql); - return $query->result(); -} + function servicebudgt () { $sql="SELECT ROUND(sum(BudgetAmount),2) as totalservicebudget FROM T_CostCenter_Budget where BudgetType ='SERVICE' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())"; $query = $this->db->query($sql); return $query->result(); } -function servicebal () -{ - $sql="SELECT Cost_Center_Budget.CostCenterCode as Cost_Center_Code, CostCenterName as Cost_Center_Name,group_concat(distinct Dept_Details.DepartmentName) as Dept_Name,Cost_Center_Budget.BudgetType as BudgetType,Cost_Center_Budget.BudgetYear as BudgetYear, -case Cost_Center_Budget.BudgetType -when 'SERVICE' -then ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate)),0) -end as service -from T_CostCenter_Budget Cost_Center_Budget -left join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode -left JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.Status !='ST030' -left JOIN T_Revenue_Tax T_Rev_Tax on PO_Line_Item.LineItemNo=T_Rev_Tax.LineItemNo -JOIN T_CostCenter_Master Cost_Mast on Cost_Center_Budget.CostCenterCode=Cost_Mast.CostCenterCode -JOIN T_CostCenter_Departments CostCentDept on CostCentDept.CostCenterCode=Cost_Mast.CostCenterCode -JOIN T_DepartmentDetails Dept_Details on Dept_Details.DEPCode= CostCentDept.DEPCode -left JOIN T_Service_Tax st on st.LineItemNo = PO_Line_Item.LineItemNo -WHERE Cost_Center_Budget.BudgetType = po.POType and date(po.PODate) >= '2017-04-01' and date(po.PODate) <= '2018-03-31' -group by -Cost_Center_Budget.BudgetType -"; - $query = $this->db->query($sql); - return $query->result(); -} + function revenuebudgt () { $sql="SELECT ROUND(sum(BudgetAmount),2) as totalrevenuebudget FROM T_CostCenter_Budget where BudgetType ='REVENUE' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())"; $query = $this->db->query($sql); return $query->result(); } -function revenuebal () +function typebal () { - $sql="SELECT ROUND(sum(BudgetAmount)-(SELECT -ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(distinct T_Rev_Tax.AfterDiscount)),0) -as Util_Amount + $sql="SELECT Cost_Center_Budget.BudgetYear as BudgetYear, +sum(if(Cost_Center_Budget.BudgetType='IMPORT', +(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate,0)) as im, +sum(if(Cost_Center_Budget.BudgetType='CAPITAL', +if(CapitalRange=0,(( PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate),( PO_Line_Item.Quantity * PO_Line_Item.Rate) - st.Afterdiscountval),0)) as ca, +sum(if(Cost_Center_Budget.BudgetType='SERVICE', +PO_Line_Item.Quantity * PO_Line_Item.Rate,0)) as sr, +sum(if(Cost_Center_Budget.BudgetType='REVENUE', +(PO_Line_Item.Quantity * PO_Line_Item.Rate)-T_Rev_Tax.AfterDiscount,0)) as rv + from T_CostCenter_Budget Cost_Center_Budget -join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode -JOIN T_Revenue_Tax T_Rev_Tax on PO_Line_Item.LineItemNo=T_Rev_Tax.LineItemNo -WHERE Cost_Center_Budget.BudgetType='REVENUE' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())),2) as balrevenuebudget FROM T_CostCenter_Budget where BudgetType ='REVENUE' and YEAR(STR_TO_DATE(`BudgetYear`,'%Y')) = YEAR(NOW())"; +left join T_PurchaseOrder_LineItem PO_Line_Item on Cost_Center_Budget.CostCenterCode=PO_Line_Item.CostCenterCode +left JOIN T_PurchaseOrder_Master po on po.PONO=PO_Line_Item.PONO and po.Status !='ST030' +left JOIN T_Revenue_Tax T_Rev_Tax on PO_Line_Item.LineItemNo=T_Rev_Tax.LineItemNo +JOIN T_CostCenter_Master Cost_Mast on Cost_Center_Budget.CostCenterCode=Cost_Mast.CostCenterCode +left JOIN T_Service_Tax st on st.LineItemNo = PO_Line_Item.LineItemNo +WHERE Cost_Center_Budget.BudgetType = po.POType and date(po.PODate) >= '2017-04-01' and date(po.PODate) <= '2018-03-31' +group by +Cost_Center_Budget.BudgetYear +"; $query = $this->db->query($sql); return $query->result(); } diff --git a/application/views/Report_consolidate_inward.php b/application/views/Report_consolidate_inward.php index d0977fb2..1663aab1 100755 --- a/application/views/Report_consolidate_inward.php +++ b/application/views/Report_consolidate_inward.php @@ -201,7 +201,7 @@ August);?> September; + $sep= $sep + round($result->September); ?> September);?> diff --git a/application/views/dashboard.php b/application/views/dashboard.php index 91091a2a..40397240 100755 --- a/application/views/dashboard.php +++ b/application/views/dashboard.php @@ -789,7 +789,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
-

Monthly Released Purchase Order

+

Monthly Purchase Order

-
+
totalservicebudget-$serviceb->service; + foreach($typebal as $serviceb) + $sb=$service->totalservicebudget-$serviceb->sr; { ?>
SERVICE BUDGET
data-min="20" data-max=totalservicebudget;?> data-width="" data-height="" data-fgColor="#00c0ef ">
+ echo number_format($sb,2,'.','');?> data-min="20" data-max=totalservicebudget;?> data-width="" data-height="" data-fgColor="#00c0ef ">
TOTAL       :  totalservicebudget;?>
BALANCE : 
+ echo number_format($sb,2,'.','');?>
totalrevenuebudget-$revenueb->rv; { ?>
REVENUE BUDGET
- totalrevenuebudget;?> data-width="" data-height="" data-fgColor="#dd4b39 ">
+ totalrevenuebudget;?> data-width="" data-height="" data-fgColor="#dd4b39 ">
TOTAL       :  totalrevenuebudget;?>
-
BALANCE :  balrevenuebudget;?>
+
BALANCE : 
totalimportbudget-$importb->im; { ?>
IMPORT BUDGET
- balimportbudget;?> data-min="0" data-max=totalimportbudget;?> data-width="" data-height="" data-fgColor="#00a65a ">
+ data-min="0" data-max=totalimportbudget;?> data-width="" data-height="" data-fgColor="#00a65a ">
TOTAL       :  totalimportbudget;?>
-
BALANCE :  balimportbudget;?>
+
BALANCE : 
totalcapitalbudget-$capitalb->ca; { ?>
CAPITAL BUDGET
- balcapitalbudget;?> data-min="0" data-max=totalcapitalbudget;?> data-fgColor="#f39c12 ">
+ data-min="0" data-max=totalcapitalbudget;?> data-fgColor="#f39c12 ">
TOTAL       :  totalcapitalbudget;?>
-
BALANCE :  balcapitalbudget;?>
+
BALANCE :