From 82e00e2b3ad95293e9316d781e6904802cafccae Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 6 Mar 2025 19:47:40 +0530
Subject: [PATCH] changes in stock module 06-03-2025

---
 app/Views/stock/bagStockDetails.php         | 28 +++++++++++------
 app/Views/stock/dieselStockDetails.php      | 33 ++++++++++++++++-----
 app/Views/stock/powerConsumptionDetails.php | 33 +++++++++++++++------
 app/Views/stock/resinStockDetails.php       | 30 +++++++++++++++++--
 4 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php
index 6b529812..a5adbade 100644
--- a/app/Views/stock/bagStockDetails.php
+++ b/app/Views/stock/bagStockDetails.php
@@ -304,7 +304,7 @@
 
                                         <div class="col-3">
                                             <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
-                                                class="form-control mt-2" data-provide="datepicker"
+                                                class="form-control mt-2"               
                                                 data-date-format="M-yyyy" data-date-min-view-mode="1"  readonly>
                                         </div>
                                         <div class="form-group col-md-3">
@@ -682,12 +682,15 @@
                                                                 >
                                                                 
                                                                 <?php
-                                                                
-                                                            echo  $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' ';
-                                                           
-                                                               
-
-                                                                 ?>
+                                                                     foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail)
+                                                                     {
+                                                                         if($previousMonthBagStockDetail['materialCode'] ==  $bagMaterial['MaterialCode']){
+                                                                             echo $previousMonthBagStockDetail['balanceStock'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
+                                                                ?>
                                                             
                                                             </td>
 
@@ -704,8 +707,15 @@
                                                             data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
                                                                 >
                                                                 <?php
-                                                            echo  $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' ';
-                                                                 ?>
+                                                                     foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail)
+                                                                     {
+                                                                         if($previousMonthBagStockDetail['materialCode'] ==  $bagMaterial['MaterialCode']){
+                                                                             echo $previousMonthBagStockDetail['balanceStock'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
+                                                                ?>
                                                             </td>
                                                         <?php } ?>
                                                     </tr>
diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php
index 5f0fedf1..c9df9250 100644
--- a/app/Views/stock/dieselStockDetails.php
+++ b/app/Views/stock/dieselStockDetails.php
@@ -839,10 +839,18 @@ foreach ($period as $day) {
 
                                                                
                                                                 
-                                                                ><?= (!empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex])   )
-                                                                     ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] 
-                                                                     :" " ;
-                                                                      ?>        
+                                                                >
+                                                                
+                                                                <?php
+                                                                     foreach($previousMonthDieselMachineStockDetails as $index => $previousMonthDieselMachineStockDetail)
+                                                                     {
+                                                                         if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
+                                                                             echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
+                                                                ?>        
                                                             </td>
 
                                                             <td class="celda_normal closingReading"
@@ -850,10 +858,19 @@ foreach ($period as $day) {
                                                                 oninput="closingReadingChange(this)"
                                                                 contenteditable="true">
                                                                 
-                                                                <?= !empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex]) 
-                                                                     ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] 
-                                                                     :" " ;
-                                                                      ?>
+                                                                <?php
+                                                                
+
+                                                                        foreach($previousMonthDieselMachineStockDetails as $index => $previousMonthDieselMachineStockDetail)
+                                                                        {
+                                                                            if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
+                                                                                echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
+                                                                                break;  
+                                                                            }
+                                                                             
+                                                                        }
+                                                                        
+                                                                ?>
                                                             </td>
 
                                                             <td class="celda_normal fillingDiesel"
diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php
index 2de8b655..29abfadf 100644
--- a/app/Views/stock/powerConsumptionDetails.php
+++ b/app/Views/stock/powerConsumptionDetails.php
@@ -786,7 +786,8 @@ foreach ($period as $day) {
                                                             oninput="openingTPStockChange(this)"
                                                             contenteditable="true"
 
-                                                            <?php } ?>><?php
+                                                            <?php } ?>>
+                                                            <?php
                                                                         if (empty($previousMonthTotalPowerMachineStockDetails)) {
                                                                             echo " ";
                                                                         } else {
@@ -794,6 +795,8 @@ foreach ($period as $day) {
                                                                         }
 
                                                                         ?>
+
+
                                                         </td>
 
 
@@ -859,11 +862,17 @@ foreach ($period as $day) {
                                                                 <?php } ?>
 
                                                                 data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>">
-                                                                <?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
-                                                                    ? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
-                                                                    : " ";
-
+                                                                <?php
+                                                                     foreach($previousMonthPowerConsumptionStockDetails as $index => $previousMonthPowerConsumptionStockDetail)
+                                                                     {
+                                                                         if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){
+                                                                             echo $previousMonthPowerConsumptionStockDetail['closing_units'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
                                                                 ?>
+                                                                
                                                             </td>
 
                                                             <td class="celda_normal closingUnits"
@@ -871,11 +880,17 @@ foreach ($period as $day) {
                                                                 oninput="closingUnitsChange(this)"
                                                                 contenteditable="true">
 
-                                                                <?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
-                                                                    ? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
-                                                                    : " ";
-
+                                                                <?php
+                                                                     foreach($previousMonthPowerConsumptionStockDetails as $index => $previousMonthPowerConsumptionStockDetail)
+                                                                     {
+                                                                         if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){
+                                                                             echo $previousMonthPowerConsumptionStockDetail['closing_units'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
                                                                 ?>
+
                                                             </td>
 
                                                             <td class="celda_normal totalUnits"
diff --git a/app/Views/stock/resinStockDetails.php b/app/Views/stock/resinStockDetails.php
index 0f8b0693..216eac8d 100644
--- a/app/Views/stock/resinStockDetails.php
+++ b/app/Views/stock/resinStockDetails.php
@@ -659,7 +659,20 @@ foreach ($period as $day) {
                                                                 oninput="openingStockChange(this)"
                                                                 contenteditable="true"
 
-                                                                <?php } ?>><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?></td>
+                                                                <?php } ?>>
+
+                                                                <?php
+                                                                     foreach($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail)
+                                                                     {
+                                                                         if($previousMonthResinStockDetail['materialCode'] ==  $resinMaterial['MaterialCode']){
+                                                                             echo $previousMonthResinStockDetail['balanceStock'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
+                                                                ?>
+                                                                
+                                                            </td>
 
                                                             <td class="celda_normal receiptStock"
                                                                 data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"
@@ -672,7 +685,20 @@ foreach ($period as $day) {
                                                                 contenteditable="true"> <?= ' ' ?> </td>
 
                                                             <td class="celda_normal balanceStock"
-                                                                data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?></td>
+                                                                data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>">
+
+                                                                <?php
+                                                                     foreach($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail)
+                                                                     {
+                                                                         if($previousMonthResinStockDetail['materialCode'] ==  $resinMaterial['MaterialCode']){
+                                                                             echo $previousMonthResinStockDetail['balanceStock'] ;
+                                                                             break;  
+                                                                         }
+                                                                          
+                                                                     }
+                                                                ?>
+                                                                    
+                                                            </td>
                                                         <?php } ?>
                                                     </tr>
                                                 <?php } ?>