Merge with tracker issues
This commit is contained in:
commit
982b403ef4
@ -172,7 +172,7 @@
|
|||||||
|
|
||||||
<td><?= $record->isActive == 1 ? 'Active' : 'InActive'; ?></td>
|
<td><?= $record->isActive == 1 ? 'Active' : 'InActive'; ?></td>
|
||||||
<td>
|
<td>
|
||||||
<a
|
<a class="edit-btn"
|
||||||
onclick="editConfig(event)"
|
onclick="editConfig(event)"
|
||||||
href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"
|
href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"
|
||||||
data-toggle="tooltip"
|
data-toggle="tooltip"
|
||||||
@ -231,6 +231,18 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#config_list_table').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
|
|
||||||
// Ensure the saved page is a valid number
|
// Ensure the saved page is a valid number
|
||||||
let savedPage =<?= $page ?? 0 ?>; // Default to 1 if not set
|
let savedPage =<?= $page ?? 0 ?>; // Default to 1 if not set
|
||||||
|
|
||||||
|
|||||||
@ -134,7 +134,7 @@
|
|||||||
<i class="fa fa-key" style="color:#02a8b5;"></i>
|
<i class="fa fa-key" style="color:#02a8b5;"></i>
|
||||||
</a>
|
</a>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<a data-toggle="modal" href="#ccwizard" data-id="<?php echo $record->id; ?>"
|
<a data-toggle="modal" class="edit-btn" href="#ccwizard" data-id="<?php echo $record->id; ?>"
|
||||||
data-name="<?php echo $record->CostCenterName; ?>"><i
|
data-name="<?php echo $record->CostCenterName; ?>"><i
|
||||||
class="fas fa-edit"></i> </a>
|
class="fas fa-edit"></i> </a>
|
||||||
<a onclick="confirmDelete(event)" style="cursor:pointer;" class="auditor-restricted-btn"
|
<a onclick="confirmDelete(event)" style="cursor:pointer;" class="auditor-restricted-btn"
|
||||||
@ -314,6 +314,18 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#cost_listing').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
|
|
||||||
// Date range filter function
|
// Date range filter function
|
||||||
$.fn.dataTable.ext.search.push(
|
$.fn.dataTable.ext.search.push(
|
||||||
function (settings, data, dataIndex) {
|
function (settings, data, dataIndex) {
|
||||||
|
|||||||
@ -168,7 +168,7 @@
|
|||||||
|
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
|
|
||||||
<a
|
<a class="edit-btn"
|
||||||
href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>"
|
href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>"
|
||||||
data-toggle="tooltip"
|
data-toggle="tooltip"
|
||||||
title="<?php echo $record->DEPCode ?> - Click here to View Department Details"><i
|
title="<?php echo $record->DEPCode ?> - Click here to View Department Details"><i
|
||||||
@ -236,6 +236,19 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
$('#department_list_table').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
|
|
||||||
// Date range filter function
|
// Date range filter function
|
||||||
$.fn.dataTable.ext.search.push(
|
$.fn.dataTable.ext.search.push(
|
||||||
function (settings, data, dataIndex) {
|
function (settings, data, dataIndex) {
|
||||||
|
|||||||
@ -196,7 +196,7 @@ if (!empty($master)) {
|
|||||||
<!-- edit section -->
|
<!-- edit section -->
|
||||||
|
|
||||||
<a
|
<a
|
||||||
class="editConfigurationBtn"
|
class="editConfigurationBtn edit-btn"
|
||||||
|
|
||||||
data-id="<?php echo $index; ?>"
|
data-id="<?php echo $index; ?>"
|
||||||
data-key="<?php echo $con->Key; ?>"
|
data-key="<?php echo $con->Key; ?>"
|
||||||
@ -840,10 +840,22 @@ if (!empty($master)) {
|
|||||||
<!-- data table added for the config value table -->
|
<!-- data table added for the config value table -->
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener("DOMContentLoaded", function () {
|
document.addEventListener("DOMContentLoaded", function () {
|
||||||
new DataTable("#configtable", {
|
var table = new DataTable("#configtable", {
|
||||||
paging: true, // Enable Pagination
|
paging: true, // Enable Pagination
|
||||||
ordering: true, // Enable Sorting
|
ordering: true, // Enable Sorting
|
||||||
searching: true // Enable Search
|
searching: true // Enable Search
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// $('#datatable').on('click', '.edit-btn', function () {
|
||||||
|
// const pageInfo = table.page.info(); // Now this works
|
||||||
|
// sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
// });
|
||||||
|
|
||||||
|
// // Restore page
|
||||||
|
// let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
// if (startPage !== null) {
|
||||||
|
// table.page(parseInt(startPage)).draw('page');
|
||||||
|
// sessionStorage.removeItem("datatablePage");
|
||||||
|
// }
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -170,7 +170,7 @@
|
|||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
|
|
||||||
|
|
||||||
<a data-toggle="tooltip"
|
<a data-toggle="tooltip" class="edit-btn"
|
||||||
href="<?php echo base_url() ?>loadView_updateFactoryMachineMasterDetail?id=<?php echo $record['id'] ?>">
|
href="<?php echo base_url() ?>loadView_updateFactoryMachineMasterDetail?id=<?php echo $record['id'] ?>">
|
||||||
<i class="fa fa-edit" data-toggle="tooltip"
|
<i class="fa fa-edit" data-toggle="tooltip"
|
||||||
title="Click here to Edit machine detail "></i>
|
title="Click here to Edit machine detail "></i>
|
||||||
@ -241,6 +241,18 @@
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
table.draw();
|
table.draw();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#datatable').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@ -181,7 +181,7 @@
|
|||||||
/*background-color: #fff;*/
|
/*background-color: #fff;*/
|
||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 4px;
|
padding: 5px 6px;
|
||||||
min-width: 120px;
|
min-width: 120px;
|
||||||
max-width: 120px;
|
max-width: 120px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -183,7 +183,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -187,7 +187,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -184,7 +184,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
|||||||
/*background-color: #fff;*/
|
/*background-color: #fff;*/
|
||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 4px;
|
padding: 5px 6px;
|
||||||
min-width: 120px;
|
min-width: 120px;
|
||||||
max-width: 120px;
|
max-width: 120px;
|
||||||
}
|
}
|
||||||
@ -452,7 +452,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
|||||||
|
|
||||||
<!-- additional entries modal -->
|
<!-- additional entries modal -->
|
||||||
<div class="modal fade" id="additionalEntriesModalId" tabindex="-1" role="dialog" aria-labelledby="additionalEntriesIdModalLabelId" aria-hidden="true">
|
<div class="modal fade" id="additionalEntriesModalId" tabindex="-1" role="dialog" aria-labelledby="additionalEntriesIdModalLabelId" aria-hidden="true">
|
||||||
<div class="modal-dialog modal-xl" style="width:900px;">
|
<div class="modal-dialog modal-xl" style="width:1000px;">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h4 class="modal-title" id="additionalEntriesIdModalLabelId">Add Entry</h4>
|
<h4 class="modal-title" id="additionalEntriesIdModalLabelId">Add Entry</h4>
|
||||||
@ -622,7 +622,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
|||||||
|
|
||||||
<!-- edit drier entry modal -->
|
<!-- edit drier entry modal -->
|
||||||
<div class="modal fade" id="editEntriesModalId" tabindex="-1" role="dialog" aria-labelledby="editEntriesIdModalLabelId" aria-hidden="true">
|
<div class="modal fade" id="editEntriesModalId" tabindex="-1" role="dialog" aria-labelledby="editEntriesIdModalLabelId" aria-hidden="true">
|
||||||
<div class="modal-dialog modal-xl" style="width:900px;">
|
<div class="modal-dialog modal-xl" style="width:1000px;">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h4 class="modal-title" id="editEntriesIdModalLabelId">Edit Drier Entry</h4>
|
<h4 class="modal-title" id="editEntriesIdModalLabelId">Edit Drier Entry</h4>
|
||||||
|
|||||||
@ -188,7 +188,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -173,7 +173,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1651,7 +1651,7 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#dwnldMoistureActualId , #dwnldMoistureSpecId , dwnldLossOfIgnitionId , #dwnldClayId , #dwnldGradeId , .celda_normal').on('input', function() {
|
$('#dwnldMoistureActualId , #dwnldMoistureSpecId , dwnldLossOfIgnitionId , #dwnldClayId , #dwnldGradeId').on('input', function() {
|
||||||
|
|
||||||
let input = $(this).text().trim();
|
let input = $(this).text().trim();
|
||||||
let isValid = checkIsNumber(input);
|
let isValid = checkIsNumber(input);
|
||||||
|
|||||||
@ -184,7 +184,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -188,7 +188,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -165,7 +165,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 2px 4px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#abstractTableId tbody td.celda_normal {
|
#abstractTableId tbody td.celda_normal {
|
||||||
|
|||||||
@ -173,7 +173,7 @@
|
|||||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #ccc;
|
border: 1px solid #ccc;
|
||||||
padding: 10px 6px;
|
padding: 5px 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -155,7 +155,7 @@
|
|||||||
|
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
|
|
||||||
<a class="a-tag-link"
|
<a class="a-tag-link edit-btn"
|
||||||
href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
|
href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
|
||||||
data-toggle="tooltip"
|
data-toggle="tooltip"
|
||||||
title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i
|
title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i
|
||||||
@ -428,6 +428,18 @@ function formatNumberToIndianCurrency(number) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#datatable').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
|
|
||||||
// Date range filter function
|
// Date range filter function
|
||||||
$.fn.dataTable.ext.search.push(
|
$.fn.dataTable.ext.search.push(
|
||||||
function (settings, data, dataIndex) {
|
function (settings, data, dataIndex) {
|
||||||
|
|||||||
@ -177,7 +177,7 @@
|
|||||||
<a data-toggle="modal" href="#transporterwizard"
|
<a data-toggle="modal" href="#transporterwizard"
|
||||||
data-id="<?php echo $record->id; ?>"
|
data-id="<?php echo $record->id; ?>"
|
||||||
data-name="<?php echo $record->name; ?>"><i
|
data-name="<?php echo $record->name; ?>"><i
|
||||||
class="fa fa-edit"></i> </a>
|
class="fa fa-edit edit-btn"></i> </a>
|
||||||
<a onclick="confirmDelete(event)"
|
<a onclick="confirmDelete(event)"
|
||||||
href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i
|
href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i
|
||||||
class="fa fa-trash auditor-restricted-btn"></i> </a>
|
class="fa fa-trash auditor-restricted-btn"></i> </a>
|
||||||
@ -351,6 +351,18 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#transporter_list').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
|
|
||||||
// Date range filter function
|
// Date range filter function
|
||||||
$.fn.dataTable.ext.search.push(
|
$.fn.dataTable.ext.search.push(
|
||||||
function (settings, data, dataIndex) {
|
function (settings, data, dataIndex) {
|
||||||
|
|||||||
@ -151,7 +151,7 @@
|
|||||||
<td>
|
<td>
|
||||||
<?php if ($record->isDeleted == 1) { ?>
|
<?php if ($record->isDeleted == 1) { ?>
|
||||||
<span class="auditor-restricted">
|
<span class="auditor-restricted">
|
||||||
<a class="auditor-restricted-btn" onclick="confirmReActivateUser(event)"
|
<a class="auditor-restricted-btn" onclick="confirmReActivateUser(event)"
|
||||||
href="<?php echo base_url() . 'user/reActivateUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
|
href="<?php echo base_url() . 'user/reActivateUser?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
|
||||||
<i class="fas fa-key"></i>
|
<i class="fas fa-key"></i>
|
||||||
</a>
|
</a>
|
||||||
@ -160,7 +160,7 @@
|
|||||||
|
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
|
|
||||||
<a href="<?php echo base_url() . 'user/editOld?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
|
<a class="edit-btn" href="<?php echo base_url() . 'user/editOld?UID=' . $record->userId . '&EMPID=' . $record->EmpID; ?>">
|
||||||
<i class="fas fa-edit"></i>
|
<i class="fas fa-edit"></i>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@ -207,6 +207,8 @@
|
|||||||
var answer = confirm(" Do you want to delete the user from the List?")
|
var answer = confirm(" Do you want to delete the user from the List?")
|
||||||
if (answer) {return;}else{event.preventDefault();}
|
if (answer) {return;}else{event.preventDefault();}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
$.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
|
$.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
|
||||||
@ -294,6 +296,19 @@
|
|||||||
toDateInput.value = fromDate;
|
toDateInput.value = fromDate;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
$('#user_list_table').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@ -304,3 +319,5 @@
|
|||||||
$("#archiveFormId").submit();
|
$("#archiveFormId").submit();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -252,7 +252,9 @@
|
|||||||
<td align="center"><?php echo $time; ?></td>
|
<td align="center"><?php echo $time; ?></td>
|
||||||
<td style="cursor:pointer; color:#0bb2b5" >
|
<td style="cursor:pointer; color:#0bb2b5" >
|
||||||
|
|
||||||
<a data-toggle="modal"
|
<a
|
||||||
|
class="edit-btn"
|
||||||
|
data-toggle="modal"
|
||||||
data-target="#Igrshow"
|
data-target="#Igrshow"
|
||||||
data-id="<?php echo $index;?>"
|
data-id="<?php echo $index;?>"
|
||||||
data-inx="<?php echo $index;?>"
|
data-inx="<?php echo $index;?>"
|
||||||
@ -512,8 +514,6 @@
|
|||||||
<th style="width: 50px;">Total Amt</th>
|
<th style="width: 50px;">Total Amt</th>
|
||||||
<th style="width: 150px;">Remarks </th>
|
<th style="width: 150px;">Remarks </th>
|
||||||
<th style="width: 25px;">Net Weight</th>
|
<th style="width: 25px;">Net Weight</th>
|
||||||
<th style="width: 25px; display:none" id="gasShortageHeader">Add Gas Shortage</th>
|
|
||||||
<th style="width: 25px; display:none" id="gasShortageListHeader">Gas Shortage list</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="tbleIGRAppend">
|
<tbody id="tbleIGRAppend">
|
||||||
@ -1287,21 +1287,6 @@
|
|||||||
'<input type="file" id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '" style="display:none;">' +
|
'<input type="file" id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '" style="display:none;">' +
|
||||||
'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' ;
|
'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' ;
|
||||||
|
|
||||||
|
|
||||||
let regex = /gas/i;
|
|
||||||
|
|
||||||
if(regex.test(item.MaterialCategory) ){
|
|
||||||
$('#gasShortageHeader').show();
|
|
||||||
$('#gasShortageListHeader').show();
|
|
||||||
trIGRHTML += '<td style="width: 25px; cursor:pointer;"><a target="_blank" data-toggle="modal" data-target="#gasShortageCalculator" title="gas Shortage Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-gas-pump" style="text-align: center;"></i></a> </td>' ;
|
|
||||||
trIGRHTML += '<td style="width: 25px; cursor:pointer;"><a target="_blank" data-toggle="modal" data-target="#gasShortageList" title="gas Shortage List" ><i class="fa fa-solid fa-list" style="text-align: center;"></i></a> </td>' ;
|
|
||||||
|
|
||||||
trIGRHTML +='</tr>';
|
|
||||||
}else{
|
|
||||||
trIGRHTML +='</tr>';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
|
if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
|
||||||
$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
|
$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
|
||||||
}
|
}
|
||||||
@ -1351,20 +1336,6 @@
|
|||||||
'<input type="file" id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '" style="display:none;">' +
|
'<input type="file" id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '" style="display:none;">' +
|
||||||
'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' ;
|
'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' ;
|
||||||
|
|
||||||
let regex = /gas/i;
|
|
||||||
|
|
||||||
if(regex.test(item.MaterialCategory) ){
|
|
||||||
$('#gasShortageHeader').show();
|
|
||||||
$('#gasShortageListHeader').show();
|
|
||||||
trIGRHTML += '<td style="width: 25px; cursor:pointer;"><a target="_blank" data-toggle="modal" data-target="#gasShortageCalculator" title="gas Shortage Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-gas-pump" style="text-align: center;"></i></a> </td>' ;
|
|
||||||
trIGRHTML += '<td style="width: 25px; cursor:pointer;"><a target="_blank" data-toggle="modal" data-target="#gasShortageList" title="gas Shortage List" ><i class="fa fa-solid fa-list" style="text-align: center;"></i></a> </td>' ;
|
|
||||||
|
|
||||||
trIGRHTML +='</tr>';
|
|
||||||
}else{
|
|
||||||
trIGRHTML +='</tr>';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
|
if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
|
||||||
$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
|
$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
|
||||||
}
|
}
|
||||||
@ -1415,20 +1386,6 @@
|
|||||||
'<input type="file" id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '">' +
|
'<input type="file" id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '">' +
|
||||||
'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">';
|
'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">';
|
||||||
|
|
||||||
let regex = /gas/i;
|
|
||||||
|
|
||||||
if(regex.test(item.MaterialCategory) ){
|
|
||||||
$('#gasShortageHeader').show();
|
|
||||||
$('#gasShortageListHeader').show();
|
|
||||||
trIGRHTML += '<td style="width: 25px; cursor:pointer;"><a target="_blank" data-toggle="modal" data-target="#gasShortageCalculator" title="gas Shortage Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-gas-pump" style="text-align: center;"></i></a> </td>' ;
|
|
||||||
trIGRHTML += '<td style="width: 25px; cursor:pointer;"><a target="_blank" data-toggle="modal" data-target="#gasShortageList" title="gas Shortage List" ><i class="fa fa-solid fa-list" style="text-align: center;"></i></a> </td>' ;
|
|
||||||
|
|
||||||
trIGRHTML +='</tr>';
|
|
||||||
}else{
|
|
||||||
trIGRHTML +='</tr>';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1467,8 +1424,6 @@
|
|||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$('#Igrshow').on("hide.bs.modal", function(e){
|
$('#Igrshow').on("hide.bs.modal", function(e){
|
||||||
$('#gasShortageHeader').hide();
|
|
||||||
$('#gasShortageListHeader').hide();
|
|
||||||
$('#existingContainer').empty();
|
$('#existingContainer').empty();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -2409,6 +2364,21 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#view_inward_gate_register').on('click', '.edit-btn', function () {
|
||||||
|
const pageInfo = table.page.info(); // Now this works
|
||||||
|
console.log("page number",pageInfo);
|
||||||
|
sessionStorage.setItem("datatablePage", pageInfo.page);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Restore page
|
||||||
|
let startPage = sessionStorage.getItem("datatablePage");
|
||||||
|
console.log('startpage',startPage);
|
||||||
|
if (startPage !== null) {
|
||||||
|
table.page(parseInt(startPage)).draw('page');
|
||||||
|
sessionStorage.removeItem("datatablePage");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Reset button functionality
|
// Reset button functionality
|
||||||
$("#resetButton").click(function() {
|
$("#resetButton").click(function() {
|
||||||
$("#fromDate").val('');
|
$("#fromDate").val('');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user