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:
Gowtham M 2025-01-23 10:42:01 +05:30
commit 1e9315800b
5 changed files with 199 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/StockController.php
View File

@ -474,7 +474,10 @@ class StockController extends BaseController
'salableQty' => $postData['salableQty'], 'salableQty' => $postData['salableQty'],
'testedBy' => $postData['testedBy'], 'testedBy' => $postData['testedBy'],
'approvedBy' => $postData['approvedBy'], 'approvedBy' => $postData['approvedBy'],
'clayOrLossOfIgnitionPercent' => $postData['clayOrLossOfIgnition'], 'clayOrLossOfIgnition' => $postData['clayOrLossOfIgnition'],
'reportComments' => $postData['reportComments'],
'gradeRange' => $postData['gradeRange'],
'reportTime' => $postData['reportTime']
]; ];

3
app/Models/IncomingSilicaSandDetailsModel.php
View File

@ -15,7 +15,8 @@ class IncomingSilicaSandDetailsModel extends Model
protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition', protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition',
'_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300', '_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300',
'pan' , 'total' , 'afsSpec' ,'afsActual','plus20Loss','plus30Loss','moistureSpec','moistureActual', 'pan' , 'total' , 'afsSpec' ,'afsActual','plus20Loss','plus30Loss','moistureSpec','moistureActual',
'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark','testedBy','approvedBy' , 'clayOrLossOfIgnitionPercent', 'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark',
'testedBy','approvedBy' , 'clayOrLossOfIgnition','reportComments','gradeRange','reportTime',
'is_active','created_at','updated_at']; 'is_active','created_at','updated_at'];
protected bool $allowEmptyInserts = false; protected bool $allowEmptyInserts = false;

38
app/Views/drierMachineDetails.php
View File

@ -104,22 +104,35 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
} }
.celda_encabezado_general {
th.celda_encabezado_general {
background-color: #00a65a; background-color: #00a65a;
border: 1px solid #ccc; border: 1px solid #ccc;
color: #ffffff; color: #ffffff;
font-weight: bold; font-weight: bold;
padding: 2px 4px; padding: 2px 4px;
text-align: center; text-align: center;
min-width: 150px; /* Set a fixed width */
max-width: 150px; /* Ensure it doesn't exceed this width */
white-space: nowrap; /* Prevent text from wrapping */
overflow: hidden; /* Hide overflowing content */
text-overflow: ellipsis; /* Show "..." for overflow text */
} }
.celda_encabezado_total { .celda_encabezado_total {
background-color:#ffffff; background-color:#ffffff;
border: 1px solid #ccc; border: 1px solid #ccc;
color: #ffffff; color: #ffffff;
font-weight: bold; font-weight: bold;
padding: 6px 10px; padding: 2px 4px;
text-align: center; text-align: center;
min-width: 150px; /* Set a fixed width */
max-width: 150px; /* Ensure it doesn't exceed this width */
white-space: nowrap; /* Prevent text from wrapping */
overflow: hidden; /* Hide overflowing content */
text-overflow: ellipsis; /* Show "..." for overflow text */
} }
._Separador { ._Separador {
@ -135,10 +148,14 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
} }
.celda_normal { .celda_normal {
/*background-color: #fff;*/
/* <!-- ad9271 into ffffff brown-light to green-light --> */
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 2px 4px; padding: 2px 4px;
min-width: 150px; /* Set a fixed width */
max-width: 150px; /* Ensure it doesn't exceed this width */
white-space: nowrap; /* Prevent text from wrapping */
overflow: hidden; /* Hide overflowing content */
text-overflow: ellipsis; /* Show "..." for overflow text */
} }
/*style excel*/ /*style excel*/
@ -170,7 +187,10 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
#drierTable th:nth-child(1) { #drierTable th:nth-child(1),
#drierTable td:nth-child(1),
#drierTableSummaryId th:nth-child(1),
#drierTableSummaryId td:nth-child(1) {
position: sticky; position: sticky;
left: 0; left: 0;
background-color: #00a65a; background-color: #00a65a;
@ -179,14 +199,6 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
color: #ffffff; color: #ffffff;
} }
#drierTable td:nth-child(1) {
position: sticky;
left: 0;
background-color:#00a65a;
z-index: 2;
border-right: 2px solid #ddd;
color: #ffffff;
}
</style> </style>

134
app/Views/gasStockDetails.php
View File

@ -299,53 +299,53 @@
<?php if($index==0){echo"contenteditable='true'";}?> <?php if($index==0){echo"contenteditable='true'";}?>
oninput="openingStockChange(this)" oninput="openingStockChange(this)"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
><?=$gasStockDetail['opening']??'0'?></td> ><?=$gasStockDetail['opening'] ?? ' '?></td>
<td class="celda_normal purchaseBharath" <td class="celda_normal purchaseBharath"
oninput="purchaseBharathStockChange(this)" oninput="purchaseBharathStockChange(this)"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
contenteditable="true"><?=$gasStockDetail['purchaseBharath']??'0'?></td> contenteditable="true"><?=$gasStockDetail['purchaseBharath'] ?? ' '?></td>
<td class="celda_normal purchaseIndian" <td class="celda_normal purchaseIndian"
oninput="purchaseIndianStockChange(this)" oninput="purchaseIndianStockChange(this)"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
contenteditable="true"><?=$gasStockDetail['purchaseIndian']??'0'?></td> contenteditable="true"><?=$gasStockDetail['purchaseIndian'] ?? ' '?></td>
<td class="celda_normal total" <td class="celda_normal total"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
><?=$gasStockDetail['total']??'0'?></td> ><?=$gasStockDetail['total'] ?? ' '?></td>
<td class="celda_normal consumption" <td class="celda_normal consumption"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
><?=$gasStockDetail['consumption']??'0'?></td> ><?=$gasStockDetail['consumption'] ?? ' '?></td>
<td class="celda_normal balanceStock" <td class="celda_normal balanceStock"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
><?=$gasStockDetail['balanceStock']??'0'?></td> ><?=$gasStockDetail['balanceStock'] ?? ' '?></td>
<td class="celda_normal tenTonGasConsumption" <td class="celda_normal tenTonGasConsumption"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
><?=$gasStockDetail['drierMachineGasConsumption']??'0'?></td> ><?=$gasStockDetail['drierMachineGasConsumption'] ?? ' '?></td>
<td class="celda_normal"> <td class="celda_normal">
<?=$gasStockDetail['sandDried']??'0'?></td> <?=$gasStockDetail['sandDried'] ?? ' '?></td>
<td class="celda_normal coatingGasConsumption" <td class="celda_normal coatingGasConsumption"
data-id="<?=$gasStockDetail['date']?>" > data-id="<?=$gasStockDetail['date']?>" >
<?=$gasStockDetail['coatingMachineGasconsumption']??'0'?></td> <?=$gasStockDetail['coatingMachineGasconsumption'] ?? ' '?></td>
<td class="celda_normal"> <td class="celda_normal">
<?=$gasStockDetail['coatedSand']??'0'?></td> <?=$gasStockDetail['coatedSand'] ?? ' '?></td>
<td class="celda_normal trpGasConsumption" <td class="celda_normal trpGasConsumption"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
oninput = "gasConsumptionChange(this)" oninput = "gasConsumptionChange(this)"
contenteditable="true" > contenteditable="true" >
<?=$gasStockDetail['trpMachineGasconsumption']??'0'?></td> <?=$gasStockDetail['trpMachineGasconsumption'] ?? ' '?></td>
<td class="celda_normal" <td class="celda_normal"
contenteditable="true" > contenteditable="true" >
<?=$gasStockDetail['sandTrp']??'0'?> <?=$gasStockDetail['sandTrp'] ?? ' '?>
</td> </td>
<td class="celda_normal rotaryGasConsumption" <td class="celda_normal rotaryGasConsumption"
data-id="<?=$gasStockDetail['date']?>" data-id="<?=$gasStockDetail['date']?>"
oninput = "gasConsumptionChange(this)" oninput = "gasConsumptionChange(this)"
contenteditable="true" > contenteditable="true" >
<?=$gasStockDetail['rotaryDrierMachineGasconsumption']??'0'?> <?=$gasStockDetail['rotaryDrierMachineGasconsumption'] ?? ' '?>
</td> </td>
</tr> </tr>
@ -392,48 +392,48 @@
<?php if($datesInMonthIndex==0){echo"contenteditable='true'";}?> <?php if($datesInMonthIndex==0){echo"contenteditable='true'";}?>
oninput="openingStockChange(this)" oninput="openingStockChange(this)"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
><?= $previousMonthGasStockDetails[0]['balanceStock'] ??'0' ?></td> ><?= $previousMonthGasStockDetails[0]['balanceStock'] ?? ' ' ?></td>
<td class="celda_normal purchaseBharath" <td class="celda_normal purchaseBharath"
oninput="purchaseBharathStockChange(this)" oninput="purchaseBharathStockChange(this)"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
contenteditable="true">0</td> contenteditable="true"> </td>
<td class="celda_normal purchaseIndian" <td class="celda_normal purchaseIndian"
oninput="purchaseIndianStockChange(this)" oninput="purchaseIndianStockChange(this)"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
contenteditable="true">0</td> contenteditable="true"> </td>
<td class="celda_normal total" <td class="celda_normal total"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
>0</td> > </td>
<td class="celda_normal consumption" <td class="celda_normal consumption"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
>0</td> > </td>
<td class="celda_normal balanceStock" <td class="celda_normal balanceStock"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
><?= $previousMonthGasStockDetails[0]['balanceStock'] ??'0' ?></td> ><?= $previousMonthGasStockDetails[0]['balanceStock'] ?? ' ' ?></td>
<td class="celda_normal tenTonGasConsumption" <td class="celda_normal tenTonGasConsumption"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
>0</td> > </td>
<td class="celda_normal">0</td> <td class="celda_normal"> </td>
<td class="celda_normal coatingGasConsumption" <td class="celda_normal coatingGasConsumption"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
>0</td> > </td>
<td class="celda_normal">0</td> <td class="celda_normal"> </td>
<td class="celda_normal trpGasConsumption" <td class="celda_normal trpGasConsumption"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
contenteditable="true" contenteditable="true"
oninput = "gasConsumptionChange(this)" oninput = "gasConsumptionChange(this)"
>0</td> > </td>
<td class="celda_normal" <td class="celda_normal"
contenteditable="true" contenteditable="true"
>0</td> > </td>
<td class="celda_normal rotaryGasConsumption" <td class="celda_normal rotaryGasConsumption"
data-id="<?=$dateInMonth?>" data-id="<?=$dateInMonth?>"
contenteditable="true" contenteditable="true"
oninput = "gasConsumptionChange(this)" oninput = "gasConsumptionChange(this)"
>0</td> > </td>
</tr> </tr>
<?php } <?php }
}?> }?>
@ -615,12 +615,12 @@
const rowData = { const rowData = {
date, date,
opening: rowCells.eq(1).text().trim()|| '0', opening: rowCells.eq(1).text().trim()|| ' ',
purchaseBharath: rowCells.eq(2).text().trim()|| '0', purchaseBharath: rowCells.eq(2).text().trim()|| ' ',
purchaseIndian: rowCells.eq(3).text().trim()|| '0', purchaseIndian: rowCells.eq(3).text().trim()|| ' ',
total: rowCells.eq(4).text().trim()|| '0', total: rowCells.eq(4).text().trim()|| ' ',
consumption: rowCells.eq(5).text().trim()|| '0', consumption: rowCells.eq(5).text().trim()|| ' ',
balanceStock: rowCells.eq(6).text().trim()|| '0' balanceStock: rowCells.eq(6).text().trim()|| ' '
}; };
rows.push(rowData); rows.push(rowData);
@ -640,10 +640,10 @@
try{ try{
let dataId = tdElement.getAttribute('data-id'); let dataId = tdElement.getAttribute('data-id');
let date = dataId; let date = dataId;
let openingStock = tdElement.innerText; let openingStock = validateInput(tdElement.innerText);
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText);
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption); let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption);
@ -664,10 +664,10 @@
try{ try{
let dataId = tdElement.getAttribute('data-id'); let dataId = tdElement.getAttribute('data-id');
let date = dataId; let date = dataId;
let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText; let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText) ;
let purchaseBharathStock = tdElement.innerText; let purchaseBharathStock = validateInput(tdElement.innerText) ;
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText) ;
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText) ;
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption); let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption);
@ -684,17 +684,15 @@
} }
} }
function purchaseIndianStockChange(tdElement) { function purchaseIndianStockChange(tdElement) {
try{ try{
let dataId = tdElement.getAttribute('data-id'); let dataId = tdElement.getAttribute('data-id');
let date = dataId; let date = dataId;
let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText; let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText);
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
let purchaseIndianStock = tdElement.innerText; let purchaseIndianStock = validateInput(tdElement.innerText);
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption); let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption);
@ -718,18 +716,18 @@
let date = dataId; let date = dataId;
//total gas consumption //total gas consumption
let tenTonGasConsumption = document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText; let tenTonGasConsumption = validateInput(document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText);
let coatingGasConsumption = document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText; let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText);
let trpGasConsumption = document.querySelector(`td.trpGasConsumption[data-id="${dataId}"]`).innerText; let trpGasConsumption = validateInput(document.querySelector(`td.trpGasConsumption[data-id="${dataId}"]`).innerText);
let rotaryGasConsumption = document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText; let rotaryGasConsumption = validateInput(document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText);
let toatalGasConsumption = Number(tenTonGasConsumption) + Number (coatingGasConsumption) + Number(trpGasConsumption) + Number(rotaryGasConsumption) ; let toatalGasConsumption = Number(tenTonGasConsumption) + Number (coatingGasConsumption) + Number(trpGasConsumption) + Number(rotaryGasConsumption) ;
//total gas purchase and opening addition //total gas purchase and opening addition
let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText; let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText);
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText);
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
@ -773,11 +771,11 @@
let openingStock = currentBalanceStock ; let openingStock = currentBalanceStock ;
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText; let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText; let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText);
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText; let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock); let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
@ -871,3 +869,27 @@ function convertToDate(dateString) {
} }
</script> </script>
<script>
function validateInput(input) {
if (input == '' || input == ' ' || input == '-') {
return 0;
}
if (typeof input === 'string' && input.split('').map(char => char.charCodeAt(0))[0] == 10) {
return 0;
}
// Validate against the regex
const isValid = /^-?\d*\.?\d*$/.test(input);
if (!isValid) {
alert('Invalid input! Please enter a valid number.');
return 0;
}
return input;
}
</script>

120
app/Views/incomingSilicaSandDetails.php
View File

@ -350,6 +350,19 @@
$summary = [] ; $summary = [] ;
if (!isset($summary['Qty'])) {
$summary['Qty'] = 0 ;
$summary['plus20Loss'] = 0 ;
$summary['moistureSpec'] = 0 ;
$summary['moistureActual'] = 0 ;
$summary['moistureLoss'] = 0 ;
$summary['moistureLossQty'] = 0 ;
$summary['sieveLossQty'] = 0 ;
$summary['salableQty'] = 0 ;
}
foreach ($igrDetails as $record) { foreach ($igrDetails as $record) {
// dd($record); // dd($record);
$row++; $row++;
@ -574,6 +587,7 @@
<?php echo $record['id'] ?? ' '; ?> <?php echo $record['id'] ?? ' '; ?>
</td> </td>
<!-- 'td:eq(36)' --> <!-- 'td:eq(36)' -->
<td style="display: none;"> <td style="display: none;">
<?php echo $record['clayOrLossOfIgnition'] ?? ' '; ?> <?php echo $record['clayOrLossOfIgnition'] ?? ' '; ?>
@ -590,25 +604,27 @@
<?php echo $record['approvedBy'] ?? ' '; ?> <?php echo $record['approvedBy'] ?? ' '; ?>
</td> </td>
<!-- 'td:eq(39)' -->
<td style="display: none;">
<?php echo $record['reportComments'] ?? ' '; ?>
</td>
<!-- 'td:eq(40)' -->
<td style="display: none;">
<?php echo $record['gradeRange'] ?? ' '; ?>
</td>
<!-- 'td:eq(41)' -->
<td style="display: none;">
<?php echo $record['reportTime'] ?? ' '; ?>
</td>
</tr> </tr>
<?php <?php
//before closing inner loop //before closing inner loop
if (!isset($summary['Qty'])) {
$summary['Qty'] = 0 ;
$summary['plus20Loss'] = 0 ;
$summary['moistureSpec'] = 0 ;
$summary['moistureActual'] = 0 ;
$summary['moistureLoss'] = 0 ;
$summary['moistureLossQty'] = 0 ;
$summary['sieveLossQty'] = 0 ;
$summary['salableQty'] = 0 ;
}
$summary['Qty'] += $record['Qty'] == " " ? 0 : (float) $record['Qty'] ; $summary['Qty'] += $record['Qty'] == " " ? 0 : (float) $record['Qty'] ;
$summary['plus20Loss'] += $record['plus20Loss'] == " " ? 0 : (float) $record['plus20Loss'] ; $summary['plus20Loss'] += $record['plus20Loss'] == " " ? 0 : (float) $record['plus20Loss'] ;
$summary['moistureSpec'] += $record['moistureSpec'] == " " ? 0 : (float) $record['moistureSpec'] ; $summary['moistureSpec'] += $record['moistureSpec'] == " " ? 0 : (float) $record['moistureSpec'] ;
@ -618,7 +634,6 @@
$summary['sieveLossQty'] += $record['sieveLossQty'] == " " ? 0 : (float) $record['sieveLossQty'] ; $summary['sieveLossQty'] += $record['sieveLossQty'] == " " ? 0 : (float) $record['sieveLossQty'] ;
$summary['salableQty'] += $record['salableQty'] ?? $record['Qty'] ; $summary['salableQty'] += $record['salableQty'] ?? $record['Qty'] ;
} ?> } ?>
</tbody> </tbody>
@ -628,7 +643,7 @@
<thead> <thead>
<tr> <tr>
<th class="celda_encabezado_total" style="padding: 10px;">S.NO </th> <th class="celda_encabezado_total" style="padding: 10px;">total </th>
<th class="celda_encabezado_total" style="padding: 10px;">IGR No-xxx</th> <th class="celda_encabezado_total" style="padding: 10px;">IGR No-xxx</th>
<th class="celda_encabezado_total" style="padding: 10px;">Invoice No-123</th> <th class="celda_encabezado_total" style="padding: 10px;">Invoice No-123</th>
<th class="celda_encabezado_total" style="padding: 10px;">22-01-2025</th> <th class="celda_encabezado_total" style="padding: 10px;">22-01-2025</th>
@ -660,31 +675,31 @@
<tr> <tr>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" style="background-color:rgb(189, 9, 6); color:#fff ;"> <h5 style="color:#fff;"> total </h5> </td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" ><?=$summary['Qty']?></td> <td class="celda_normal" ><?=$summary['Qty']?></td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" ><?=$summary['plus20Loss']?></td> <td class="celda_normal" ><?=$summary['plus20Loss']?></td>
<td class="celda_encabezado_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_encabezado_normal" ><?=$summary['moistureSpec'] ?></td> <td class="celda_normal" ><?=$summary['moistureSpec'] ?></td>
<td class="celda_encabezado_normal" ><?=$summary['moistureActual']?></td> <td class="celda_normal" ><?=$summary['moistureActual']?></td>
<td class="celda_encabezado_normal" ><?=$summary['moistureLoss']?></td> <td class="celda_normal" ><?=$summary['moistureLoss']?></td>
<td class="celda_encabezado_normal" ><?=$summary['moistureLossQty']?></td> <td class="celda_normal" ><?=$summary['moistureLossQty']?></td>
<td class="celda_encabezado_normal" ><?=$summary['sieveLossQty']?></td> <td class="celda_normal" ><?=$summary['sieveLossQty']?></td>
<td class="celda_encabezado_normal" ><?=$summary['salableQty']?></td> <td class="celda_normal" ><?=$summary['salableQty']?></td>
@ -826,11 +841,13 @@
<td contenteditable="true" oninput="calculateRow(value='moistureValue')" <td contenteditable="true" oninput="calculateRow(value='moistureValue')"
id="dwnldMoistureActualId"> </td> id="dwnldMoistureActualId"> </td>
</tr> </tr>
<tr> <tr>
<td style="text-align: left !important; width:25%;"><b>Moisture Spec %</b></td> <td style="text-align: left !important; width:25%;"><b>Moisture Spec %</b></td>
<td contenteditable="true" oninput="calculateRow(value='moistureValue')" <td contenteditable="true" oninput="calculateRow(value='moistureValue')"
id="dwnldMoistureSpecId"> </td> id="dwnldMoistureSpecId"> </td>
</tr> </tr>
<tr> <tr>
</tbody> </tbody>
@ -987,7 +1004,7 @@
</tr> </tr>
<tr> <tr>
<td style="text-align: left !important; height: 50px;"><b>Remarks</b></td> <td style="text-align: left !important; height: 50px;"><b>Remarks</b></td>
<td contenteditable="true"></td> <td id="dwnldReportCommentsId" contenteditable="true"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -1066,7 +1083,10 @@
<input type="hidden" name="salableQty" id="salableQty" value=""> <input type="hidden" name="salableQty" id="salableQty" value="">
<input type="hidden" name="testedBy" id="testedBy" value=""> <input type="hidden" name="testedBy" id="testedBy" value="">
<input type="hidden" name="approvedBy" id="approvedBy" value=""> <input type="hidden" name="approvedBy" id="approvedBy" value="">
<input type="hidden" name="clayOrLossOfIgnitionPercent" id="clayOrLossOfIgnitionPercent" value=""> <input type="hidden" name="clayOrLossOfIgnition" id="clayOrLossOfIgnition" value="">
<input type="hidden" name="reportsComments" id="reportComments" value="">
<input type="hidden" name="gradeRange" id="gradeRange" value="">
<input type="hidden" name="reportTime" id="reportTime" value="">
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
@ -1134,6 +1154,9 @@
let clayOrLossOfIgnition = row.find('td:eq(36)').text().trim(); let clayOrLossOfIgnition = row.find('td:eq(36)').text().trim();
let testedBy = row.find('td:eq(37)').text().trim(); let testedBy = row.find('td:eq(37)').text().trim();
let approvedBy = row.find('td:eq(38)').text().trim(); let approvedBy = row.find('td:eq(38)').text().trim();
let reportComments = row.find('td:eq(39)').text().trim();
let gradeRange = row.find('td:eq(40)').text().trim();
let reportTime = row.find('td:eq(41)').text().trim();
@ -1147,12 +1170,17 @@
$('#dwnldSupplierNameId').text(supplierName); $('#dwnldSupplierNameId').text(supplierName);
$('#dwnldVehicleNoId').text(vehicleNo); $('#dwnldVehicleNoId').text(vehicleNo);
$('#dwnldQtyId').text(qty); $('#dwnldQtyId').text(qty);
$('#dwnldReportCommentsId').text(reportComments);
$('#dwnldGradeId').text(gradeRange);
$('#dwnldTimeId').text(reportTime);
if(sandType.trim().toLowerCase() == "silica sand"){ if(sandType.trim().toLowerCase() == "silica sand"){
$('#dwnldLossOfIgnitionRowId').hide(); $('#dwnldLossOfIgnitionRowId').hide();
$('#dwnldClayRowId').show(); $('#dwnldClayRowId').show();
console.log("inside silica sand");
console.log(clayOrLossOfIgnition)
$('#dwnldClayId').text(clayOrLossOfIgnition); $('#dwnldClayId').text(clayOrLossOfIgnition);
@ -1160,6 +1188,8 @@
$('#dwnldClayRowId').hide(); $('#dwnldClayRowId').hide();
$('#dwnldLossOfIgnitionRowId').show(); $('#dwnldLossOfIgnitionRowId').show();
console.log("inside waste core");
console.log(clayOrLossOfIgnition);
$('#dwnldLossOfIgnitionId').text(clayOrLossOfIgnition); $('#dwnldLossOfIgnitionId').text(clayOrLossOfIgnition);
} }
@ -1278,7 +1308,10 @@
$('#approvedBy').val(approvedBy); $('#approvedBy').val(approvedBy);
$('#testedById').val(testedBy); $('#testedById').val(testedBy);
$('#approvedById').val(approvedBy); $('#approvedById').val(approvedBy);
$('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition); $('#clayOrLossOfIgnition').val(clayOrLossOfIgnition);
$('#reportComments').val(reportComments);
$('#gradeRange').val(gradeRange);
$('#reportTime').val(reportTime);
@ -1581,11 +1614,14 @@ $(document).ready(function() {
gradeCondition : $('#dwnldGradeId').text(), gradeCondition : $('#dwnldGradeId').text(),
testedBy : $('#testedById').val(), testedBy : $('#testedById').val(),
approvedBy : $('#approvedById').val(), approvedBy : $('#approvedById').val(),
clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text() clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text() ,
reportComments : $('#dwnldReportCommentsId').text(),
gradeRange : $('#dwnldGradeId').text(),
reportTime : $('#dwnldTimeId').text()
}, },
success: function(data){ success: function(data){
alert("Data Saved Successfully..!!"); alert("Data Saved Successfully..!!");
// window.location.reload(); window.location.reload();
}, },
error : function(xhr, status, error){ error : function(xhr, status, error){
alert("An error occurred while processing the request. Please try again."); alert("An error occurred while processing the request. Please try again.");