Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
1e9315800b
@ -474,7 +474,10 @@ class StockController extends BaseController
|
||||
'salableQty' => $postData['salableQty'],
|
||||
'testedBy' => $postData['testedBy'],
|
||||
'approvedBy' => $postData['approvedBy'],
|
||||
'clayOrLossOfIgnitionPercent' => $postData['clayOrLossOfIgnition'],
|
||||
'clayOrLossOfIgnition' => $postData['clayOrLossOfIgnition'],
|
||||
'reportComments' => $postData['reportComments'],
|
||||
'gradeRange' => $postData['gradeRange'],
|
||||
'reportTime' => $postData['reportTime']
|
||||
|
||||
];
|
||||
|
||||
|
||||
@ -15,7 +15,8 @@ class IncomingSilicaSandDetailsModel extends Model
|
||||
protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition',
|
||||
'_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300',
|
||||
'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'];
|
||||
|
||||
protected bool $allowEmptyInserts = false;
|
||||
|
||||
@ -104,22 +104,35 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
}
|
||||
|
||||
|
||||
.celda_encabezado_general {
|
||||
|
||||
|
||||
th.celda_encabezado_general {
|
||||
background-color: #00a65a;
|
||||
border: 1px solid #ccc;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
padding: 2px 4px;
|
||||
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 {
|
||||
background-color:#ffffff;
|
||||
border: 1px solid #ccc;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
padding: 6px 10px;
|
||||
padding: 2px 4px;
|
||||
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 {
|
||||
@ -135,10 +148,14 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
}
|
||||
|
||||
.celda_normal {
|
||||
/*background-color: #fff;*/
|
||||
/* <!-- ad9271 into ffffff brown-light to green-light --> */
|
||||
|
||||
border: 1px solid #ccc;
|
||||
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*/
|
||||
@ -170,23 +187,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
|
||||
|
||||
|
||||
#drierTable th:nth-child(1) {
|
||||
position: sticky;
|
||||
left: 0;
|
||||
background-color: #00a65a;
|
||||
z-index: 2;
|
||||
border-right: 2px solid #ddd;
|
||||
color: #ffffff;
|
||||
}
|
||||
#drierTable th:nth-child(1),
|
||||
#drierTable td:nth-child(1),
|
||||
#drierTableSummaryId th:nth-child(1),
|
||||
#drierTableSummaryId td:nth-child(1) {
|
||||
position: sticky;
|
||||
left: 0;
|
||||
background-color: #00a65a;
|
||||
z-index: 2;
|
||||
border-right: 2px solid #ddd;
|
||||
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>
|
||||
|
||||
@ -299,53 +299,53 @@
|
||||
<?php if($index==0){echo"contenteditable='true'";}?>
|
||||
oninput="openingStockChange(this)"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['opening']??'0'?></td>
|
||||
><?=$gasStockDetail['opening'] ?? ' '?></td>
|
||||
<td class="celda_normal purchaseBharath"
|
||||
oninput="purchaseBharathStockChange(this)"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseBharath']??'0'?></td>
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseBharath'] ?? ' '?></td>
|
||||
|
||||
<td class="celda_normal purchaseIndian"
|
||||
oninput="purchaseIndianStockChange(this)"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseIndian']??'0'?></td>
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseIndian'] ?? ' '?></td>
|
||||
|
||||
<td class="celda_normal total"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['total']??'0'?></td>
|
||||
><?=$gasStockDetail['total'] ?? ' '?></td>
|
||||
<td class="celda_normal consumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['consumption']??'0'?></td>
|
||||
><?=$gasStockDetail['consumption'] ?? ' '?></td>
|
||||
<td class="celda_normal balanceStock"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['balanceStock']??'0'?></td>
|
||||
><?=$gasStockDetail['balanceStock'] ?? ' '?></td>
|
||||
<td class="celda_normal tenTonGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['drierMachineGasConsumption']??'0'?></td>
|
||||
><?=$gasStockDetail['drierMachineGasConsumption'] ?? ' '?></td>
|
||||
<td class="celda_normal">
|
||||
<?=$gasStockDetail['sandDried']??'0'?></td>
|
||||
<?=$gasStockDetail['sandDried'] ?? ' '?></td>
|
||||
<td class="celda_normal coatingGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>" >
|
||||
<?=$gasStockDetail['coatingMachineGasconsumption']??'0'?></td>
|
||||
<?=$gasStockDetail['coatingMachineGasconsumption'] ?? ' '?></td>
|
||||
<td class="celda_normal">
|
||||
<?=$gasStockDetail['coatedSand']??'0'?></td>
|
||||
<?=$gasStockDetail['coatedSand'] ?? ' '?></td>
|
||||
|
||||
<td class="celda_normal trpGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['trpMachineGasconsumption']??'0'?></td>
|
||||
<?=$gasStockDetail['trpMachineGasconsumption'] ?? ' '?></td>
|
||||
|
||||
<td class="celda_normal"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['sandTrp']??'0'?>
|
||||
<?=$gasStockDetail['sandTrp'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<td class="celda_normal rotaryGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['rotaryDrierMachineGasconsumption']??'0'?>
|
||||
<?=$gasStockDetail['rotaryDrierMachineGasconsumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
@ -392,48 +392,48 @@
|
||||
<?php if($datesInMonthIndex==0){echo"contenteditable='true'";}?>
|
||||
oninput="openingStockChange(this)"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
><?= $previousMonthGasStockDetails[0]['balanceStock'] ??'0' ?></td>
|
||||
><?= $previousMonthGasStockDetails[0]['balanceStock'] ?? ' ' ?></td>
|
||||
<td class="celda_normal purchaseBharath"
|
||||
oninput="purchaseBharathStockChange(this)"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true">0</td>
|
||||
contenteditable="true"> </td>
|
||||
|
||||
<td class="celda_normal purchaseIndian"
|
||||
oninput="purchaseIndianStockChange(this)"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true">0</td>
|
||||
contenteditable="true"> </td>
|
||||
|
||||
<td class="celda_normal total"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
>0</td>
|
||||
> </td>
|
||||
<td class="celda_normal consumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
>0</td>
|
||||
> </td>
|
||||
<td class="celda_normal balanceStock"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
><?= $previousMonthGasStockDetails[0]['balanceStock'] ??'0' ?></td>
|
||||
><?= $previousMonthGasStockDetails[0]['balanceStock'] ?? ' ' ?></td>
|
||||
|
||||
<td class="celda_normal tenTonGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
>0</td>
|
||||
<td class="celda_normal">0</td>
|
||||
> </td>
|
||||
<td class="celda_normal"> </td>
|
||||
<td class="celda_normal coatingGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
>0</td>
|
||||
<td class="celda_normal">0</td>
|
||||
> </td>
|
||||
<td class="celda_normal"> </td>
|
||||
<td class="celda_normal trpGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
>0</td>
|
||||
> </td>
|
||||
<td class="celda_normal"
|
||||
contenteditable="true"
|
||||
>0</td>
|
||||
> </td>
|
||||
<td class="celda_normal rotaryGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
>0</td>
|
||||
> </td>
|
||||
</tr>
|
||||
<?php }
|
||||
}?>
|
||||
@ -615,12 +615,12 @@
|
||||
|
||||
const rowData = {
|
||||
date,
|
||||
opening: rowCells.eq(1).text().trim()|| '0',
|
||||
purchaseBharath: rowCells.eq(2).text().trim()|| '0',
|
||||
purchaseIndian: rowCells.eq(3).text().trim()|| '0',
|
||||
total: rowCells.eq(4).text().trim()|| '0',
|
||||
consumption: rowCells.eq(5).text().trim()|| '0',
|
||||
balanceStock: rowCells.eq(6).text().trim()|| '0'
|
||||
opening: rowCells.eq(1).text().trim()|| ' ',
|
||||
purchaseBharath: rowCells.eq(2).text().trim()|| ' ',
|
||||
purchaseIndian: rowCells.eq(3).text().trim()|| ' ',
|
||||
total: rowCells.eq(4).text().trim()|| ' ',
|
||||
consumption: rowCells.eq(5).text().trim()|| ' ',
|
||||
balanceStock: rowCells.eq(6).text().trim()|| ' '
|
||||
};
|
||||
|
||||
rows.push(rowData);
|
||||
@ -640,14 +640,14 @@
|
||||
try{
|
||||
let dataId = tdElement.getAttribute('data-id');
|
||||
let date = dataId;
|
||||
let openingStock = tdElement.innerText;
|
||||
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText;
|
||||
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText;
|
||||
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText;
|
||||
let openingStock = validateInput(tdElement.innerText);
|
||||
let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
|
||||
let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText);
|
||||
let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);
|
||||
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
|
||||
let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption);
|
||||
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText=totalGas;
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas;
|
||||
document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText= currentBalanceStock;
|
||||
|
||||
updateStockValue( date,currentBalanceStock )
|
||||
@ -664,15 +664,15 @@
|
||||
try{
|
||||
let dataId = tdElement.getAttribute('data-id');
|
||||
let date = dataId;
|
||||
let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText;
|
||||
let purchaseBharathStock = tdElement.innerText;
|
||||
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText;
|
||||
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText;
|
||||
let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText) ;
|
||||
let purchaseBharathStock = validateInput(tdElement.innerText) ;
|
||||
let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText) ;
|
||||
let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText) ;
|
||||
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
|
||||
let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption);
|
||||
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText=totalGas;
|
||||
document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText= currentBalanceStock;
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas;
|
||||
document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock;
|
||||
|
||||
updateStockValue( date,currentBalanceStock )
|
||||
|
||||
@ -684,17 +684,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
function purchaseIndianStockChange(tdElement) {
|
||||
|
||||
try{
|
||||
let dataId = tdElement.getAttribute('data-id');
|
||||
let date = dataId;
|
||||
let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText;
|
||||
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText;
|
||||
let purchaseIndianStock = tdElement.innerText;
|
||||
let toatalGasConsumption = document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText;
|
||||
let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText);
|
||||
let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
|
||||
let purchaseIndianStock = validateInput(tdElement.innerText);
|
||||
let toatalGasConsumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);
|
||||
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
|
||||
let currentBalanceStock = Number(totalGas) - Number(toatalGasConsumption);
|
||||
|
||||
@ -718,25 +716,25 @@
|
||||
let date = dataId;
|
||||
|
||||
//total gas consumption
|
||||
let tenTonGasConsumption = document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText;
|
||||
let coatingGasConsumption = document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText;
|
||||
let trpGasConsumption = document.querySelector(`td.trpGasConsumption[data-id="${dataId}"]`).innerText;
|
||||
let rotaryGasConsumption = document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText;
|
||||
let tenTonGasConsumption = validateInput(document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let trpGasConsumption = validateInput(document.querySelector(`td.trpGasConsumption[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) ;
|
||||
|
||||
|
||||
//total gas purchase and opening addition
|
||||
let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText;
|
||||
let purchaseBharathStock = document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText;
|
||||
let purchaseIndianStock = document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText;
|
||||
let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText);
|
||||
let purchaseBharathStock = validateInput(document.querySelector(`td.purchaseBharath[data-id="${dataId}"]`).innerText);
|
||||
let purchaseIndianStock = validateInput(document.querySelector(`td.purchaseIndian[data-id="${dataId}"]`).innerText);
|
||||
|
||||
let totalGas = (Number(openingStock) + Number(purchaseBharathStock)) + Number(purchaseIndianStock);
|
||||
|
||||
let currentBalanceStock = Number(totalGas) - ( Number(toatalGasConsumption) );
|
||||
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas;
|
||||
document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText =toatalGasConsumption ;
|
||||
document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText = toatalGasConsumption ;
|
||||
document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock;
|
||||
|
||||
updateStockValue( date,currentBalanceStock )
|
||||
@ -769,15 +767,15 @@
|
||||
|
||||
let dataId = `${otherDate}`;
|
||||
|
||||
document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText=currentBalanceStock;
|
||||
document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText = 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);
|
||||
|
||||
@ -870,4 +868,28 @@ function convertToDate(dateString) {
|
||||
});
|
||||
|
||||
}
|
||||
</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>
|
||||
@ -350,6 +350,19 @@
|
||||
|
||||
$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) {
|
||||
// dd($record);
|
||||
$row++;
|
||||
@ -574,6 +587,7 @@
|
||||
<?php echo $record['id'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
|
||||
<!-- 'td:eq(36)' -->
|
||||
<td style="display: none;">
|
||||
<?php echo $record['clayOrLossOfIgnition'] ?? ' '; ?>
|
||||
@ -589,26 +603,28 @@
|
||||
<td style="display: none;">
|
||||
<?php echo $record['approvedBy'] ?? ' '; ?>
|
||||
</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>
|
||||
|
||||
<?php
|
||||
|
||||
//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['plus20Loss'] += $record['plus20Loss'] == " " ? 0 : (float) $record['plus20Loss'] ;
|
||||
$summary['moistureSpec'] += $record['moistureSpec'] == " " ? 0 : (float) $record['moistureSpec'] ;
|
||||
@ -617,7 +633,6 @@
|
||||
$summary['moistureLossQty'] += $record['moistureLossQty'] == " " ? 0 : (float) $record['moistureLossQty'] ;
|
||||
$summary['sieveLossQty'] += $record['sieveLossQty'] == " " ? 0 : (float) $record['sieveLossQty'] ;
|
||||
$summary['salableQty'] += $record['salableQty'] ?? $record['Qty'] ;
|
||||
|
||||
|
||||
} ?>
|
||||
|
||||
@ -628,7 +643,7 @@
|
||||
<thead>
|
||||
<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;">Invoice No-123</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">22-01-2025</th>
|
||||
@ -660,31 +675,31 @@
|
||||
|
||||
<tr>
|
||||
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<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_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
|
||||
|
||||
<td class="celda_encabezado_normal" ><?=$summary['Qty']?></td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['plus20Loss']?></td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureSpec'] ?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureActual']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureLoss']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureLossQty']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['sieveLossQty']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['salableQty']?></td>
|
||||
<td class="celda_normal" ><?=$summary['Qty']?></td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" ><?=$summary['plus20Loss']?></td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" ><?=$summary['moistureSpec'] ?></td>
|
||||
<td class="celda_normal" ><?=$summary['moistureActual']?></td>
|
||||
<td class="celda_normal" ><?=$summary['moistureLoss']?></td>
|
||||
<td class="celda_normal" ><?=$summary['moistureLossQty']?></td>
|
||||
<td class="celda_normal" ><?=$summary['sieveLossQty']?></td>
|
||||
<td class="celda_normal" ><?=$summary['salableQty']?></td>
|
||||
|
||||
|
||||
|
||||
@ -826,11 +841,13 @@
|
||||
<td contenteditable="true" oninput="calculateRow(value='moistureValue')"
|
||||
id="dwnldMoistureActualId"> </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td style="text-align: left !important; width:25%;"><b>Moisture Spec %</b></td>
|
||||
<td contenteditable="true" oninput="calculateRow(value='moistureValue')"
|
||||
id="dwnldMoistureSpecId"> </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
|
||||
</tbody>
|
||||
@ -987,7 +1004,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: left !important; height: 50px;"><b>Remarks</b></td>
|
||||
<td contenteditable="true"></td>
|
||||
<td id="dwnldReportCommentsId" contenteditable="true"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -1066,7 +1083,10 @@
|
||||
<input type="hidden" name="salableQty" id="salableQty" value="">
|
||||
<input type="hidden" name="testedBy" id="testedBy" 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">
|
||||
<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 testedBy = row.find('td:eq(37)').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);
|
||||
$('#dwnldVehicleNoId').text(vehicleNo);
|
||||
$('#dwnldQtyId').text(qty);
|
||||
$('#dwnldReportCommentsId').text(reportComments);
|
||||
$('#dwnldGradeId').text(gradeRange);
|
||||
$('#dwnldTimeId').text(reportTime);
|
||||
|
||||
|
||||
if(sandType.trim().toLowerCase() == "silica sand"){
|
||||
|
||||
$('#dwnldLossOfIgnitionRowId').hide();
|
||||
$('#dwnldClayRowId').show();
|
||||
console.log("inside silica sand");
|
||||
console.log(clayOrLossOfIgnition)
|
||||
$('#dwnldClayId').text(clayOrLossOfIgnition);
|
||||
|
||||
|
||||
@ -1160,6 +1188,8 @@
|
||||
|
||||
$('#dwnldClayRowId').hide();
|
||||
$('#dwnldLossOfIgnitionRowId').show();
|
||||
console.log("inside waste core");
|
||||
console.log(clayOrLossOfIgnition);
|
||||
$('#dwnldLossOfIgnitionId').text(clayOrLossOfIgnition);
|
||||
|
||||
}
|
||||
@ -1278,7 +1308,10 @@
|
||||
$('#approvedBy').val(approvedBy);
|
||||
$('#testedById').val(testedBy);
|
||||
$('#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(),
|
||||
testedBy : $('#testedById').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){
|
||||
alert("Data Saved Successfully..!!");
|
||||
// window.location.reload();
|
||||
window.location.reload();
|
||||
},
|
||||
error : function(xhr, status, error){
|
||||
alert("An error occurred while processing the request. Please try again.");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user