stock module - 02-04-2025
This commit is contained in:
vadivelJ96
parent
2720ddcc78
commit
663e526f29
@ -326,7 +326,9 @@ $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituplo
|
||||
$routes->post('getIGRRemarks', 'Inwardgateregister::getIGRRemarks');
|
||||
$routes->post('saveIGRRemarks', 'Inwardgateregister::saveIGRRemarks');
|
||||
$routes->post('updateGasShortage','Inwardgateregister::updateGasShortage');
|
||||
$routes->post('gasShortageList','Inwardgateregister::gasShortageList');
|
||||
$routes->get('gasCylinderEntered','Inwardgateregister::gasCylinderEntered');
|
||||
$routes->get('gasCylinderPending','Inwardgateregister::gasCylinderPending');
|
||||
$routes->get('gasCylinderReturned','Inwardgateregister::gasCylinderReturned');
|
||||
$routes->post('getGasShortageDetail',"Inwardgateregister::getGasShortageDetail");
|
||||
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@ use App\Models\Inwardgateregister_model;
|
||||
use App\Models\IGRRemarks_model;
|
||||
use App\Models\GasShortageModel;
|
||||
use App\Helpers\Notification;
|
||||
use App\Models\Rawmaterialdetails_model;
|
||||
use DateTime;
|
||||
|
||||
use ZipArchive;
|
||||
@ -27,6 +28,8 @@ class Inwardgateregister extends BaseController
|
||||
protected $inwardgateregister_model;
|
||||
protected $IGRRemarks_model;
|
||||
protected $gasShortage_model;
|
||||
|
||||
protected $rawMaterialDetails_model;
|
||||
protected $session;
|
||||
protected $logger;
|
||||
|
||||
@ -40,6 +43,7 @@ class Inwardgateregister extends BaseController
|
||||
$this->inwardgateregister_model = new Inwardgateregister_model();
|
||||
$this->IGRRemarks_model = new IGRRemarks_model();
|
||||
$this->gasShortage_model = new GasShortageModel();
|
||||
$this->rawMaterialDetails_model = new Rawmaterialdetails_model();
|
||||
|
||||
$this->session = session();
|
||||
helper('form'); //$this->load->library('form_validation');
|
||||
@ -1521,13 +1525,41 @@ function updateIGRWeight(){
|
||||
|
||||
|
||||
|
||||
public function gasShortageList(){
|
||||
public function gasCylinderEntered(){
|
||||
|
||||
$postData = $this->request->getPost();
|
||||
$this->global['pageTitle'] = 'Gas Cylinder Entered';
|
||||
|
||||
$allShortages = $this->gasShortage_model->where('invoiceNo',$postData['invoiceNo'])->findAll();
|
||||
$gasMaterialCodes = $this->rawMaterialDetails_model->getAllGasMaterialCode();
|
||||
|
||||
return $this->response->setJSON(['status' => 'success', 'data' => $allShortages]);
|
||||
$gasMaterialCodes = array_column($gasMaterialCodes,'MaterialCode');
|
||||
|
||||
$igrDetailsListByMcatGas = $this->inwardgateregister_model->getIgrDetailsListByMcatGas($gasMaterialCodes);
|
||||
|
||||
$data['gasCylinderEnteredList'] = $igrDetailsListByMcatGas;
|
||||
|
||||
$this->loadViews("gasCylinderEntered", $this->global, $data, NULL);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function gasCylinderPending(){
|
||||
|
||||
$this->global['pageTitle'] = 'Gas Shortage List';
|
||||
|
||||
$data['gasShortageList'] = $this->gasShortage_model->findAll();
|
||||
|
||||
$this->loadViews("gasCylinderPending", $this->global, $data, NULL);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function gasCylinderReturned(){
|
||||
|
||||
$this->global['pageTitle'] = 'Gas Shortage List';
|
||||
|
||||
$data['gasShortageList'] = $this->gasShortage_model->findAll();
|
||||
|
||||
$this->loadViews("gasCylinderReturned", $this->global, $data, NULL);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ use CodeIgniter\Model;
|
||||
|
||||
class GasShortageModel extends Model
|
||||
{
|
||||
protected $table = 't_gasShortageDetails';
|
||||
protected $table = 't_gasshortagedetails';
|
||||
protected $primaryKey = 'id';
|
||||
protected $useAutoIncrement = true;
|
||||
protected $returnType = 'array';
|
||||
|
||||
@ -1379,5 +1379,35 @@ $builder = $this->db->table('t_igr_history')
|
||||
return $transportername;
|
||||
}
|
||||
|
||||
//Mcat -materialCategory
|
||||
public function getIgrDetailsListByMcatGas($gasMaterialCodes){
|
||||
|
||||
$result = $this->db->table('t_igr_details as t_igrd')
|
||||
->select("
|
||||
t_igrd.IGRNO,
|
||||
SUM(t_igrd.QuantityAsPerInvoice) as gasCylinderCount,
|
||||
t_sd.SupplierName,
|
||||
t_igrm.*,
|
||||
'gas entered' AS status
|
||||
")
|
||||
->join('t_igr_master t_igrm', 't_igrm.IGRNO = t_igrd.IGRNO')
|
||||
->join('t_purchaseorder_master t_pom', 't_igrm.PONO = t_pom.PONO', 'left')
|
||||
->join('t_supplierdetailsn t_sd', 't_sd.SupplierID = t_pom.SupplierID')
|
||||
->join('t_gasshortagedetails t_gsd', 't_gsd.IGRNO = t_igrd.IGRNO', 'left')
|
||||
->whereIn('MaterialCode', $gasMaterialCodes)
|
||||
->where("DATE(t_igrd.CreatedDate) BETWEEN '2025-01-01' AND '2025-01-31' ")
|
||||
->where('t_gsd.IGRNO IS NULL')
|
||||
->groupBy('t_igrd.IGRNO')
|
||||
->get()
|
||||
->getResultArray();
|
||||
|
||||
|
||||
|
||||
return $result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -232,6 +232,18 @@ class Rawmaterialdetails_model extends Model
|
||||
|
||||
}
|
||||
|
||||
function getAllGasMaterialCode(){
|
||||
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode')
|
||||
->where('Category', '334')
|
||||
->orderBy('MaterialCode', 'asc');
|
||||
$query = $builder->get();
|
||||
$materialResults = $query->getResultArray();
|
||||
|
||||
return $materialResults;
|
||||
}
|
||||
|
||||
|
||||
function getMaterialstock($MaterialCode, $currentdate)
|
||||
|
||||
|
||||
702
app/Views/gasCylinderEntered.php
Normal file
702
app/Views/gasCylinderEntered.php
Normal file
@ -0,0 +1,702 @@
|
||||
<!-- Flatpickr CSS -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
|
||||
<!-- Flatpickr JS -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
|
||||
<style>
|
||||
|
||||
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
#Inwardgateregistertable1 thead tr th{
|
||||
|
||||
width: 150px;
|
||||
word-wrap: break-word;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
th {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.Date-filter-form {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
/* Adjust the gap as needed */
|
||||
}
|
||||
|
||||
.Date-filter-form input,
|
||||
.Date-filter-form button {
|
||||
padding: 5px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.Date-filter-form button {
|
||||
background-color: #007bff;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.Date-filter-form button:hover {
|
||||
background-color: #0056b3;
|
||||
}
|
||||
|
||||
.icon-button {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
color: #007bff;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.icon-button:hover {
|
||||
color: #0056b3;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
th,
|
||||
td {
|
||||
white-space: nowrap;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.dataTables_wrapper .top {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.dataTables_wrapper .dataTables_length {
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
||||
.footer-textarea {
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
border-radius: 5px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.send-btn {
|
||||
padding: 10px 20px;
|
||||
background-color: #2ecc71; /* Green color */
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.send-btn:hover {
|
||||
background-color: #27ae60; /* Darker green on hover */
|
||||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
<script>
|
||||
$(function() {
|
||||
var d = new Date();
|
||||
|
||||
var month = d.getMonth();
|
||||
var day = d.getDate();
|
||||
var year = d.getFullYear();
|
||||
var SIAStartYear = year - 2015;
|
||||
var mindt = year - 70;
|
||||
var maxdt = year - 15;
|
||||
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
.autocomplete-suggestion {
|
||||
cursor: pointer;
|
||||
background-color: skyblue;
|
||||
/* background-color: darkgrey; */
|
||||
outline: 1px solid slategrey;
|
||||
}
|
||||
.igr-remarks{
|
||||
position: relative;
|
||||
}
|
||||
.igr-remarks i{
|
||||
font-size: 14px;
|
||||
}
|
||||
.igr-remarks span{
|
||||
position: absolute;
|
||||
top: -5px;
|
||||
right: -6px;
|
||||
background-color: transparent;
|
||||
border-radius: 50px!important;
|
||||
font-weight: 600;
|
||||
width: 14px;
|
||||
box-shadow: 0 0 20px 0 rgba(0,0,0,0.2);
|
||||
color:#35462c;
|
||||
}
|
||||
</style>
|
||||
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/Autocomplete/jquery.autocomplete.js"></script>
|
||||
|
||||
|
||||
|
||||
<div class="content-page">
|
||||
<div class="content">
|
||||
<!-- Start Content-->
|
||||
<div class="container-fluid">
|
||||
<!-- start page title -->
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<div class="page-title-right">
|
||||
<ol class="breadcrumb m-0">
|
||||
<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
|
||||
<li class="breadcrumb-item active">
|
||||
<h4 class="page-title">Gas Cylinder Entered </h4>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<?php if (session()->getFlashdata('message')): ?>
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<?= esc(session()->getFlashdata('message')); ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<form class="Date-filter-form" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;" method="post" action="<?= base_url('ViewIGR'); ?>">
|
||||
|
||||
<label for="fromDate">From:</label>
|
||||
<input class="form-control date_range form-date-search"
|
||||
value=""
|
||||
id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
|
||||
|
||||
<label for="toDate">To:</label>
|
||||
<input class="form-control date_range to-date-search"
|
||||
value=""
|
||||
id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
|
||||
|
||||
<button type="submit" class="range_search_button" >
|
||||
<i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i>
|
||||
</button>
|
||||
|
||||
<i class="fe-rotate-cw range_reset_button"
|
||||
style="cursor:pointer;"
|
||||
aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
||||
|
||||
|
||||
<div class="error" id="error"></div>
|
||||
</form>
|
||||
</div>
|
||||
<!-- <div class="col-md-4">
|
||||
<button id="downloadExcel" class="btn btn-primary" style="margin-top: 14px;margin-bottom: -11px;margin-right: 25px;float: right;">Download Excel</button>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="card-body" style="overflow-x:scroll;">
|
||||
<table id="view_inward_gate_register" class="table table-bordered table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Full Cylinder Date</th>
|
||||
<th>IGR No</th>
|
||||
<th>Supplier</th>
|
||||
<th>Bill/Invoice No</th>
|
||||
<th>Bill Date</th>
|
||||
<th>Driver Name</th>
|
||||
<th>Vehicle No</th>
|
||||
<th>Cylinder Count</th>
|
||||
<th>Status</th>
|
||||
<th>Gas Details</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<?php if(empty($gasCylinderEnteredList)){?>
|
||||
<p> No Gas Cylinder Entered in the Given Dates..!!</p>
|
||||
<?php }else{ ?>
|
||||
|
||||
<?php foreach($gasCylinderEnteredList as $index => $gasCylinder):
|
||||
$gasCylinder['MaterialRcvdDate'] = date('d-m-Y',strtotime($gasCylinder['MaterialRcvdDate']));
|
||||
$gasCylinder['DeliveryChellanDate'] = date('d-m-Y',strtotime($gasCylinder['DeliveryChellanDate']));
|
||||
?>
|
||||
|
||||
<tr>
|
||||
|
||||
<td><?=$gasCylinder['MaterialRcvdDate']?></td>
|
||||
<td><?=$gasCylinder['IGRNO']?></td>
|
||||
<td><?=$gasCylinder['SupplierName']?></td>
|
||||
<td><?=$gasCylinder['DeliveryChellanOrInvoiceNo']?></td>
|
||||
<td><?=$gasCylinder['DeliveryChellanDate']?></td>
|
||||
<td><?=$gasCylinder['DriverName']?></td>
|
||||
<td><?=$gasCylinder['VehicleNo']?></td>
|
||||
<td><?=$gasCylinder['gasCylinderCount']?></td>
|
||||
<td><?=$gasCylinder['status']?></td>
|
||||
|
||||
|
||||
|
||||
<!-- #gasEnteredDetails modal will open when clicking this button -->
|
||||
<td>
|
||||
<a href="#">
|
||||
<i class="fa fa-edit enter-gas-details" ></i>
|
||||
</a>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
<?php endforeach ?>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
</div> <!-- end card body-->
|
||||
</div> <!-- end card -->
|
||||
</div><!-- end col-->
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- container -->
|
||||
</div> <!-- content -->
|
||||
</div>
|
||||
<!-- box closed here -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- gas Entered modal -->
|
||||
<div id="gasEnteredDetails" data-form="add" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-xl">
|
||||
<div class="modal-content" style="border: 1px solid #ddd; margin-top: 73px; box-shadow: 0 0 40px rgb(0 0 0 / 43%);">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Enter Gas Cylinder Details </h4>
|
||||
|
||||
<button type="button" class="close" data-dismiss="modal"
|
||||
aria-hidden="true">×</button>
|
||||
</div>
|
||||
|
||||
<div class="modal-body p-4">
|
||||
|
||||
|
||||
<form action="#">
|
||||
|
||||
<!-- first row -->
|
||||
<div class="form-group row">
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="fullCylinderDate"> Full Cylinder Date</label>
|
||||
<input type="date" class="form-control" id="fullCylinderDate" name="fullCylinderDate" value="" readonly>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="IGRNO"> IGRNO</label>
|
||||
<input type="text" class="form-control" id="IGRNO" name="IGRNO" value="" readonly>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="supplierName"> Supplier Name</label>
|
||||
<input type="text" class="form-control" id="supplierName" name="supplierName" value="" readonly>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!-- second row -->
|
||||
<div class="form-group row">
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="invoiceNo"> Bill No/Invoice No </label>
|
||||
<input type="text" class="form-control" id="invoiceNo" name="invoiceNo" value="" readonly>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="billDate"> Bill Date</label>
|
||||
<input type="date" class="form-control" id="billDate" name="billDate" value="" readonly>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="driverName"> Driver Name</label>
|
||||
<input type="text" class="form-control" id="driverName" name="driverName" value="" readonly>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- third row -->
|
||||
|
||||
<div class="form-group row">
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="vehicleNo"> Vehicle No</label>
|
||||
<input type="text" class="form-control" id="vehicleNo" name="vehicleNo" value="" readonly>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="cylinderCount"> Cylinder Count </label>
|
||||
<input type="text" class="form-control" id="cylinderCount" name="cylinderCount" value="" readonly>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
<!-- fourth row -->
|
||||
<div id="cylinderDiv">
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary waves-effect"
|
||||
data-dismiss="modal" value="Cancel">Cancel</button>
|
||||
<button type="submit"
|
||||
class="btn btn-info waves-effect waves-light" >Save</button>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end gas shortage calculator modal -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- format date time helper -->
|
||||
<script>
|
||||
function formatDateTime(dateString, flag) {
|
||||
// Note 1 means DATE only
|
||||
// 2 means DATE and Time
|
||||
// Check if the date string is null or empty
|
||||
if (!dateString || dateString == 'null' || dateString === '0000-00-00 00:00:00') {
|
||||
return '';
|
||||
} else {
|
||||
|
||||
console.log("Received date string:", dateString);
|
||||
|
||||
// Split the date string into date and time components
|
||||
var dateTimeParts = dateString.split(' ');
|
||||
var dateParts = dateTimeParts[0].split('-');
|
||||
var timeParts = dateTimeParts[1].split(':');
|
||||
|
||||
// Extract individual components
|
||||
var year = parseInt(dateParts[0], 10);
|
||||
var month = parseInt(dateParts[1], 10) - 1; // Months are zero-based in JavaScript
|
||||
var day = parseInt(dateParts[2], 10);
|
||||
|
||||
var hours = parseInt(timeParts[0], 10);
|
||||
var minutes = parseInt(timeParts[1], 10);
|
||||
var seconds = parseInt(timeParts[2], 10);
|
||||
|
||||
// Create a new Date object
|
||||
var date = new Date(year, month, day, hours, minutes, seconds);
|
||||
|
||||
// Extract date components
|
||||
var day = date.getDate().toString().padStart(2, '0');
|
||||
var month = (date.getMonth() + 1).toString().padStart(2, '0'); // Months are zero-based
|
||||
var year = date.getFullYear();
|
||||
|
||||
// Extract time components
|
||||
var hours = date.getHours().toString().padStart(2, '0');
|
||||
var minutes = date.getMinutes().toString().padStart(2, '0');
|
||||
var seconds = date.getSeconds().toString().padStart(2, '0');
|
||||
var formattedDate = '';
|
||||
// Format the date and time in DD-MM-YYYY HH:MM:SS format
|
||||
if (flag == 1) {
|
||||
formattedDate = `${day}-${month}-${year}`;
|
||||
} else if (flag == 2) {
|
||||
formattedDate = `${day}-${month}-${year} ${hours}:${minutes}:${seconds}`;
|
||||
}
|
||||
return formattedDate;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<!-- number validation -->
|
||||
<script>
|
||||
function isNumberKey(evt) {
|
||||
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||
if (charCode != 46 && charCode > 31 &&
|
||||
(charCode < 48 || charCode > 57))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
</script>
|
||||
|
||||
<!-- data table related initialization -->
|
||||
<script>
|
||||
|
||||
$(document).ready(function() {
|
||||
// this code for table date filed ordering
|
||||
$.fn.dataTable.ext.type.order['date-dd-mm-yyyy-pre'] = function(date) {
|
||||
if (!date) return 0;
|
||||
|
||||
var parts = date.split('-'); // Split the date into parts (DD, MM, YYYY)
|
||||
return new Date(parts[2], parts[1] - 1, parts[0]).getTime(); // Convert to timestamp
|
||||
};
|
||||
|
||||
var orderColumnIndex = <?php echo (session()->get('roleText') == 'Auditor') ? 6 : 0; ?>;
|
||||
table = $('#view_inward_gate_register').DataTable({
|
||||
dom: 'Blfrtip',
|
||||
buttons: [
|
||||
{
|
||||
extend: 'excel',
|
||||
text: 'Excel',
|
||||
exportOptions: {
|
||||
columns: ':not(:last-child)' // Exclude the last column
|
||||
}
|
||||
}
|
||||
],
|
||||
pageLength: 10,
|
||||
lengthMenu: [
|
||||
[10, 20, 30, 50, -1],
|
||||
[10, 20, 30, 50, "All"]
|
||||
],
|
||||
responsive: false,
|
||||
ordering: true,
|
||||
columnDefs: [
|
||||
{ targets: parseInt(orderColumnIndex), type: 'date-dd-mm-yyyy' } // Apply custom sorting
|
||||
],
|
||||
order: [[parseInt(orderColumnIndex), 'desc']],
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Reset button functionality
|
||||
$("#resetButton").click(function() {
|
||||
$("#fromDate").val('');
|
||||
$("#toDate").val('');
|
||||
window.location="ViewIGR"
|
||||
});
|
||||
|
||||
// Automatically focus and open the To Date picker when From Date is selected
|
||||
document.getElementById('fromDate').addEventListener('change', function() {
|
||||
var fromDate = this.value;
|
||||
var toDateInput = document.getElementById('toDate');
|
||||
|
||||
// Set the min attribute of the To Date input to the selected From Date
|
||||
toDateInput.min = fromDate;
|
||||
|
||||
// Optionally reset the To Date input if the current value is before the new min date
|
||||
if (toDateInput.value < fromDate) {
|
||||
toDateInput.value = fromDate;
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
<!-- data table related date filter -->
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('#fromDate , #toDate').change(function() {
|
||||
|
||||
let fromDate = $('#fromDate').val();
|
||||
let toDate = $('#toDate').val();
|
||||
|
||||
let fromDateObj = new Date(fromDate.split('-').reverse().join('-'));
|
||||
let toDateObj = new Date(toDate.split('-').reverse().join('-'));
|
||||
if (fromDateObj > toDateObj) {
|
||||
alert('Incorrect Date Applied For Filter..!!');
|
||||
$('#toDate').attr('min', fromDate);
|
||||
$('#toDate').val('');
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
<!-- while Opening gasEnteredDetails modal -->
|
||||
<script>
|
||||
|
||||
$(document).on('click', '.enter-gas-details', function() {
|
||||
|
||||
|
||||
let row = $(this).closest("tr");
|
||||
|
||||
let fullCylinderDate = row.find("td:eq(0)").text().trim();
|
||||
let igrNo = row.find("td:eq(1)").text().trim();
|
||||
let supplierName = row.find("td:eq(2)").text().trim();
|
||||
let invoiceNo = row.find("td:eq(3)").text().trim();
|
||||
let billDate = row.find("td:eq(4)").text().trim();
|
||||
let driverName = row.find("td:eq(5)").text().trim();
|
||||
let vehicleNo = row.find("td:eq(6)").text().trim();
|
||||
let cylinderCount = parseInt(row.find("td:eq(7)").text().trim(), 10);
|
||||
|
||||
// Convert fullCylinderDate to YYYY-MM-DD
|
||||
if (fullCylinderDate) {
|
||||
let dateParts = fullCylinderDate.split("-");
|
||||
fullCylinderDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`;
|
||||
}
|
||||
|
||||
// Convert billDate to YYYY-MM-DD
|
||||
if (billDate) {
|
||||
let dateParts = billDate.split("-");
|
||||
billDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`;
|
||||
}
|
||||
|
||||
// Assign values to modal inputs
|
||||
$('#fullCylinderDate').val(fullCylinderDate);
|
||||
$('#IGRNO').val(igrNo);
|
||||
$('#supplierName').val(supplierName);
|
||||
$('#invoiceNo').val(invoiceNo);
|
||||
$('#billDate').val(billDate);
|
||||
$('#driverName').val(driverName);
|
||||
$('#vehicleNo').val(vehicleNo);
|
||||
$('#cylinderCount').val(cylinderCount);
|
||||
|
||||
// Clear previous cylinder inputs
|
||||
$('#cylinderDiv').html("");
|
||||
|
||||
// Generate cylinder input fields dynamically
|
||||
if (cylinderCount > 0) {
|
||||
let inputFields = `
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-md-4"><label>Cylinder Number</label> <span class="text-danger">*</span> </div>
|
||||
<div class="col-md-4"><label>Gross Weight</label> <span class="text-danger">*</span> </div>
|
||||
<div class="col-md-4"><label>Actual Weight</label> <span class="text-danger">*</span> </div>
|
||||
</div>`;
|
||||
|
||||
for (let i = 1; i <= cylinderCount; i++) {
|
||||
inputFields += `
|
||||
<div class="form-group row dynamicField">
|
||||
<div class="col-md-4">
|
||||
<input type="text" class="form-control" name="cylinderNumber[]" placeholder="Cylinder ${i}" required>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<input type="number" class="form-control" name="grossWeight[]" placeholder="Gross Weight ${i}" required>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<input type="number" class="form-control" name="actualWeight[]" placeholder="Actual Weight ${i}" required>
|
||||
</div>
|
||||
</div>`;
|
||||
}
|
||||
$('#cylinderDiv').html(inputFields);
|
||||
}
|
||||
|
||||
// Show the modal
|
||||
$('#gasEnteredDetails').modal('show');
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
<!-- while closing gasEnteredDetails modal -->
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('#gasEnteredDetails').on("hide.bs.modal", function(e){
|
||||
|
||||
$('#fullCylinderDate').val(" ");
|
||||
$('#IGRNO').val(" ");
|
||||
$('#supplierName').val(" ");
|
||||
$('#invoiceNo').val(" ");
|
||||
$('#billDate').val(" ");
|
||||
$('#driverName').val(" ");
|
||||
$('#vehicleNo').val(" ");
|
||||
$('#cylinderCount').val(" ");
|
||||
$('#cylinderDiv').html("");
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<!-- end of add gas shortage calculator -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- ajax call for gas Shortage -->
|
||||
<script>
|
||||
|
||||
$(document).ready(function () {
|
||||
$("#gasEnteredDetails form").submit(function (event) {
|
||||
event.preventDefault(); // Prevent form reload
|
||||
|
||||
let method = $("#gasEnteredDetails").data("form"); // Get form type
|
||||
|
||||
// Collecting form data
|
||||
let formData = {
|
||||
fullCylinderDate: $("#fullCylinderDate").val(),
|
||||
igrNo: $("#IGRNO").val(),
|
||||
supplierName: $("#supplierName").val(),
|
||||
invoiceNo: $("#invoiceNo").val(),
|
||||
billDate: $("#billDate").val(),
|
||||
driverName: $("#driverName").val(),
|
||||
vehicleNo: $("#vehicleNo").val(),
|
||||
cylinderCount: $("#cylinderCount").val(),
|
||||
cylinders: [] // Array to store cylinder details
|
||||
};
|
||||
|
||||
// Loop through dynamically generated cylinder inputs
|
||||
$("#cylinderDiv .form-group.row.dynamicField").each(function () {
|
||||
let cylinderData = {
|
||||
cylinderNo: $(this).find("input[name='cylinderNumber[]']").val(),
|
||||
grossWeight: $(this).find("input[name='grossWeight[]']").val(),
|
||||
actualWeight: $(this).find("input[name='actualWeight[]']").val(),
|
||||
};
|
||||
formData.cylinders.push(cylinderData);
|
||||
});
|
||||
|
||||
console.log(formData); // Debugging - Check if data is correct
|
||||
|
||||
return;
|
||||
|
||||
$('#loader').show(); // Show loader
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "<?php echo base_url()?>/updateGasShortage", // Adjust endpoint as needed
|
||||
data: JSON.stringify(formData), // Send data as JSON
|
||||
contentType: "application/json",
|
||||
dataType: "json",
|
||||
success: function (response) {
|
||||
if (response.status === "success") {
|
||||
alert("Gas Shortage Data Saved Successfully!");
|
||||
$('#gasEnteredDetails').modal('hide'); // Close modal
|
||||
} else {
|
||||
alert("Error: " + response.message);
|
||||
}
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
console.log(xhr.responseText);
|
||||
alert("Something went wrong! Please try again.");
|
||||
},
|
||||
complete: function () {
|
||||
console.log("AJAX request completed.");
|
||||
$('#loader').hide();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
1103
app/Views/gasCylinderPending.php
Normal file
1103
app/Views/gasCylinderPending.php
Normal file
File diff suppressed because it is too large
Load Diff
1109
app/Views/gasCylinderReturned.php
Normal file
1109
app/Views/gasCylinderReturned.php
Normal file
File diff suppressed because it is too large
Load Diff
@ -746,6 +746,22 @@
|
||||
Non IGR / Expense</a>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<div class="dropdown" >
|
||||
|
||||
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
|
||||
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<i class="fa fa-arrow-down mr-1"></i> Gas Shortage <div class="arrow-down"></div>
|
||||
</a>
|
||||
|
||||
<div class="dropdown-menu" aria-labelledby="topnav-po" >
|
||||
<a href="<?php echo base_url(); ?>gasCylinderEntered" class="dropdown-item"><i class="fa fa-truck mr-1"></i>Gas Cylinder Entered</a>
|
||||
<a href="<?php echo base_url(); ?>gasCylinderPending" class="dropdown-item"><i class="fa fa fa-hourglass-half mr-1"></i>Gas Cylinder Pending </a>
|
||||
<a href="<?php echo base_url(); ?>gasCylinderReturned" class="dropdown-item"><i class="fa fa-check mr-1"></i>Gas Cylinder Returned</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
<?php } ?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user