diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 48cdd4de..bc27d1f6 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -478,6 +478,8 @@ class StockController extends BaseController ]; + dd($dbData); + $resultExists = $this->incomingSilicaSandDetails_model ->where('id', $id) ->first(); diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php index 6696437a..8bea1a2b 100755 --- a/app/Models/Rawmaterialdetails_model.php +++ b/app/Models/Rawmaterialdetails_model.php @@ -152,9 +152,9 @@ class Rawmaterialdetails_model extends Model return array_column($materialResults, 'MaterialCode'); } - function getAllWasteCoreSandMaterialCode(){ + function getAllWasteCoreSandMaterialCode(){ - $builder = $this->db->table('t_materialmaster') + $builder = $this->db->table('t_materialmaster') ->select('MaterialCode') ->where('Category', 'waste core') ->orderBy('CreatedDate', 'desc'); diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index f1120817..0ee54f94 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -113,6 +113,15 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); text-align: center; } + .celda_encabezado_total { + background-color:#ffffff; + border: 1px solid #ccc; + color: #ffffff; + font-weight: bold; + padding: 6px 10px; + text-align: center; + } + ._Separador { background-color: #fff; height: 12px; @@ -396,13 +405,84 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date valueDrier On Time Drier Off TimeRunning HrsSupplier Name is a dropdown featurei/p Sand Moisture(%)Tot Gas ConsumptionGas Per Toni/p Sand QtyMoisture Loss QtySand Dried QtyQty Per HrsDust Qty
+ Total + ------
+ + +

@@ -413,6 +493,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); + + diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index 23d68499..8a25ee16 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -381,62 +381,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -449,52 +449,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -899,22 +899,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -1003,7 +1003,8 @@ $('#dwnldVehicleNoId').text(vehicleNo); $('#dwnldQtyId').text(qty); - if(sandType == "silicasand"){ + + if(sandType.trim().toLowerCase() == "silica sand"){ $('#dwnldLossOfIgnitionRowId').hide(); $('#dwnldClayRowId').show(); @@ -1020,47 +1021,47 @@ let dwnld10MmFId = parseFloat(_10Mm * 5).toFixed(2); $('#dwnld10MmId').text(_10Mm); - $('#dwnld10MmFId').text(dwnld10MmFId); + $('#dwnld10MmFId').text(dwnld10MmFId == "0.00" ? " " : dwnld10MmFId); let dwnld20MmFId = parseFloat(_20Mm * 10).toFixed(2); $('#dwnld20MmId').text(_20Mm); - $('#dwnld20MmFId').text(dwnld20MmFId); + $('#dwnld20MmFId').text(dwnld20MmFId == "0.00" ? " " : dwnld20MmFId); let dwnld30MmFId = parseFloat(_30Mm * 20).toFixed(2); $('#dwnld30MmId').text(_30Mm); - $('#dwnld30MmFId').text(dwnld30MmFId); + $('#dwnld30MmFId').text(dwnld30MmFId == "0.00" ? " " : dwnld30MmFId); let dwnld40MmFId = parseFloat(_40Mm * 30).toFixed(2); $('#dwnld40MmId').text(_40Mm); - $('#dwnld40MmFId').text(dwnld40MmFId); + $('#dwnld40MmFId').text(dwnld40MmFId == "0.00" ? " " : dwnld40MmFId); let dwnld50MmFId = parseFloat(_50Mm * 40).toFixed(2); $('#dwnld50MmId').text(_50Mm); - $('#dwnld50MmFId').text(dwnld50MmFId); + $('#dwnld50MmFId').text(dwnld50MmFId == "0.00" ? " " : dwnld50MmFId); let dwnld70MmFId = parseFloat(_70Mm * 50).toFixed(2); $('#dwnld70MmId').text(_70Mm); - $('#dwnld70MmFId').text(dwnld70MmFId); + $('#dwnld70MmFId').text(dwnld70MmFId == "0.00" ? " " : dwnld70MmFId); let dwnld100MmFId = parseFloat(_100Mm * 70).toFixed(2); $('#dwnld100MmId').text(_100Mm); - $('#dwnld100MmFId').text(dwnld100MmFId); + $('#dwnld100MmFId').text(dwnld100MmFId == "0.00" ? " " : dwnld100MmFId); let dwnld140MmFId = parseFloat(_140Mm * 100).toFixed(2); $('#dwnld140MmId').text(_140Mm); - $('#dwnld140MmFId').text(dwnld140MmFId); + $('#dwnld140MmFId').text(dwnld140MmFId == "0.00" ? " " : dwnld140MmFId); let dwnld200MmFId = parseFloat(_200Mm * 140).toFixed(2); $('#dwnld200MmId').text(_200Mm); - $('#dwnld200MmFId').text(dwnld200MmFId); + $('#dwnld200MmFId').text(dwnld200MmFId == "0.00" ? " " : dwnld200MmFId); let dwnld300MmFId = parseFloat(_300Mm * 200).toFixed(2); $('#dwnld300MmId').text(_300Mm); - $('#dwnld300MmFId').text(dwnld300MmFId); + $('#dwnld300MmFId').text(dwnld300MmFId == "0.00" ? " " : dwnld300MmFId); let dwnldPanFId = parseFloat(pan * 300).toFixed(2); $('#dwnldPanId') .text(pan); - $('#dwnldPanFId') .text(dwnldPanFId); + $('#dwnldPanFId') .text(dwnldPanFId == "0.00" ? " " : dwnldPanFId); let fTotal = (parseFloat(dwnld10MmFId)+ @@ -1274,8 +1275,8 @@ let result = table.tableToJSON(); let qty = parseFloat($('#dwnldQtyId').text()); - let moistureSpec = $('#dwnldMoistureSpecId').text(); - let moistureActual = $('#dwnldMoistureActualId').text(); + let moistureSpec = validateInput($('#dwnldMoistureSpecId').text().trim()) ; + let moistureActual = validateInput($('#dwnldMoistureActualId').text().trim()) ; let totalWeighOfSand = 0 ; let totalFactoredValue = 0 ; let afs = 0 ; @@ -1291,7 +1292,7 @@ if(i === 0 || i === 1 || i === 2){ newPlus30Loss += Number(result[i]['WEIGH OF SAND']) ; - newSieveLossQty = (parseFloat(qty) * newPlus30Loss) / 100 ; + newSieveLossQty = (parseFloat(qty) * newPlus20Loss) / 100 ; } totalWeighOfSand += Number(result[i]['WEIGH OF SAND']) ; @@ -1312,7 +1313,7 @@ let newSalableQty = (parseFloat(qty) - newMoistureLossQty - newSieveLossQty).toFixed(2) ; - newSieveLossQty = (newSieveLossQty).toFixed(2);newPlus20Loss + newSieveLossQty = (newSieveLossQty).toFixed(2); newPlus20Loss = (newPlus20Loss).toFixed(2); @@ -1405,12 +1406,12 @@ $(document).ready(function() { remark : $('#dwnldAcceptedId').text(), gradeCondition : $('#dwnldGradeId').text(), testedBy : $('#testedById').val(), - approvedBy : $('#approvedById').val(), - clayOrLossOfIgnition : $('#sandType').val() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text() + approvedBy : $('#approvedById').val(), + clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').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."); @@ -1428,4 +1429,28 @@ $(document).ready(function() { }) + + + + \ No newline at end of file