From 381ca7e975f2faea6de24ef64f17def2d4b0d42d Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 30 Jan 2025 06:51:14 +0000 Subject: [PATCH] minor bugs in igr : ps --- app/Controllers/Inwardgateregister.php | 3 +- app/Models/Inwardgateregister_model.php | 12 +++- app/Views/inwardgateregister.php | 72 +++++++++++----------- app/Views/viewinwardgateregister.php | 79 +++++++++---------------- 4 files changed, 77 insertions(+), 89 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 65d02aaf..3a0b1cc7 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -146,6 +146,7 @@ class Inwardgateregister extends BaseController $result = $this->inwardgateregister_model->getpurchaseorder(); $result1 = $this->inwardgateregister_model->transporter(); + $data['driverlist'] = $this->inwardgateregister_model->getdriverlist(); $data['transporter'] = array_filter($result1 , function($item) { return ($item->isactive == 1); }); @@ -158,7 +159,7 @@ class Inwardgateregister extends BaseController }); $data['emp_data'] = []; // $data['emp_data'] = $this->inwardgateregister_model->getAdditionalIGRFile(); - // dd($data['PO_NO']);die; + // dd($data['driverlist']);die; $this->loadViews("inwardgateregister", $this->global, $data, NULL); } diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 70901a0e..e8ab69ad 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -193,7 +193,7 @@ class Inwardgateregister_model extends Model function viewpurchaseorder($PO) { - $subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM + $subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM,POL.Rate FROM t_purchaseorder_master POM LEFT JOIN t_purchaseorder_lineitem POL ON POL.PONO = POM.PONO LEFT JOIN t_igr_master IGM ON IGM.PONO = POL.PONO @@ -1196,6 +1196,16 @@ class Inwardgateregister_model extends Model ]; } + public function getdriverlist() + { + + $query = $this->db->query('SELECT DriverName,DriverMobileNumber + FROM t_igr_master + WHERE DriverName != "" + GROUP BY DriverName,DriverMobileNumber'); + $result = $query->getResultArray(); + return $result; + } } \ No newline at end of file diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index d5fe33f6..58f5bfc0 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -17,37 +17,6 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index bd6d17b9..e67dd612 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -105,35 +105,6 @@ changeYear: true, yearRange: '-100:+0' }); - $('#Driver_Name').autocomplete({ - - onSearchStart: function(query) { - //alert(query); - $('#Driver_Name').autocomplete("option", "minLength", 0); - }, - - serviceUrl: "drivernameautocomplete", - onSelect: function(suggestion) { - var data = suggestion.DriverName; - - } - }); - $('#DriverMobileNumber').autocomplete({ - serviceUrl: "drivermobileautocomplete", - params: { - driverName: function() { - return $('#Driver_Name').val(); // Pass the value of the DriverName input field - } - }, - onSearchStart: function(query) { - $('#DriverMobileNumber').autocomplete("option", "minLength", 0); - }, - onSelect: function(suggestion) { - var data = suggestion.DriverMobileNumber; - } - }); - - });