diff --git a/application/controllers/user.php b/application/controllers/user.php index 1a4ed29c..3c0726c4 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -46,16 +46,7 @@ class user extends BaseController $data['totalcapitalamount']=$this->dahsboard_Model->totalcapitalamount(); $data['totalimportamount']=$this->dahsboard_Model->totalimportamount(); $data['totalrevenueamount']=$this->dahsboard_Model->totalrevenueamount(); - //6th month - $data['totalservicepojune']=$this->dahsboard_Model->totalservicepojune(); - $data['totalrevenuepojune']=$this->dahsboard_Model->totalrevenuepojune(); - $data['totalimportpojune']=$this->dahsboard_Model->totalimportpojune(); - $data['totalcapitalpojune']=$this->dahsboard_Model->totalcapitalpojune(); - //7th month - $data['totalservicepojuly']=$this->dahsboard_Model->totalservicepojuly(); - $data['totalrevenuepojuly']=$this->dahsboard_Model->totalrevenuepojuly(); - $data['totalimportpojuly']=$this->dahsboard_Model->totalimportpojuly(); - $data['totalcapitalpojuly']=$this->dahsboard_Model->totalcapitalpojuly(); + $data['totalservicepo']=$this->dahsboard_Model->totalservicepo(); $data['totalrevenuepo']=$this->dahsboard_Model->totalrevenuepo(); @@ -71,7 +62,11 @@ class user extends BaseController $data['revenueprogress']=$this->dahsboard_Model->revenueprogress(); $data['importprogress']=$this->dahsboard_Model->importprogress(); $data['capitalprogress']=$this->dahsboard_Model->capitalprogress(); - + //month-wise area chart + $data['getTotalServicePoCount'] = $this->dahsboard_Model->getTotalServicePoCount(); + $data['getTotalimportPoCount'] = $this->dahsboard_Model->getTotalimportPoCount(); + $data['getTotalcapitalPoCount'] = $this->dahsboard_Model->getTotalcapitalPoCount(); + $data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount(); $this->loadViews("dashboard", $this->global, $data , NULL); diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index 1caf5e7c..c2c131ca 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -62,79 +62,87 @@ function totalrevenueamount() $query = $this->db->query($sql); return $query->result(); } -function totalservicepojune() - { - $sql="SELECT count(cmast.PONO) totalservicepojune FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='SERVICE' and month(PODate) = 6 "; - $query = $this->db->query($sql); - return $query->result(); +//totalservice +function getTotalServicePoCount(){ + $i=1; + + while($i<=12){ + + $sql="SELECT count(cmast.PONO) as totalService FROM T_PurchaseOrder_Master cmast + join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO + join T_Requestion_Master req on req.ReqNo=line.ReqNo + where ReqType='SERVICE' and month(PODate) = $i "; + +$query = $this->db->query($sql); +$array_result[]=$query->result(); +$i++; + + } + + return $array_result; + } -function totalimportpojune() - { - $sql="SELECT count(cmast.PONO)as totalimportpojune FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='IMPORT' and month(PODate) = 6 "; - $query = $this->db->query($sql); - return $query->result(); + +function getTotalimportPoCount(){ + $i=1; + + while($i<=12){ + + $sql="SELECT count(cmast.PONO) as totalImport FROM T_PurchaseOrder_Master cmast + join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO + join T_Requestion_Master req on req.ReqNo=line.ReqNo + where ReqType='IMPORT' and month(PODate) = $i "; + +$query = $this->db->query($sql); +$array_result[]=$query->result(); +$i++; + + } + + return $array_result; + } -function totalrevenuepojune() - { - $sql="SELECT count(cmast.PONO)as totalrevenuepojune FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='REVENUE' and month(PODate) = 6 "; - $query = $this->db->query($sql); - return $query->result(); -} -function totalcapitalpojune() - { - $sql="SELECT count(cmast.PONO)as totalcapitalpojune FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='CAPITAL' and month(PODate) = 6 "; - $query = $this->db->query($sql); - return $query->result(); -} - //7 month // - function totalservicepojuly() - { - $sql="SELECT count(cmast.PONO)as totalservicepojuly FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='SERVICE' and month(PODate) = 7 "; - $query = $this->db->query($sql); - return $query->result(); -} - function totalrevenuepojuly() - { - $sql="SELECT count(cmast.PONO)as totalrevenuepojuly FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='REVENUE' and month(PODate) = 7 "; - $query = $this->db->query($sql); - return $query->result(); -} -function totalimportpojuly() - { - $sql="SELECT count(cmast.PONO)as totalimportpojuly FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='IMPORT' and month(PODate) = 7 "; - $query = $this->db->query($sql); - return $query->result(); -} -function totalcapitalpojuly() - { - $sql="SELECT count(cmast.PONO)as totalcapitalpojuly FROM T_PurchaseOrder_Master cmast - join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO - join T_Requestion_Master req on req.ReqNo=line.ReqNo - where ReqType='CAPITAL' and month(PODate) = 7 "; - $query = $this->db->query($sql); - return $query->result(); +function getTotalcapitalPoCount(){ + $i=1; + + while($i<=12){ + + $sql="SELECT count(cmast.PONO) as totalcapital FROM T_PurchaseOrder_Master cmast + join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO + join T_Requestion_Master req on req.ReqNo=line.ReqNo + where ReqType='CAPITAL' and month(PODate) = $i "; + +$query = $this->db->query($sql); +$array_result[]=$query->result(); +$i++; + + } + + return $array_result; + } + function getTotalrevenuePoCount(){ + $i=1; + + while($i<=12){ + + $sql="SELECT count(cmast.PONO) as totalrevenue FROM T_PurchaseOrder_Master cmast + join T_PurchaseOrder_LineItem line on line.PONO=cmast.PONO + join T_Requestion_Master req on req.ReqNo=line.ReqNo + where ReqType='REVENUE' and month(PODate) = $i "; + +$query = $this->db->query($sql); +$array_result[]=$query->result(); +$i++; + + } + + return $array_result; + +} + + + function serviceprogress() @@ -247,13 +255,14 @@ function reqdetail(){ function req_list(){ - $sql="select mas.ReqDate,mas.ReqNo,emp.FirstName as Requestedby,dep.DepartmentName,mas.ReqType,DATEDIFF(CURDATE(),mas.ReqDate) AS Aging from T_Requestion_Master as mas -join T_CostCenter_Master cos on cos.CostCenterCode = mas.CostCenterCode -join T_Employee_Details emp on emp.EmpID = mas.Requestedby -join T_DepartmentDetails dep on dep.DEPCode=emp.Departmentcode -where mas.Status = 'ST002' -"; + $sql="select date_format(mas.ReqDate,'%d-%m-%Y') as ReqDate,mas.ReqNo,emp.FirstName as Requestedby,dep.DepartmentName,mas.ReqType,DATEDIFF(CURDATE(),mas.ReqDate) AS Aging from T_Requestion_Master as mas + join T_CostCenter_Master cos on cos.CostCenterCode = mas.CostCenterCode + join T_Employee_Details emp on emp.EmpID = mas.Requestedby + join T_DepartmentDetails dep on dep.DEPCode=emp.Departmentcode + where mas.Status = 'ST002' + "; $query = $this->db->query($sql); + //print_r($this->db->last_query()); return $query->result(); @@ -264,7 +273,7 @@ where mas.Status = 'ST002' function report_relpo(){ - $sql="select Mast.PONO,Mast.POType,Mast.CreatedDate,Mast.ReleasedOn as ReleasedDate,Dept_Details.DepartmentName As Dept_Name,Mast.TotalOrderValue + $sql="select Mast.PONO,Mast.POType,date_format(Mast.CreatedDate,'%d-%m-%Y') as CreatedDate,date_format(Mast.ReleasedOn,'%d-%m-%Y') as ReleasedDate,Dept_Details.DepartmentName As Dept_Name,Mast.TotalOrderValue from T_PurchaseOrder_Master Mast JOIN T_PurchaseOrder_LineItem Det on Det.PONO=Mast.PONO JOIN T_Requestion_Master as Req on Req.ReqNo=Det.ReqNo @@ -274,7 +283,7 @@ JOIN T_CostCenter_Master as Cost on Cost.CostCenterCode=Req.CostCenterCode JOIN T_CostCenter_Budget as Cost_Center_Bdgt on Cost.CostCenterCode=Cost_Center_Bdgt.CostCenterCode where Mast.Status='ST026' -group by Dept_Name"; +group by Mast.PONO"; $query = $this->db->query($sql); return $query->result(); @@ -285,7 +294,7 @@ group by Dept_Name"; function report_openpending(){ - $sql="select Mast.PONO,Mast.POType,Mast.CreatedDate,Mast.ApprovedOn as ApprovedDate,Dept_Details.DepartmentName As Dept_Name,Mast.TotalOrderValue + $sql="select Mast.PONO,Mast.POType,date_format(Mast.CreatedDate,'%d-%m-%Y') as CreatedDate,date_format(Mast.ApprovedOn,'%d-%m-%Y') as ApprovedDate,Dept_Details.DepartmentName As Dept_Name,Mast.TotalOrderValue from T_PurchaseOrder_Master Mast JOIN T_PurchaseOrder_LineItem Det on Det.PONO=Mast.PONO JOIN T_Requestion_Master as Req on Req.ReqNo=Det.ReqNo @@ -332,50 +341,48 @@ group by Dept_Name"; $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 'IMPORT' -then ifnull((sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0) +then ifnull((sum(distinct(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0) when 'CAPITAL' -then - case po.CapitalRange - when '0' - then ifnull((sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0) - else ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate)),0) - end -when 'SERVICE' -then ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate)),0) +then + case po.CapitalRange + when '0' + then ifnull((sum(distinct(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0) + else ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate)),0) + end +when 'SERVICE' +then ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate)),0) when 'REVENUE' -then ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(T_Rev_Tax.AfterDiscount)),0) +then ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(distinct T_Rev_Tax.AfterDiscount)),0) end - as Util_Amount, case Cost_Center_Budget.BudgetType when 'IMPORT' -then (Cost_Center_Budget.BudgetAmount - ifnull((sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0)) +then (Cost_Center_Budget.BudgetAmount - ifnull((sum(distinct(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0)) when 'CAPITAL' -then - case po.CapitalRange - when '0' - then (Cost_Center_Budget.BudgetAmount - ifnull((sum((PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0)) - else (Cost_Center_Budget.BudgetAmount - ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate)),0)) - end -when 'SERVICE' -then (Cost_Center_Budget.BudgetAmount - ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate)),0)) +then + case po.CapitalRange + when '0' + then (Cost_Center_Budget.BudgetAmount - ifnull((sum(distinct(PO_Line_Item.Quantity * PO_Line_Item.Rate) * po.ExchangeRate)),0)) + else (Cost_Center_Budget.BudgetAmount - ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate)),0)) + end +when 'SERVICE' +then (Cost_Center_Budget.BudgetAmount - ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate)),0)) when 'REVENUE' -then (Cost_Center_Budget.BudgetAmount - ifnull((sum(PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(T_Rev_Tax.AfterDiscount)),0)) +then (Cost_Center_Budget.BudgetAmount - ifnull((sum(distinct PO_Line_Item.Quantity * PO_Line_Item.Rate) - sum(distinct T_Rev_Tax.AfterDiscount)),0)) end as Avlbl_Amt 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 +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 WHERE DATE(Cost_Center_Budget.CreatedDate) BETWEEN '2017-04-01' AND '2018-03-31' group by -Cost_Center_Budget.CostCenterCode,Cost_Center_Budget.BudgetType,Cost_Center_Budget.BudgetYear +Cost_Center_Budget.BudgetYear,Cost_Center_Budget.CostCenterCode,Cost_Center_Budget.BudgetType order by Cost_Center_Budget.CostCenterCode"; $query = $this->db->query($sql); return $query->result(); diff --git a/application/views/Report_POreleased.php b/application/views/Report_POreleased.php index e90ca1e3..ca94a862 100755 --- a/application/views/Report_POreleased.php +++ b/application/views/Report_POreleased.php @@ -46,15 +46,16 @@ if(!empty($rel_po))
Clear
-
+ +
Released Date From:
- +
to
- +
Clear
-
+
@@ -80,8 +81,8 @@ if(!empty($rel_po)) PONO?> POType?> - CreatedDate);echo $date->format('Y-m-d'); ?> - ReleasedDate);echo $date->format('Y-m-d'); ?> + CreatedDate);echo $date->format('d-m-Y'); ?> + ReleasedDate);echo $date->format('d-m-Y'); ?> Dept_Name?> TotalOrderValue?> @@ -132,25 +133,28 @@ $(document).ready(function() { $( function() { - var dateFormat = "mm/dd/yy", + + //var dateFormat = "dd-mm-yy", from = $( "#min-date" ) .datepicker({ + dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, - numberOfMonths: 1 + //numberOfMonths: 1 }) .on( "change", function() { to.datepicker( "option", "minDate", getDate( this ) ); }), to = $( "#max-date" ).datepicker({ + dateFormat: 'dd-mm-yy', defaultDate: "+0d", changeMonth: true, - numberOfMonths: 1 + //numberOfMonths: 1 }) .on( "change", function() { from.datepicker( "option", "maxDate", getDate( this ) ); }); - + function getDate( element ) { var date; try { @@ -172,26 +176,32 @@ $( function() { // Extend dataTables search $.fn.dataTable.ext.search.push( function(settings, data, dataIndex) { - var min = $('#min-date').val(); - var max = $('#max-date').val(); - var ReleasedDate = data[3] || 0; // Our date column in the table - - if ( - (min == "" || max == "") || - (moment(ReleasedDate).isSameOrAfter(min) && moment(ReleasedDate).isSameOrBefore(max)) - ) { - return true; + var min = (moment($('#min-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#min-date').val(), "DD/MM/YYYY").format("X") : null; + var max = (moment($('#max-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#max-date').val(), "DD/MM/YYYY").format("X") : null; + var ReleasedDate = ~~moment(data[3], "DD/MM/YYYY").format("X"); // Our date column in the table + // alert(min); + if (min == null && max == null) { + return true; + } + if (min == null && ReleasedDate <= max) { + return true; + } + if (max == null && ReleasedDate >= min) { + return true; + } + if (ReleasedDate <= max && ReleasedDate >= min) { + return true; + } + return false; } - return false; - } ); -// Re-draw the table when the a date range filter changes -$('.filter1').change(function() { +// Re-draw the table when the a date range filter changes +$('#min-date, #max-date').change(function() { table.draw(); }); -$('#my-table_filter').hide(); + $('#my-table_filter').hide(); //total order value range $.fn.dataTable.ext.search.push( diff --git a/application/views/Report_costcenter.php b/application/views/Report_costcenter.php index cdcc59fe..e4d2cf1d 100755 --- a/application/views/Report_costcenter.php +++ b/application/views/Report_costcenter.php @@ -84,25 +84,9 @@ if(!empty($ccrpt)) Dept_Name?> BudgetType?> BudgetYear?> - Util_Amount); - //echo number_format($rel->Util_Amount, 2) - ?> - - Avlbl_Amt < 0 ){ - setlocale(LC_MONETARY, 'en_IN.UTF-8'); - echo money_format('%n', $avlamount); - //echo number_format($avlamount,2); - } - else{ - setlocale(LC_MONETARY, 'en_IN.UTF-8'); - echo money_format('%n', $rel->Avlbl_Amt); - //echo number_format($rel->Avlbl_Amt, 2); - } - ?> + Util_Amount?> + Avlbl_Amt?> +
-
Released Date From:
- +
Created Date From:
+
to
- +
Clear
@@ -80,8 +80,8 @@ if(!empty($open_po)) PONO?> POType?> - CreatedDate);echo $date->format('Y-m-d'); ?> - ApprovedDate);echo $date->format('Y-m-d'); ?> + CreatedDate?> + ApprovedDate?> Dept_Name?> TotalOrderValue?> @@ -132,9 +132,10 @@ $(document).ready(function() { $( function() { - var dateFormat = "mm/dd/yy", + //var dateFormat = "mm-dd-yy", from = $( "#min-date" ) .datepicker({ + dateFormat: "dd-mm-yy", defaultDate: "+0d", changeMonth: true, numberOfMonths: 1 @@ -143,6 +144,7 @@ $( function() { to.datepicker( "option", "minDate", getDate( this ) ); }), to = $( "#max-date" ).datepicker({ + dateFormat: "dd-mm-yy", defaultDate: "+0d", changeMonth: true, numberOfMonths: 1 @@ -172,18 +174,24 @@ $( function() { // Extend dataTables search $.fn.dataTable.ext.search.push( function(settings, data, dataIndex) { - var min = $('#min-date').val(); - var max = $('#max-date').val(); - var ReleasedDate = data[2] || 0; // Our date column in the table - - if ( - (min == "" || max == "") || - (moment(ReleasedDate).isSameOrAfter(min) && moment(ReleasedDate).isSameOrBefore(max)) - ) { - return true; + var min = (moment($('#min-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#min-date').val(), "DD/MM/YYYY").format("X") : null; + var max = (moment($('#max-date').val(), "DD/MM/YYYY").isValid()) ? ~~moment($('#max-date').val(), "DD/MM/YYYY").format("X") : null; + var CreatedDate = ~~moment(data[2], "DD/MM/YYYY").format("X"); // Our date column in the table + // alert(min); + if (min == null && max == null) { + return true; + } + if (min == null && CreatedDate <= max) { + return true; + } + if (max == null && CreatedDate >= min) { + return true; + } + if (CreatedDate <= max && CreatedDate >= min) { + return true; + } + return false; } - return false; - } ); // Re-draw the table when the a date range filter changes diff --git a/application/views/dashboard.php b/application/views/dashboard.php index e8205837..59594b56 100755 --- a/application/views/dashboard.php +++ b/application/views/dashboard.php @@ -1,4 +1,5 @@ + +
@@ -189,6 +193,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
+
TODAY'S REQUESTS - TODAY_REQUESTS;?> + TODAY_REQUESTS;?>
+
+
@@ -225,7 +232,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
TOTAL PENDING REQUESTS - TOTAL_PENDING_REQUESTS;?> + TOTAL_PENDING_REQUESTS;?>
+
@@ -241,6 +249,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
+
TOTAL PURCHASE ORDER - totalpurchaseorder;?> + totalpurchaseorder;?> TOTAL ORDER VALUE - totalordervalue;?> + totalordervalue;?>
+
+
PENDING PURCHASE ORDER - pending;?> + pending;?>
+
@@ -331,7 +343,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:

- 1 Jan, 2017 - 31 Dec, 2017 + 1 April, 2017 - 31 March, 2017

@@ -662,9 +674,13 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: }) - - + + + + + +
@@ -689,71 +705,87 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled: // This will get the first returned node in the jQuery collection. var salesChart = new Chart(salesChartCanvas); -var insert =totalservicepojune;?>; -var insert1 =totalrevenuepojune;?>; -var insert2 =totalimportpojune;?>; -var insert3 =totalcapitalpojune;?>; - -var insert4 =totalservicepojuly;?>; -var insert5 =totalrevenuepojuly;?>; -var insert6 =totalimportpojuly;?>; -var insert7 =totalcapitalpojuly;?>; - + + + var service = ; + var Import = ; + var capital = ; + var revenue = ; + // alert(service.PONO); + var serviceValues = []; + // var arr = new Array(); + $.each (service,function(idx,obj){ + serviceValues.push(obj[0].totalService); + }); + var ImportValues = []; + // var arr = new Array(); + $.each (Import,function(idx,obj){ + ImportValues.push(obj[0].totalImport); + }); + var capitalValues = []; + // var arr = new Array(); + $.each (capital,function(idx,obj){ + capitalValues.push(obj[0].totalcapital); + }); + var revenueValues = []; + // var arr = new Array(); + $.each (revenue,function(idx,obj){ + revenueValues.push(obj[0].totalrevenue); + }); + + + //alert(arr.total2); var salesChartData = { labels: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], + datasets: [ + { label: "Electronics", - fillColor: "rgba(0, 192, 239, 0.7)", - strokeColor: "rgb(0, 192, 239)", + fillColor: "rgba(0, 192, 239, 0.2)", + strokeColor: "rgba(0, 192, 239,0.6)", pointColor: "#00c0ef ", - pointStrokeColor: "rgb(210, 214, 222)", + pointStrokeColor: "rgba(60,141,188,1)", pointHighlightFill: "#fff", - pointHighlightStroke: "rgb(220,220,220)", - data: [0,0,0,0,0,0,0,0,0,0,0,0] + pointHighlightStroke: "rgba(60,141,188,1)", + data:serviceValues + }, + { label: "Digital Goods", - fillColor: "rgba(221, 75, 57,0.8)", + fillColor: "rgba(221, 75, 57,0.2)", strokeColor: "rgba(221, 75, 57,0.8)", pointColor: "#dd4b39 ", pointStrokeColor: "rgba(60,141,188,1)", pointHighlightFill: "#fff", pointHighlightStroke: "rgba(60,141,188,1)", - data: [0,0,0,0,0,0,0,0,0,0,0,0] + data:revenueValues }, { label: "Food", - fillColor: "rgba(0, 166, 90, 0.7)", + fillColor: "rgba(0, 166, 90, 0.2)", strokeColor: "rgba(0, 166, 90,0.8)", pointColor: "#00a65a ", pointStrokeColor: "rgba(60,141,188,1)", pointHighlightFill: "#fff", pointHighlightStroke: "rgba(60,141,188,1", - data: [0,0,0,0,0,0,0,0,0,0,0,0] + data:ImportValues }, { label: "Food", - fillColor: "rgba(243, 156, 18, 0.9)", + fillColor: "rgba(243, 156, 18, 0.2)", strokeColor: "rgba(243, 156, 18,0.8)", pointColor: "#f39c12 ", pointStrokeColor: "rgba(60,141,188,1)", pointHighlightFill: "#fff", pointHighlightStroke: "rgba(60,141,188,1", - data: [0,0,0,0,0,0,0,0,0,0,0,0] + data:capitalValues } ] }; - salesChartData.datasets[0].data[5]=insert; - salesChartData.datasets[1].data[5]=insert1; - salesChartData.datasets[2].data[5]=insert2; - salesChartData.datasets[3].data[5]=insert3; - //7th month - salesChartData.datasets[0].data[6]=insert4; - salesChartData.datasets[1].data[6]=insert5; - salesChartData.datasets[2].data[6]=insert6; - salesChartData.datasets[3].data[6]=insert7; + var salesChartOptions = { //Boolean - If we should show the scale at all @@ -793,6 +825,7 @@ var insert7 =totalcapitalpojuly;?>; //Boolean - whether to make the chart responsive to window resizing responsive: true }; + // alert(salesChartData); //Create the line chart @@ -875,201 +908,18 @@ var insert7 =totalcapitalpojuly;?>; //Create pie or douhnut chart // You can switch between pie and douhnut using the method below. pieChart.Doughnut(PieData, pieOptions); - //----------------- - //- END PIE CHART - - //----------------- + // //----------------- + // //- END PIE CHART - + // //----------------- - - - - diff --git a/application/views/report_pendingreqst.php b/application/views/report_pendingreqst.php index 681135a0..938d2105 100755 --- a/application/views/report_pendingreqst.php +++ b/application/views/report_pendingreqst.php @@ -49,9 +49,9 @@ if(!empty($pending_list))
Request Date From:
- +
To
- +
Clear
@@ -77,7 +77,8 @@ if(!empty($pending_list)) { ?> - ReqDate);echo $date->format('Y-m-d'); ?> + + ReqDate?> ReqNo?> Requestedby?> DepartmentName?> @@ -105,7 +106,7 @@ if(!empty($pending_list)) - +