From c105e7b4ddcf9da1fadf2b30a5dba9f40a4ce426 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 16 Oct 2024 18:38:06 +0530 Subject: [PATCH] IGR listing fixed --- app/Config/Routes.php | 1 + app/Controllers/Inwardgateregister.php | 20 ++++++++++++++- app/Models/Inwardgateregister_model.php | 4 ++- app/Views/viewinwardgateregister.php | 33 ++++++++++++++++--------- 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 8f484d0c..400d5d1a 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -259,6 +259,7 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditStoreRequisition', 'Storere // Application IGR Routes $routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working $routes->get('ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working +$routes->post('ViewIGR', 'Inwardgateregister::viewIGR');//for filter purpose $routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); $routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); $routes->post('SaveIGR', 'Inwardgateregister::SaveIGR');// Save IGR PAGE - Working diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 83a028c1..ac329ca6 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -50,13 +50,31 @@ class Inwardgateregister extends BaseController function viewIGR() { + if ($this->request->getMethod() === 'GET') + { + $currentYear = date('Y'); + $currentMonth = date('m'); + $startOfMonth = "$currentYear-$currentMonth-01"; + $endOfMonth = date('Y-m-t'); + $fromDate = $startOfMonth; + $toDate = $endOfMonth; + } elseif ($this->request->getMethod() === 'POST') { + $fromDate = $this->request->getPost('fromDate'); + $toDate = $this->request->getPost('toDate'); + $fromDate = date('Y-m-d', strtotime($fromDate)); + $toDate = date('Y-m-d', strtotime($toDate)); + } + $this->global['pageTitle'] = 'View Inward Gate Register'; - $result = $this->inwardgateregister_model->ViewigrListing(); + $result = $this->inwardgateregister_model->ViewigrListing($fromDate,$toDate); $data['IGR'] = $result[0]; $data['IGRDownload'] = $result[1]; $data['userRole'] = $this->session->get('role'); $data['transporter'] = $this->inwardgateregister_model->transporter(); + $data['fromDate'] = date('d-m-Y', strtotime($fromDate)); + $data['toDate'] = date('d-m-Y', strtotime($toDate)); + $this->loadViews("viewinwardgateregister", $this->global, $data, NULL); } diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 860a415a..b01167e6 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -368,7 +368,7 @@ class Inwardgateregister_model extends Model return $result; } - function ViewigrListing() + function ViewigrListing($fromDate,$toDate) { $builder = $this->db->table('t_igr_master igr') @@ -378,6 +378,8 @@ class Inwardgateregister_model extends Model ->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left') ->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo') ->where('igr.IGRStatus !=', MRIR_CREATED) + ->where('igr.CreatedDate >=',"$fromDate") + ->where('igr.CreatedDate <=', "$toDate") ->groupBy('igr.IGRNo') ->orderBy('igr.CreatedDate', 'desc'); $query = $builder->get(); diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 9e6ed040..aeb4fbca 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -170,18 +170,29 @@
-
- - - + + + + - - + + - - -
-
+ + + + + +
+