From e775324fa2b8742f94afd5e124b8a72f5bb4166b Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 1 Apr 2025 16:48:37 +0530 Subject: [PATCH] stock module - 01-04-2025 --- app/Views/stock/dieselStockDetails.php | 183 +++++++++++++++++-------- 1 file changed, 128 insertions(+), 55 deletions(-) diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index 1999e936..08e5781a 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -574,11 +574,11 @@ foreach ($period as $day) { - $dieselStockDetails) { + foreach ($groupedDieselMachineStockDetails as $rowIndex => $dieselStockDetails) { ?> format('d-m-Y'); + $startDate = DateTime::createFromFormat('Y-m-d', $totalDiesel[$rowIndex]['date'])->format('d-m-Y'); ?> @@ -603,37 +603,37 @@ foreach ($period as $day) { + oninput="openingTDStockChange(this)" contenteditable="true" - > + > - + + data-id=""> - + + data-id=""> - + @@ -643,15 +643,15 @@ foreach ($period as $day) { //before closing outer loop if (!isset($summary['totalPurchaseDiesel'])) { - $summary['opening_diesel'] = '-'; + $summary['openingStock'] = '-'; $summary['totalPurchaseDiesel'] = 0; $summary['totalFillingDiesel'] = 0; $summary['balanceStock'] = 0; } - - $summary['totalPurchaseDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] : 0; - $summary['totalFillingDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] : 0; - $summary['balanceStock'] = is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] : 0; + $summary['openingStock'] = is_numeric($totalDiesel[$rowIndex]['opening_stock']) ? $totalDiesel[$rowIndex]['opening_stock'] : 0; + $summary['totalPurchaseDiesel'] += is_numeric($totalDiesel[$rowIndex]['purchase_diesel']) ? $totalDiesel[$rowIndex]['purchase_diesel'] : 0; + $summary['totalFillingDiesel'] += is_numeric($totalDiesel[$rowIndex]['total_filling_diesel']) ? $totalDiesel[$rowIndex]['total_filling_diesel'] : 0; + $summary['balanceStock'] = is_numeric($totalDiesel[$rowIndex]['balance_stock']) ? $totalDiesel[$rowIndex]['balance_stock'] : 0; ?> @@ -675,7 +675,7 @@ foreach ($period as $day) { + oninput="openingReadingChange(this)" contenteditable="true" > @@ -781,7 +781,7 @@ foreach ($period as $day) { - + @@ -836,41 +836,115 @@ foreach ($period as $day) { - - - oninput="openingTDStockChange(this)" - contenteditable="true" - - > - - - - - - - - - - - - + + + + + + + oninput="openingTDStockChange(this)" + contenteditable="true" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + oninput="openingTDStockChange(this)" + contenteditable="true" + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $dieselMachine) { ?> @@ -1566,8 +1640,7 @@ foreach ($period as $day) { const box = child.getBoundingClientRect(); const offset = y - box.top - box.height / 2; - return offset < 0 && offset > closest.offset ? - { + return offset < 0 && offset > closest.offset ? { offset, element: child } :