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

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-05 08:53:17 +00:00
commit dcfac6d1a2
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/Inwardgateregister.php
View File

@ -691,6 +691,7 @@ function viewIGRDetails()
$IGRNO = $this->request->getPost('id'); $IGRNO = $this->request->getPost('id');
$data['details'] = $this->inwardgateregister_model->viewigr($IGRNO); $data['details'] = $this->inwardgateregister_model->viewigr($IGRNO);
$TaxInPercentage = 0; $TaxInPercentage = 0;
for ($i = 0; $i < count($data['details']); $i++) { for ($i = 0; $i < count($data['details']); $i++) {
$details = $data['details'][$i]; $details = $data['details'][$i];

6
app/Views/editdepartment.php
View File

@ -186,6 +186,12 @@ $("#deptBtnId").on('click',function(){
let depCode =$("#DEPCode").val(); let depCode =$("#DEPCode").val();
let headDepCode = $("#HeadDept").val(); let headDepCode = $("#HeadDept").val();
if(departmentName.length<1){
alert(`Department Name cannot be empty..!!`);
return;
}
$('#loader').show(); $('#loader').show();
$.ajax({ $.ajax({
type:"POST", type:"POST",

27
app/Views/viewinwardgateregister.php
View File

@ -1273,8 +1273,9 @@
'<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(item.MaterialCategory == "gas"){ if(regex.test(item.MaterialCategory) ){
$('#gasShortageHeader').show(); $('#gasShortageHeader').show();
$('#gasShortageListHeader').show(); $('#gasShortageListHeader').show();
trIGRHTML += '<td style="width: 25px;"><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;"><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>' ;
@ -2461,8 +2462,17 @@
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#gasShortageCalculator').on("hide.bs.modal", function(e){ $('#gasShortageCalculator').on("hide.bs.modal", function(e){
$('#invoiceNoId').val(' '); $('#invoiceNoId').val(' ');
$('#fullCylinderDateId').val(" "); $('#fullCylinderDateId').val(" ");
$('#emptyCylinderDateId').val(" ");
$('#cylinderNoId').val(" ");
$('#grossWeightId').val(" ");
$('#tareWeightId').val(" ");
$('#actualWeightId').val(" ");
$('#netWeightId').val(" ");
$('#shortageId').val(" ");
}); });
}); });
</script> </script>
@ -2535,9 +2545,16 @@
<!-- while closing edit gas shortage modal --> <!-- while closing edit gas shortage modal -->
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#gasShortageCalculator').on("hide.bs.modal", function(e){ $('#editGasShortageCalculator').on("hide.bs.modal", function(e){
$('#editInvoiceNoId').val(' '); $('#editInvoiceNoId').val(' ');
$('#editFullCylinderDateId').val(" "); $('#editFullCylinderDateId').val(" ");
$('#editEmptyCylinderDateId').val(" ");
$('#editCylinderNoId').val(" ");
$('#editGrossWeightId').val(" ");
$('#editTareWeightId').val(" ");
$('#editActualWeightId').val(" ");
$('#editNetWeightId').val(" ");
$('#editShortageId').val(" ");
}); });
}); });
</script> </script>
@ -2572,6 +2589,8 @@
console.log(response.data); console.log(response.data);
let data = response.data ; let data = response.data ;
console.log("gas shortage list");
console.log(data);
let tableData = ''; let tableData = '';
data.forEach((val) => { data.forEach((val) => {
@ -2601,7 +2620,7 @@
// Assuming you have a table with ID "gasShortageTable" // Assuming you have a table with ID "gasShortageTable"
$("#gasShortageTable tbody").html(tableData); $("#gasShortageTable tbody").html(tableData);
} else { } else {