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"
- >= $totalDiesel[$groupedDieselMachineStockDetailsIndex]['opening_stock'] ?? ' ' ?> |
+ >= $totalDiesel[$rowIndex]['opening_stock'] ?? ' ' ?>
- = $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ?? ' ' ?>
+ = $totalDiesel[$rowIndex]['purchase_diesel'] ?? ' ' ?>
|
+ data-id="= $totalDiesel[$rowIndex]['date'] ?>">
- = $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] ?? ' ' ?>
+ = $totalDiesel[$rowIndex]['total_filling_diesel'] ?? ' ' ?>
|
+ data-id="= $totalDiesel[$rowIndex]['date'] ?>">
- = $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] ?? ' ' ?>
+ = $totalDiesel[$rowIndex]['balance_stock'] ?? ' ' ?>
|
@@ -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) {
|
- = $summary['opening_diesel'] ?> |
+ = $summary['openingStock'] ?> |
= $summary['totalPurchaseDiesel'] ?> |
= $summary['totalFillingDiesel'] ?> |
= $summary['balanceStock'] ?> |
@@ -836,41 +836,115 @@ foreach ($period as $day) {
-
-
- oninput="openingTDStockChange(this)"
- contenteditable="true"
-
- >= !empty($previousMonthTotalDieselMachineStockDetails)
- ? $previousMonthTotalDieselMachineStockDetails[0]['balance_stock']
- : " ";
- ?> |
-
-
-
- |
-
- |
-
- = !empty($previousMonthTotalDieselMachineStockDetails)
- ? $previousMonthTotalDieselMachineStockDetails[0]['balance_stock']
- : " ";
- ?>
- |
-
-
-
+
+
+
+
+
+
+ oninput="openingTDStockChange(this)"
+ contenteditable="true"
+ >= $totalDiesel[$datesInMonthIndex]['opening_stock'] ?? ' ' ?> |
+
+
+
+
+ = $totalDiesel[$datesInMonthIndex]['purchase_diesel'] ?? ' ' ?>
+
+ |
+
+
+
+ = $totalDiesel[$datesInMonthIndex]['total_filling_diesel'] ?? ' ' ?>
+
+ |
+
+
+
+ = $totalDiesel[$datesInMonthIndex]['balance_stock'] ?? ' ' ?>
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ oninput="openingTDStockChange(this)"
+ contenteditable="true"
+
+ >
+
+ = !empty($previousMonthTotalDieselMachineStockDetails)
+ ? $previousMonthTotalDieselMachineStockDetails[0]['balance_stock']
+ : " ";
+ ?>
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+ = !empty($previousMonthTotalDieselMachineStockDetails)
+ ? $previousMonthTotalDieselMachineStockDetails[0]['balance_stock']
+ : " ";
+ ?>
+
+ |
+
+
+
+
+
+
+
+
+
+ $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
} :