From 2b1815ed2330dbd846c1354f22079bca35c5d91c Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Mon, 19 Jun 2017 13:18:45 +0530 Subject: [PATCH] Master screen issue Fixes --- application/controllers/CostCenter.php | 17 ++++------------- application/controllers/assetdetails.php | 11 ++--------- application/controllers/employeedetails.php | 11 +---------- application/controllers/rawmaterialdetails.php | 7 +------ application/controllers/supplier.php | 11 ++--------- application/controllers/user.php | 17 ++++------------- 6 files changed, 14 insertions(+), 60 deletions(-) diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index b9d4a471..10815fc4 100755 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -39,20 +39,11 @@ class CostCenter extends BaseController */ function CostListing() { - - //$this->load->model('costcenter_model'); - - $searchText = $this->input->post('searchText'); - $data['searchText'] = $searchText; - - - $count = $this->costcenter_model->CostListingCount($searchText); - - $returns = $this->paginationCompress ( "costListing/", $count, 5 ); - - $data['userRecords'] = $this->costcenter_model->CostListing($searchText, $returns["page"], $returns["segment"]); + + + $data['userRecords'] = $this->costcenter_model->CostListing(); - //print_r( $data) ; + $this->global['pageTitle'] = 'Siddharth : Cost List'; $this->loadViews("costListing", $this->global, $data, NULL); diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 7b2d90fe..68b7504e 100755 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -39,16 +39,9 @@ class assetdetails extends BaseController $this->load->model('assetdetails_model'); - $searchText = $this->input->post('searchText'); - $data['searchText'] = $searchText; + - $this->load->library('pagination'); - - $count = $this->assetdetails_model->assetListingCount($searchText); - - $returns = $this->paginationCompress ( "assetListing/", $count ,10); - - $data['userRecords'] = $this->assetdetails_model->assetListing($searchText, $returns["page"], $returns["segment"]); + $data['userRecords'] = $this->assetdetails_model->assetListing(); $this->global['pageTitle'] = 'Siddharth : Asset List'; diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index c8c6b6e2..4f21e960 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -44,17 +44,8 @@ class employeedetails extends BaseController $this->load->model('employeedetails_model'); - $searchText = $this->input->post('searchText'); - $data['searchText'] = $searchText; - $this->load->library('pagination'); - - $count = $this->employeedetails_model->employeeListingCount($searchText); - - - $returns = $this->paginationCompress ( "employeeListing/", $count[0]['Count'], 10 ); - - $data['userRecords'] = $this->employeedetails_model->employeeListing($searchText, $returns["page"], $returns["segment"]); + $data['userRecords'] = $this->employeedetails_model->employeeListing(); $this->global['pageTitle'] = 'Siddharth : Employee Listing'; diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index db2d3009..0d4ffeaf 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -42,14 +42,9 @@ class rawmaterialdetails extends BaseController $this->load->model('rawmaterialdetails_model'); - $searchText = $this->input->post('searchText'); - $data['searchText'] = $searchText; - $count = $this->rawmaterialdetails_model->rawmaterialListingCount($searchText); - - $returns = $this->paginationCompress ( "rawmaterialListing/", $count, 10 ); - $data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing($searchText, $returns["page"], $returns["segment"]); + $data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing(); $this->global['pageTitle'] = 'Siddharth : RawMaterial Listing'; diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index a4101152..7189fda4 100755 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -41,15 +41,8 @@ class supplier extends BaseController $this->load->model('supplier_model'); - $searchText = $this->input->post('searchText'); - $data['searchText'] = $searchText; - - - $count = $this->supplier_model->supplierListingCount($searchText); - - $returns = $this->paginationCompress ( "supplierListing/", $count, 10 ); - - $data['userRecords'] = $this->supplier_model->supplierListing($searchText, $returns["page"], $returns["segment"]); + + $data['userRecords'] = $this->supplier_model->supplierListing(); $this->global['pageTitle'] = 'Siddharth Industries : Supplier Listing'; diff --git a/application/controllers/user.php b/application/controllers/user.php index 9f4ed4c0..3513a360 100755 --- a/application/controllers/user.php +++ b/application/controllers/user.php @@ -33,7 +33,7 @@ class user extends BaseController $this->load->model('employeedetails_model'); - $data['EmpCount'] = $this->employeedetails_model->getEmployeeCount(); + $data['EmpCount'] = $this->employeedetails_model->getEmployeeCount(); $this->loadViews("dashboard", $this->global, $data , NULL); } @@ -48,18 +48,9 @@ class user extends BaseController $this->loadThis(); } else - { - - $searchText = $this->input->post('searchText'); - $data['searchText'] = $searchText; - - $this->load->library('pagination'); - - $count = $this->user_model->userListingCount($searchText); - - $returns = $this->paginationCompress ( "userListing/", $count, 15 ); - - $data['userRecords'] = $this->user_model->userListing($searchText, $returns["page"], $returns["segment"]); + { + + $data['userRecords'] = $this->user_model->userListing(); $this->global['pageTitle'] = 'Siddharth : User Listing';