From 93cd7cd232a73b6351ebbb696a0fd08d4724ed06 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 28 Nov 2017 10:46:55 +0530 Subject: [PATCH] revenue po zero rate accept, dash board --- application/controllers/user.php | 13 +- application/models/dahsboard_model.php | 20 + application/views/alterpurchaseorder.php | 12 +- application/views/dashboard.php | 1848 +++++++++++----------- application/views/editRevenueAmendPO.php | 2 +- assets/js/CreatePOValidation.js | 12 +- 6 files changed, 973 insertions(+), 934 deletions(-) mode change 100755 => 100644 application/views/dashboard.php diff --git a/application/controllers/user.php b/application/controllers/user.php index 3c0726c4..24efd559 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -66,7 +66,18 @@ class user extends BaseController $data['getTotalServicePoCount'] = $this->dahsboard_Model->getTotalServicePoCount(); $data['getTotalimportPoCount'] = $this->dahsboard_Model->getTotalimportPoCount(); $data['getTotalcapitalPoCount'] = $this->dahsboard_Model->getTotalcapitalPoCount(); - $data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount(); + $data['getTotalrevenuePoCount'] = $this->dahsboard_Model->getTotalrevenuePoCount(); + + + //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['revenuebudgt'] = $this->dahsboard_Model->revenuebudgt(); + $data['revenuebal'] = $this->dahsboard_Model->revenuebal(); + $data['capitalbud'] = $this->dahsboard_Model->capitalbud(); + $data['capitalbal'] = $this->dahsboard_Model->capitalbal(); $this->loadViews("dashboard", $this->global, $data , NULL); diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index b486ffb3..22019629 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -853,6 +853,24 @@ group by supplier_name,material_name"; $query = $this->db->query($sql); return $query->result(); } + + +function totalcapitalpo () +{ + $sql="SELECT count(cmast.PONO) as totalcapitalpo 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 + join T_Status sta on sta.statusCode=req.status + where ReqType='CAPITAL'"; + $query = $this->db->query($sql); + return $query->result(); +} + + + + + + function report_cum_day($sup=null,$mat=null){ $sql="SELECT sd.SupplierID as sid,mm.MaterialCode as mid,sd.SupplierName as supplier_name,ifnull(mm.MaterialName,'-') as material_name,IF(pl.Quantity IS NULL or pl.Quantity = '', 0, sum(pl.Quantity)) as tquantity,ifnull(sum(pl.Quantity * pl.Rate),0) as ttotal @@ -868,4 +886,6 @@ group by supplier_name,material_name"; } } + + ?> \ No newline at end of file diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php index 1e19d22e..033b8768 100755 --- a/application/views/alterpurchaseorder.php +++ b/application/views/alterpurchaseorder.php @@ -7950,12 +7950,12 @@ $('.EditRevenue').click(function(){ $('#EditRevenueRate').focus(); return false; } - else if($('#EditRevenueRate').val() == 0) - { - alert('Please Enter the Valid Rate of the Item'); - $('#EditRevenueRate').focus(); - return false; - } + // else if($('#EditRevenueRate').val() == 0) + // { + // alert('Please Enter the Valid Rate of the Item'); + // $('#EditRevenueRate').focus(); + // return false; + // } else { return true; diff --git a/application/views/dashboard.php b/application/views/dashboard.php old mode 100755 new mode 100644 index d70f965c..00e10c7b --- a/application/views/dashboard.php +++ b/application/views/dashboard.php @@ -1,921 +1,929 @@ -EmpCount; - } - - -} - -?> - - -
-
- - -
- -
-

Accounts Department Dashboard

-
- -
- -
-
- -
-
-
- -
- Employees - -
-
-
-
-
-
-
- - - - -
- -
-

Admin Dashboard

-
- -
-
- - - -
- -
-
-

44

- -

User Registrations

-
-
- -
- More info -
-
- - -
-
- -
- - - - - - -
- -
-

Manager Department Dashboard

-
- -
- -
-
- -
-
-
- -
- Employees - -
-
-
-
-
-
- -
-
-
- - - - - - - - - -
-
- -
-
- -
- - - - -
- TODAY'S REQUESTS - TODAY_REQUESTS;?> -
- - -
- - -
- -
- -
- - - - -
- TOTAL PENDING REQUESTS - TOTAL_PENDING_REQUESTS;?> -
- - -
- - -
- - - -
- -
- -
- - -
- TOTAL PURCHASE ORDER - totalpurchaseorder;?> - - - TOTAL ORDER VALUE - - totalordervalue;?> - -
- - - -
- - -
- -
- -
- - -
- PENDING PURCHASE ORDER - pending;?> -
- - -
- - -
- -
- - -
-
-
-
-

Monthly Released Purchase Order

- - -
- -
-
-
-

- 1 April, 2017 - 31 March, 2017 -

- -
- - -
- -
- - - -
-      BUDGET AMOUNT - -

- -
- - SERVICE   :  totalserviceamount;?> - -
- - -
-
- -
- - REVENUE :  totalrevenueamount;?> - - - -
- -
- -
- - IMPORT    :  totalimportamount;?> - - - -
-
- -
- - CAPITAL    :  totalcapitalamount;?> - - - -
- - - -
- - - -
- - - -
- -
-
-
- -
-
-
-
-
- - serviceprogress;?> data-min="0" data-max=totalservicepo;?> data-width="90" data-height="90" data-fgColor="#00c0ef ">
-
TOTAL SERVICE PURCHASE ORDER : totalservicepo;?>
-
PROGRESS PURCHASE ORDER : serviceprogress;?>
-
- -
- -
-
- - revenueprogress;?> data-min="0" data-max=totalrevenuepo;?> data-width="90" data-height="90" data-fgColor="#dd4b39 ">
-
TOTAL REVENUE PURCHASE ORDER : totalrevenuepo;?> -
PROGRESS PURCHASE ORDER : revenueprogress;?> -
-
- -
-
- -
-
- - importprogress;?> data-min="0" data-max=totalimportpo;?> data-width="90" data-height="90" data-fgColor="#00a65a ">
-
TOTAL IMPORT PURCHASE ORDER : totalimportpo;?>
-
PROGRESS PURCHASE ORDER : importprogress;?>
-
- -
- -
-
- - capitalprogress;?> data-min="0" data-max=totalcapitalpo;?> data-width="90" data-height="90" data-fgColor="#f39c12 ">
-
TOTAL CAPITAL PURCHASE ORDER : totalcapitalpo;?>
-
PROGRESS PURCHASE ORDER : capitalprogress;?> -
- -
- -
- -
-
-
-
-
-

Bar Chart

- -
- - - -
-
-
-
-
- -
- - - - - - - - - - - - -
- - -
- - - - - - - - - - - -
+EmpCount; + } + + +} + +?> + + +
+
+ + +
+ +
+

Accounts Department Dashboard

+
+ +
+ +
+
+ +
+
+
+ +
+ Employees + +
+
+
+
+
+
+

Guidelines:

# PaySlip menu in header has two sub menu ( 1.Upload Salary , 2.PaySlip Generator)

+ # Upload salary menu is used to upload the Salary Excel file into the database

+ # Payslip generator menu is to generate the salary slip for individual Employess or All Employees

+ +
+
+
+ + + + +
+ +
+

Admin Dashboard

+
+ +
+
+ + + +
+ +
+
+

44

+ +

User Registrations

+
+
+ +
+ More info +
+
+ + +
+
+ +
+ + + + + + +
+ +
+

Manager Department Dashboard

+
+ +
+ +
+
+ +
+
+
+ +
+ Employees + +
+
+
+
+
+
+ Hi This Is Manager Login +
+
+
+ + + + + + + + + +
+
+ +
+
+ +
+ + + + +
+ TODAY'S REQUESTS + TODAY_REQUESTS;?> +
+ + +
+ + +
+ +
+ +
+ + + + +
+ TOTAL PENDING REQUESTS + TOTAL_PENDING_REQUESTS;?> +
+ + +
+ + +
+ + + +
+ +
+ +
+ + +
+ TOTAL PURCHASE ORDER + totalpurchaseorder;?> + + + TOTAL ORDER VALUE + + totalordervalue;?> + +
+ + + +
+ + +
+ +
+ +
+ + +
+ PENDING PURCHASE ORDER + pending;?> +
+ + +
+ + +
+ +
+ + +
+
+
+
+

Monthly Released Purchase Order

+ + +
+ +
+
+
+

+ 1 April, 2017 - 31 March, 2017 +

+ +
+ + +
+ +
+ + + +
+      BUDGET AMOUNT + +

+ +
+ + SERVICE   :  totalserviceamount;?> + +
+ + +
+
+ +
+ + REVENUE :  totalrevenueamount;?> + + + +
+ +
+ +
+ + IMPORT    :  totalimportamount;?> + + + +
+
+ +
+ + CAPITAL    :  totalcapitalamount;?> + + + +
+ + + +
+ + + +
+ + + +
+ +
+
+
+ +
+
+
+
+
+ +
SERVICE BUDGET
+ balservicebudget;?> data-min="20" data-max=totalservicebudget;?> data-width="" data-height="" data-fgColor="#00c0ef ">
+
TOTAL       : totalservicebudget;?>
+
BALANCE : balservicebudget;?>
+
+ +
+ +
+
+ +
REVENUE BUDGET
+ totalrevenuebudget;?> data-width="" data-height="" data-fgColor="#dd4b39 ">
+
TOTAL       : totalrevenuebudget;?>
+
BALANCE : balrevenuebudget;?>
+ + +
+
+ +
+
+ +
IMPORT BUDGET
+ balimportbudget;?> data-min="0" data-max=totalimportbudget;?> data-width="" data-height="" data-fgColor="#00a65a ">
+
TOTAL       : totalimportbudget;?>
+
BALANCE : balimportbudget;?>
+
+ +
+
+
+ +
CAPITAL BUDGET
+ balcapitalbudget;?> data-min="0" data-max=totalcapitalbudget;?> data-fgColor="#f39c12 ">
+
TOTAL       : totalcapitalbudget;?>
+
BALANCE : balcapitalbudget;?>
+ +
+ +
+ +
+
+
+
+
+

Bar Chart

+ +
+ + + +
+
+
+
+
+ +
+ + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + +
\ No newline at end of file diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php index 39fcda14..4ea238d1 100755 --- a/application/views/editRevenueAmendPO.php +++ b/application/views/editRevenueAmendPO.php @@ -2529,7 +2529,7 @@ function validateEditRevenueTax() $('#EditQuantity').focus(); return false; } - else if($('#EditRate').val() == '' || $('#EditRate').val() == 0) + else if($('#EditRate').val() == '') { alert('Please Enter the Rate of the Item'); $('#EditRate').focus(); diff --git a/assets/js/CreatePOValidation.js b/assets/js/CreatePOValidation.js index 52c74094..5f6dc492 100755 --- a/assets/js/CreatePOValidation.js +++ b/assets/js/CreatePOValidation.js @@ -143,12 +143,12 @@ function validateRevenueTax() $('#Rate').focus(); return false; } - else if($('#Rate').val() == "0") - { - alert('Please Enter the Valid Rate of the Item'); - $('#Rate').focus(); - return false; - } + // else if($('#Rate').val() == "0") + // { + // alert('Please Enter the Valid Rate of the Item'); + // $('#Rate').focus(); + // return false; + // } else { return true;