diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 3dc91d30..fe8173f9 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1326,13 +1326,17 @@ class StockController extends BaseController $dbData = [ - 'date' => $data['date'], - 'opening' => $data['opening'], - 'purchaseBharath' => $data['purchaseBharath'], - 'purchaseIndian' => $data['purchaseIndian'], - 'total' => $data['total'], - 'consumption' => $data['consumption'], - 'balanceStock' => $data['balanceStock'], + 'date' => $data['date'] , + 'opening' => $data['opening'] , + 'purchaseBharath' => $data['purchaseBharath'] , + 'purchaseIndian' => $data['purchaseIndian'] , + 'total' => $data['total'] , + 'consumption' => $data['consumption'] , + 'balanceStock' => $data['balanceStock'] , + 'trp_panel_gas_consumption' => $data['trpPanelGasConsumption'] , + 'trp_physical_gas_consumption' => $data['trpPhysicalGasConsumption'] , + 'trp_sand_production' => $data['trpSandProduction'] , + 'rotary_drier_consumption' => $data['rotaryDrierConsumption'] ]; $resultExists = $this->gasStockDetails_model diff --git a/app/Models/GasStockModel.php b/app/Models/GasStockModel.php index e809c7e8..1f95543d 100644 --- a/app/Models/GasStockModel.php +++ b/app/Models/GasStockModel.php @@ -13,7 +13,8 @@ class GasStockModel extends Model protected $useSoftDeletes = false; protected $protectFields = true; protected $allowedFields = ['date','opening','purchaseBharath','purchaseIndian', - 'total','consumption','balanceStock']; + 'total','consumption','balanceStock', + 'trp_panel_gas_consumption','trp_physical_gas_consumption','trp_sand_production','rotary_drier_consumption']; protected bool $allowEmptyInserts = false; protected bool $updateOnlyChanged = true; diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php index 37ded70e..2675cd81 100644 --- a/app/Views/stock/bagStockDetails.php +++ b/app/Views/stock/bagStockDetails.php @@ -97,7 +97,8 @@ padding-bottom: 8px; padding-top: 8px; width: 100%; - } + } + ._Separador { background-color: #fff; @@ -111,6 +112,8 @@ width: 4px; } + + /*style excel*/ .excel_cell { border: 1px solid #CCC; @@ -138,7 +141,6 @@ } - .celda_encabezado_general { background-color: #50bbd9; border: 1px solid #ccc; @@ -189,6 +191,9 @@ color: #ffffff; border: 1px solid #ddd; padding: 10px; + white-space: normal; /* Allows text to wrap */ + word-wrap: break-word; /* Breaks long words if needed */ + text-align: center; /* Centers text for better alignment */ } /* Sticky First Column */ @@ -218,7 +223,9 @@ - + + + diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index 5723bb21..d4fbb1d9 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -1235,7 +1235,7 @@ foreach ($period as $day) { let dataId = `${otherDate} ${machine_id}`; - document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText = closingReading == 0 ? " " : closingReading ; + document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText = closingReading == 0 ? " " : (closingReading).toFixed(2) ; let openingReading = validateInput(document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText); @@ -1253,7 +1253,7 @@ foreach ($period as $day) { document.querySelector(`td.mileage[data-id="${dataId}"]`).innerText = mileage == 0 ? " " : mileage ; - document.querySelector(`td.closingReading[data-id="${dataId}"]`).innerText = closingReading == 0 ? " " : closingReading ; + document.querySelector(`td.closingReading[data-id="${dataId}"]`).innerText = closingReading == 0 ? " " : (closingReading).toFixed(2) ; } diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php index 5f643495..a30577b2 100644 --- a/app/Views/stock/dustAndRoughStockDetails.php +++ b/app/Views/stock/dustAndRoughStockDetails.php @@ -98,7 +98,7 @@ padding-top: 8px; width: 100%; } - + ._Separador { background-color: #fff; @@ -140,9 +140,7 @@ height: 20px; } - - .celda_encabezado_general { background-color: #50bbd9; border: 1px solid #ccc; @@ -215,10 +213,10 @@ } td{ - min-width: 150px; - max-width: 150px; + min-width: 100px; + max-width: 100px; } - + diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php index cb2accc2..080d0a51 100644 --- a/app/Views/stock/gasStockDetails.php +++ b/app/Views/stock/gasStockDetails.php @@ -99,7 +99,6 @@ width: 100%; } - ._Separador { background-color: #fff; @@ -141,6 +140,7 @@ height: 20px; } + .celda_encabezado_general { background-color: #50bbd9; border: 1px solid #ccc; @@ -219,7 +219,10 @@ - + + + +
@@ -302,7 +305,7 @@ Sand Dried Coating Machine Sand Coated - Trp Machine + Trp Machine Sand TRP Rotary Drier @@ -319,7 +322,8 @@ ton Consumption ton - Consumption + Panel Consumption + Physical Consumption ton Consumption @@ -344,65 +348,227 @@ ?> > + + + oninput="openingStockChange(this)" data-id="" - > + > + + + + contenteditable="true"> + + + contenteditable="true"> + + + > + + + + > + + + + > + + + - - + > + + + + + + + - - - + + - + + + + + + - - - - + + + + + + + + + + + + - + + + - "-" , + 'purchaseBharath' => 0 , + 'purchaseIndian' => 0 , + 'total' => 0 , + 'consumption' => 0 , + 'balanceStock' => 0 , + 'drierMachineGasConsumption'=>0, + 'sandDried' => 0, + 'coatingMachineGasconsumption'=>0, + 'coatedSand' => 0, + 'trp_panel_gas_consumption' => 0, + 'trp_physical_gas_consumption' => 0, + 'trp_sand_production' => 0, + 'rotary_drier_consumption' => 0 + ]; + } + + // + + // Sum values for the material + + $summary["opening"] = 0 ; + $summary["purchaseBharath"] = is_numeric($gasStockDetail['purchaseBharath']) ? $gasStockDetail['purchaseBharath'] : 0 ; + $summary["purchaseIndian"] += is_numeric($gasStockDetail['purchaseIndian']) ? $gasStockDetail['purchaseIndian'] : 0 ; + $summary["total"] += is_numeric($gasStockDetail['total']) ? $gasStockDetail['total'] : 0 ; + $summary["consumption"] += is_numeric($gasStockDetail['consumption']) ? $gasStockDetail['consumption'] : 0 ; + $summary["balanceStock"] += is_numeric($gasStockDetail['balanceStock']) ? $gasStockDetail['balanceStock'] : 0 ; + + $summary["drierMachineGasConsumption"] = is_numeric( $gasStockDetail['drierMachineGasConsumption']) ? $gasStockDetail['drierMachineGasConsumption'] : 0 ; + $summary["sandDried"] = is_numeric( $gasStockDetail['sandDried']) ? $gasStockDetail['sandDried'] : 0 ; + $summary["coatingMachineGasconsumption"] += is_numeric($gasStockDetail['coatingMachineGasconsumption']) ? $gasStockDetail['coatingMachineGasconsumption'] : 0 ; + $summary["coatedSand"] += is_numeric($gasStockDetail['coatedSand']) ? $gasStockDetail['coatedSand'] : 0 ; + $summary["trp_panel_gas_consumption"] += is_numeric($gasStockDetail['trp_panel_gas_consumption']) ? $gasStockDetail['trp_panel_gas_consumption'] : 0 ; + $summary["trp_physical_gas_consumption"] += is_numeric($gasStockDetail['trp_physical_gas_consumption']) ? $gasStockDetail['trp_physical_gas_consumption'] : 0 ; + + $summary["trp_sand_production"] += is_numeric($gasStockDetail['trp_sand_production']) ? $gasStockDetail['trp_sand_production'] : 0 ; + $summary["rotary_drier_consumption"] += is_numeric($gasStockDetail['rotary_drier_consumption']) ? $gasStockDetail['rotary_drier_consumption'] : 0 ; + + + + + + + } ?> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date Opening StockPurchase(Bharath)Purchase(Indian)TotalConsumption Balance StockConsumption ton Consumptionton Panel ConsumptionPhysical Consumptionton Consumption
+ Total +
+
+ + + + modify('first day of this month')->format('Y-m-d'); @@ -468,24 +634,34 @@ - + - - - + + + + + + + + + contenteditable="true" > @@ -675,7 +851,11 @@ purchaseIndian: rowCells.eq(3).text().trim()|| ' ', total: rowCells.eq(4).text().trim()|| ' ', consumption: rowCells.eq(5).text().trim()|| ' ', - balanceStock: rowCells.eq(6).text().trim()|| ' ' + balanceStock: rowCells.eq(6).text().trim()|| ' ', + trpPanelGasConsumption : rowCells.eq(11).text().trim()|| ' ', + trpPhysicalGasConsumption : rowCells.eq(12).text().trim()|| ' ', + trpSandProduction : rowCells.eq(13).text().trim()|| ' ', + rotaryDrierConsumption : rowCells.eq(14).text().trim()|| ' ', }; rows.push(rowData); @@ -771,12 +951,14 @@ let date = dataId; //total gas consumption - 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) ; + let tenTonGasConsumption = validateInput(document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText); + let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText); + let trpPanelGasConsumption = validateInput(document.querySelector(`td.trpPanelGasConsumption[data-id="${dataId}"]`).innerText); + let trpPhysicalGasConsumption = validateInput(document.querySelector(`td.trpPhysicalGasConsumption[data-id="${dataId}"]`).innerText); + let rotaryGasConsumption = validateInput(document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText); + + let toatalGasConsumption = Number(tenTonGasConsumption) + Number (coatingGasConsumption) + Number(trpPhysicalGasConsumption) + + Number(trpPanelGasConsumption) + Number(rotaryGasConsumption) ; //total gas purchase and opening addition @@ -790,9 +972,9 @@ document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas; document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText = toatalGasConsumption ; - document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock; + document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock ; - updateStockValue( date,currentBalanceStock ) + updateStockValue( date,currentBalanceStock) } catch(error){ console.error("There is an error updating stock ..!!" + error); diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php index c4967b95..f1a01491 100644 --- a/app/Views/stock/powerConsumptionDetails.php +++ b/app/Views/stock/powerConsumptionDetails.php @@ -436,7 +436,7 @@ foreach ($period as $day) { - @@ -444,7 +444,7 @@ foreach ($period as $day) { - @@ -452,7 +452,7 @@ foreach ($period as $day) { - diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 8ce8c37c..1bf9c3f0 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -1,3 +1,4 @@ + @@ -1182,10 +1183,10 @@ $timeOtions[] = "12:00 AM"; - + - - + + Total @@ -1574,27 +1575,6 @@ $timeOtions[] = "12:00 AM"; - - - - - - - - - - - - - - - - - - - - - diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php index dd204086..d21f1b50 100644 --- a/app/Views/stock/trpSandUseStockDetails.php +++ b/app/Views/stock/trpSandUseStockDetails.php @@ -98,7 +98,7 @@ padding-top: 8px; width: 100%; } - + ._Separador { background-color: #fff; @@ -141,7 +141,6 @@ } - .celda_encabezado_general { background-color: #50bbd9; border: 1px solid #ccc; @@ -217,14 +216,16 @@ } td{ - min-width: 150px; - max-width: 150px; + min-width: 100px; + max-width: 100px; } + +