From 774b696d20d57fb1be7d01c0c912e1e31388e843 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 17 Aug 2024 09:29:06 +0000 Subject: [PATCH 1/4] NEW_IGR --- app/Config/Routes.php | 5 ++ app/Controllers/Inwardgateregister.php | 36 ++++++++++++-- app/Models/Inwardgateregister_model.php | 37 +++++++++++++++ app/Views/editEmployee.php | 15 +++--- app/Views/inwardgateregister.php | 54 +++++++++++++++++++-- app/Views/viewinwardgateregister.php | 62 ++++++++++++++++++++++--- 6 files changed, 188 insertions(+), 21 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0b0e3acd..b3a5ba61 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -264,6 +264,11 @@ $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituplo $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'AddOgr', 'Inwardgateregister::addoutwardgateregister'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewOgr', 'Inwardgateregister::ViewOgr'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditOGR', 'Inwardgateregister::EditOGR'); +$routes->get('drivernameautocomplete' , 'Inwardgateregister::drivernameautocomplete'); +$routes->get('drivermobileautocomplete', 'Inwardgateregister::drivermobileautocomplete'); + + + // Application MRIR Routes $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditMRIR', 'MRIRcontroller::editmaterialinspectionreport'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 00edb421..5cddf8a7 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -320,6 +320,7 @@ class Inwardgateregister extends BaseController $Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate'); $MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt); $VehicleNo = $this->request->getPost('VehicleNo'); + $VehicleType = $this->request->getPost('VehicleType'); $DriverName = $this->request->getPost('DriverName'); $DriverMobileNumber = $this->request->getPost('DriverMobileNumber'); $CreatedBy = $this->session->get('userId'); @@ -354,11 +355,10 @@ class Inwardgateregister extends BaseController } } } - #Step 3 Master Details Gathering to Save In DB - $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); + $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'VehicleType'=>$VehicleType,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); $igr['MasterFile'] = $requestMasterFileName; - // print_r( $igr );die; + print_r( $igr );die; #Step 4 Calling DB to Save IGR Master $IGRNO = $this->inwardgateregister_model->addigrM($igr); // echo "master - no problem"; @@ -585,8 +585,38 @@ class Inwardgateregister extends BaseController "; } +function drivernameautocomplete(){ + $dr = $this->request->getGet('query'); + $query = $this->inwardgateregister_model->checkdrivername($dr); + echo json_encode($query); +} +public function drivermobileautocomplete() { + $dr = $this->request->getGet('query'); + $drName = $this->request->getGet('driverName'); + $query = $this->inwardgateregister_model->checkdriverMobile($dr, $drName); + echo json_encode($query); +} +public function drivermobileautocomplete2() { + $driverName = $this->request->getGet('drivername'); + $term = $this->request->getGet('term'); + + // Debugging + if (!$driverName || !$term) { + return $this->response->setJSON(['error' => 'Missing parameters']); + } + + $query = $this->inwardgateregister_model->checkdriverMobile($driverName, $term); + + // Check the output + if (is_array($query)) { + return $this->response->setJSON($query); + } else { + return $this->response->setJSON(['error' => 'Invalid response from model']); + } +} + function viewIGRDetails() { diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 915355ff..a16e5246 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -168,7 +168,44 @@ class Inwardgateregister_model extends Model return $result; } + function checkdrivername($dr) + { + $temp[] = ''; + $builder = $this->db->table('t_igr_master') + ->distinct() + ->select('DriverName') + ->like('DriverName', $dr); + $query = $builder->get(); + $temparr[] = ''; + foreach ($query->getResult() as $arr) { + $temparr[] = $arr->DriverName; + } + $temp['suggestions'] = $temparr; + + return $temp; + } + + public function checkdriverMobile($mobile,$driverName) { + $builder = $this->db->table('t_igr_master') + ->distinct() + ->select('DriverMobileNumber') + ->like('DriverMobileNumber', $mobile); + if($driverName){ + $builder->where('DriverName', $driverName); + } + + + $query = $builder->get(); + $temparr[] = ''; + foreach ($query->getResult() as $arr) { + $temparr[] = $arr->DriverMobileNumber; + } + // echo $this->db->getLastQuery()->getQuery();die; + $temp['suggestions'] = $temparr; + + return $temp; + } function viewpurchaseorder($PO) { diff --git a/app/Views/editEmployee.php b/app/Views/editEmployee.php index 5a827ae1..08e46969 100644 --- a/app/Views/editEmployee.php +++ b/app/Views/editEmployee.php @@ -1058,12 +1058,7 @@ legend { placeholder="Referrer Contact Number" class="form-control" onkeypress="return isNumberKey(event)"> - - - -
Work LocationWork Location* -
+
@@ -1100,6 +1095,12 @@ legend {
+ + + +
+ +
Bank Details diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 10cff9a4..abcfaf57 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -10,10 +10,49 @@ text-align: left; } + + - + + +

@@ -219,8 +257,8 @@
- - 'InvoiceNO','value' => set_value('InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); + + 'InvoiceNO','value' => set_value('InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' ); echo form_input($data); ?>
@@ -240,19 +278,26 @@
-
+
'VehicleNo','value' => set_value('VehicleNo'),'id'=>'Vehicle_No', 'class' => 'form-control'); echo form_input($data); ?>
-
+
+ + 'Vechicle Type',"Rented"=>'Rented',"Owned"=>'Owned'); + echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="Vehicle_Type"' ,'class="form-control select2'); + ?> +
+
'DriverName','value' => set_value('DriverName'),'id'=>'Driver_Name', 'class' => 'form-control'); echo form_input($data); ?>
-
+
'DriverMobileNumber','value' => set_value('DriverMobileNumber'),'id'=>'DriverMobileNumber', 'class' => 'form-control'); echo form_input($data); @@ -314,8 +359,8 @@
Close - Save as Draft IGR Generate IGR + Save as Draft IGR
@@ -544,6 +589,7 @@ var invoiceDateInput = modal.find('#Invoice_Date'); var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate'); var VehicleNoInput = modal.find('#Vehicle_No'); + var VehicleTypeInput = modal.find('#Vehicle_Type'); var DriverInput = modal.find('#Driver_Name'); var DriverMobileNumberInput = modal.find('#DriverMobileNumber'); var MasterFileInput = modal.find('#MasterFile'); @@ -601,6 +647,7 @@ console.log(parsedData); $('#printLink').attr('href', '#'); $('.help-block').text(''); $("#Vehicle_No").val(''); + $("#Vehicle_Type").val(''); $("#Driver_Name").val(''); $("#DriverMobileNumber").val(''); $("#IGRStatus").val(''); @@ -639,6 +686,7 @@ console.log(parsedData); $('#draftIGR').text(button_text_for_IGRDraft); $("#hiddenIsOpenOrder").val(isOpenOrder); $("#Vehicle_No").val(item.VehicleNo); + $("#Vehicle_Type").val(item.VehicleType); $("#Driver_Name").val(item.DriverName); $("#DriverMobileNumber").val(item.DriverMobileNumber); $("#IGRStatus").val(item.IGRStatus); From 510d3b9032afc327119a6a095ba8636db4d665b1 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 17 Aug 2024 10:11:47 +0000 Subject: [PATCH 2/4] NEW_IGR --- app/Controllers/Inwardgateregister.php | 4 ++-- app/Views/viewinwardgateregister.php | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 5cddf8a7..46a98778 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -358,7 +358,6 @@ class Inwardgateregister extends BaseController #Step 3 Master Details Gathering to Save In DB $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'VehicleType'=>$VehicleType,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); $igr['MasterFile'] = $requestMasterFileName; - print_r( $igr );die; #Step 4 Calling DB to Save IGR Master $IGRNO = $this->inwardgateregister_model->addigrM($igr); // echo "master - no problem"; @@ -667,6 +666,7 @@ function viewIGRDetails() $VehicleNo = $this->request->getPost('vehicle_no'); + $VehicleType = $this->request->getPost('vehicle_type'); $DriverName = $this->request->getPost('driver'); $DriverMobileNumber = $this->request->getPost('driver_mobile'); @@ -681,7 +681,7 @@ function viewIGRDetails() $path = ROOTPATH.'public/uploads/Igrfiles/'; if(!is_dir($path)) { mkdir($path, 0777, true); } - $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby); + $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'VehicleType'=>$VehicleType,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby); $MasterFile = $this->request->getfile('MasterFile'); diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 712a5a25..c6d022da 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -87,11 +87,11 @@ maxDate :'now', dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' }); - $('#DriverName').autocomplete({ + $('#Driver_Name').autocomplete({ onSearchStart: function(query) { //alert(query); - $('#DriverName').autocomplete("option", "minLength", 0); + $('#Driver_Name').autocomplete("option", "minLength", 0); }, serviceUrl: "drivernameautocomplete", @@ -104,7 +104,7 @@ $('#DriverMobileNumber').autocomplete({ serviceUrl: "drivermobileautocomplete", params: { driverName: function() { -return $('#DriverName').val(); // Pass the value of the DriverName input field +return $('#Driver_Name').val(); // Pass the value of the DriverName input field } }, onSearchStart: function(query) { @@ -285,9 +285,9 @@ var data = suggestion.DriverMobileNumber; ?>
- + 'Vechicle Type',"Rented"=>'Rented',"Owned"=>'Owned'); + $opt = array(""=>'Vehicle Type',"Rented"=>'Rented',"Owned"=>'Owned'); echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="Vehicle_Type"' ,'class="form-control select2'); ?>
@@ -842,6 +842,7 @@ console.log(parsedData); formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); + formData.append('vehicle_type', $('#Vehicle_Type').val()); formData.append('driver', $('#Driver_Name').val()); formData.append('driver_mobile', $('#DriverMobileNumber').val()); formData.append('status', status); @@ -900,6 +901,7 @@ console.log(parsedData); formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); + formData.append('vehicle_type', $('#Vehicle_Type').val()); formData.append('driver', $('#Driver_Name').val()); formData.append('driver_mobile', $('#DriverMobileNumber').val()); formData.append('status', status); From b5c5351c17108453f97e93d7eb5547894b04e745 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 17 Aug 2024 10:20:47 +0000 Subject: [PATCH 3/4] NEW_approve table Export pdf and Excel --- app/Views/porelease_view.php | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php index 395187b1..9f44e461 100644 --- a/app/Views/porelease_view.php +++ b/app/Views/porelease_view.php @@ -492,8 +492,15 @@ if (empty($Status)) { }); - - + + + + + + + +