RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEW_IGR

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-08-17 09:29:06 +00:00
parent 74496b9f85
commit 774b696d20
6 changed files with 188 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Config/Routes.php
View File

@ -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');

36
app/Controllers/Inwardgateregister.php
View File

@ -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
</script>";
}
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()
{

37
app/Models/Inwardgateregister_model.php
View File

@ -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)
{

15
app/Views/editEmployee.php
View File

@ -1058,12 +1058,7 @@ legend {
placeholder="Referrer Contact Number" class="form-control"
onkeypress="return isNumberKey(event)">
</div>
</div>
<!-- </div>
<div class="col-md-12 pad"> -->
<div class="col-md-3"><span>Work Location</span><span
<div class="col-md-3"><span>Work Location</span><span
class="badge">*</span>
<select type="text" id="work_location" name="work_location"
required class="form-control select2">
@ -1084,7 +1079,7 @@ legend {
</select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
@ -1100,6 +1095,12 @@ legend {
</label>
</div>
</div>
</div>
</div>
<div class="col-md-12 pad">
</div>
<legend>Bank Details</legend>

54
app/Views/inwardgateregister.php
View File

@ -10,10 +10,49 @@
text-align: left;
}
</style>
<style>
.autocomplete-suggestion {
cursor: pointer;
background-color: skyblue;
/* background-color: darkgrey; */
outline: 1px solid slategrey;
}
</style>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/Autocomplete/jquery.autocomplete.js"></script>
<script>
$(document).ready(function() {
$("#PONO").select2();
$("#VehicleType").select2();
$('#DriverName').autocomplete({
onSearchStart: function(query) {
//alert(query);
$('#DriverName').autocomplete("option", "minLength", 0);
},
serviceUrl: "<?php echo base_url(); ?>drivernameautocomplete",
onSelect: function(suggestion) {
var data = suggestion.DriverName;
}
});
$('#DriverMobileNumber').autocomplete({
serviceUrl: "<?php echo base_url(); ?>drivermobileautocomplete",
params: {
driverName: function() {
return $('#DriverName').val(); // Pass the value of the DriverName input field
}
},
onSearchStart: function(query) {
$('#DriverMobileNumber').autocomplete("option", "minLength", 0);
},
onSelect: function(suggestion) {
var data = suggestion.DriverMobileNumber;
}
});
$("#InvoiceDate").datepicker({
@ -146,7 +185,7 @@
</div>
</div>
<div class="col-md-12" style="margin: 10px 0;">
<div class="col-md-4">
<div class="col-md-3">
<label>Vechicle Number</label>
<?php
$data = array('name' => 'VehicleNo', 'value' => set_value('VehicleNo'), 'id' => 'VehicleNo', 'class' => 'form-control', 'maxlength' => '20', 'autocomplete'=>'off');
@ -154,14 +193,21 @@
?>
<!-- <span pattern="" required="true"></span> -->
</div>
<div class="col-md-4">
<div class="col-md-3">
<label>Vechicle Type</label>
<?php
$opt = array(""=>'Vechicle Type',"Rented"=>'Rented',"Owned"=>'Owned');
echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="VehicleType"' ,'class="form-control select2');
?>
</div>
<div class="col-md-3">
<label>Driver Name</label>
<?php
$data = array('name' => 'DriverName', 'value' => set_value('DriverName'), 'id' => 'DriverName', 'class' => 'form-control', 'maxlength' => '50', 'autocomplete'=>'off');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<div class="col-md-3">
<label>Driver Mobile Number</label>
<?php
$data = array('name' => 'DriverMobileNumber', 'value' => set_value('DriverMobileNumber'), 'id' => 'DriverMobileNumber', 'class' => 'form-control', 'maxlength' => '50', 'autocomplete'=>'off');
@ -241,8 +287,8 @@
<div id="filesContainer"></div>
</div><br>
<div class="col-md-4 col-md-offset-8">
<button class="btn btn-success" id='IGRDraftLink' type="submit" name='IGRDraftLink' onclick="filecheck(0);">Save as Draft IGR</button>
<button class="btn btn-success" id='IGRLink' type="submit" name='IGRLink' onclick="filecheck(1);">Generate IGR</button>
<button class="btn btn-success" id='IGRDraftLink' type="submit" name='IGRDraftLink' onclick="filecheck(0);">Save as Draft IGR</button>
</div>
</div>
</div>

62
app/Views/viewinwardgateregister.php
View File

@ -87,9 +87,47 @@
maxDate :'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$('#DriverName').autocomplete({
onSearchStart: function(query) {
//alert(query);
$('#DriverName').autocomplete("option", "minLength", 0);
},
serviceUrl: "<?php echo base_url(); ?>drivernameautocomplete",
onSelect: function(suggestion) {
var data = suggestion.DriverName;
}
});
$('#DriverMobileNumber').autocomplete({
serviceUrl: "<?php echo base_url(); ?>drivermobileautocomplete",
params: {
driverName: function() {
return $('#DriverName').val(); // Pass the value of the DriverName input field
}
},
onSearchStart: function(query) {
$('#DriverMobileNumber').autocomplete("option", "minLength", 0);
},
onSelect: function(suggestion) {
var data = suggestion.DriverMobileNumber;
}
});
});
</script>
<style>
.autocomplete-suggestion {
cursor: pointer;
background-color: skyblue;
/* background-color: darkgrey; */
outline: 1px solid slategrey;
}
</style>
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/Autocomplete/jquery.autocomplete.js"></script>
<div class="content-wrapper">
<section class="content"><br/>
<div class="box">
@ -219,8 +257,8 @@
</div>
<div class="col-md-12" style="margin: 10px 0;">
<div class="col-md-4">
<label>Invoice Number </label>
<?php $data = array('name' => 'InvoiceNO','value' => set_value('InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
<label>Invoice Number <span class="requiredsymbol" style="color:red; font-size: 15px;">*</span></label>
<?php $data = array('name' => 'InvoiceNO','value' => set_value('InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' );
echo form_input($data);
?>
</div>
@ -240,19 +278,26 @@
</div>
</div>
<div class="col-md-12" style="margin: 10px 0;">
<div class="col-md-4">
<div class="col-md-3">
<label>Vehicle Number </label>
<?php $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'),'id'=>'Vehicle_No', 'class' => 'form-control');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<div class="col-md-3">
<label>Vechicle Type</label>
<?php
$opt = array(""=>'Vechicle Type',"Rented"=>'Rented',"Owned"=>'Owned');
echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="Vehicle_Type"' ,'class="form-control select2');
?>
</div>
<div class="col-md-3">
<label>Driver Name </label>
<?php $data = array('name' => 'DriverName','value' => set_value('DriverName'),'id'=>'Driver_Name', 'class' => 'form-control');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<div class="col-md-3">
<label>Driver Mobile Number </label>
<?php $data = array('name' => 'DriverMobileNumber','value' => set_value('DriverMobileNumber'),'id'=>'DriverMobileNumber', 'class' => 'form-control');
echo form_input($data);
@ -314,8 +359,8 @@
<div class="modal-footer">
<div class="buttonContainer">
<a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
<a class="btn btn-primary" id="draftIGR" value="draftIGR">Save as Draft IGR</a>
<a class="btn btn-primary" id="generateIGR" value="generateIGR">Generate IGR</a>
<a class="btn btn-primary" id="draftIGR" value="draftIGR">Save as Draft IGR</a>
</div>
</div>
</div>
@ -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);