From d47b80ed062e40beda34392c56b489a080abbf00 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 23 Jan 2025 18:35:53 +0530
Subject: [PATCH] stock module latest today  vadivel J 23-01-2025

---
 app/Views/drierMachineDetails.php       | 90 +++++++++++++++++--------
 app/Views/incomingSilicaSandDetails.php | 33 +++++++--
 2 files changed, 90 insertions(+), 33 deletions(-)

diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php
index 0ccbf018..eccfebc6 100644
--- a/app/Views/drierMachineDetails.php
+++ b/app/Views/drierMachineDetails.php
@@ -359,10 +359,17 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                     if ($date === $currentDate) {
                                                         echo 'style="background: #cef0ad;"';
                                                     }
-                                                    ?>>
+                                                    ?>
+
+                                                   <?php
+                                                    $formattedDate = DateTime::createFromFormat('Y-m-d', $a['date'])->format('d-m-Y');
+                                                    ?>
+                                                    
+                                                    >
+                                                    <!-- tr tag closed -->
 
                                                     <!-- td:eq(0) date  -->
-                                                    <td width="79" height="45" class="celda_normal"><?php echo DateTime::createFromFormat('Y-m-d', $a['date'])->format('d-m-Y'); ?></td>
+                                                    <td  class="celda_normal"><?php echo $formattedDate;  ?></td>
 
 
                                                     <!-- td:eq(1) drier on time -->
@@ -781,6 +788,58 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
 
 
+<script>
+
+    $(document).ready(function(){
+
+        function exportTableToExcel(tableID, filename = '') {
+            let table = document.getElementById(tableID);
+            let rows = table.rows;
+            let data = [];
+
+            for (let i = 0; i < rows.length; i++) {
+                let row = rows[i];
+                let cols = row.querySelectorAll('td, th');
+                let rowData = [];
+
+                for (let j = 0; j < cols.length; j++) {
+                    let cell = cols[j];
+
+                    // Check if the cell contains a <select> dropdown
+                    let select = cell.querySelector('select');
+                    if (select) {
+                        rowData.push(select.options[select.selectedIndex].text); // Get only selected value
+                    } else {
+                        rowData.push(cell.innerText.trim()); // Normal text
+                    }
+                }
+
+                data.push(rowData);
+            }
+
+            let wb = XLSX.utils.book_new();
+            let ws = XLSX.utils.aoa_to_sheet(data);
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+            XLSX.writeFile(wb, filename || 'export.xlsx');
+        }
+
+
+        let tableId = 'drierTable';
+
+        document.getElementById('drierMachineDetailsExport').addEventListener('click',function(){
+
+        exportTableToExcel(tableId,'drierMachineDetails.xlsx');
+
+    })
+
+
+    })
+
+
+
+</script>
+
+
 <script type="text/javascript">
     $(document).ready(function() {
 
@@ -1139,30 +1198,3 @@ function convertToDate(dateString) {
 </script>
 
 
-
-<script>
-
-    $(document).ready(function(){
-
-        function exportTableToExcel(tableID, filename = '') {
-            let table = document.getElementById(tableID);
-            let ws = XLSX.utils.table_to_sheet(table); // Convert table to worksheet
-            let wb = XLSX.utils.book_new(); // Create a new workbook
-            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
-            XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
-        }
-
-        let tableId = 'drierTable';
-
-        document.getElementById('drierMachineDetailsExport').addEventListener('click',function(){
-
-        exportTableToExcel(tableId,'drierMachineDetails.xlsx');
-
-    })
-
-
-    })
-
-
-
-</script>
\ No newline at end of file
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index ace3f7f4..c90d89c7 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -1693,13 +1693,38 @@ $(document).ready(function() {
         $(document).ready(function(){
 
             function exportTableToExcel(tableID, filename = '') {
+                
                 let table = document.getElementById(tableID);
-                let ws = XLSX.utils.table_to_sheet(table); // Convert table to worksheet
-                let wb = XLSX.utils.book_new(); // Create a new workbook
-                XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
-                XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
+                let rows = table.rows;
+                let data = [];
+
+                for (let i = 0; i < rows.length; i++) {
+                    let row = rows[i];
+                    let cols = row.querySelectorAll('td, th');
+                    let rowData = [];
+
+                    for (let j = 0; j < cols.length; j++) {
+                        let cell = cols[j];
+
+                        // Check if the cell contains a <select> dropdown
+                        let select = cell.querySelector('select');
+                        if (select) {
+                            rowData.push(select.options[select.selectedIndex].text); // Get only selected value
+                        } else {
+                            rowData.push(cell.innerText.trim()); // Normal text
+                        }
+                    }
+
+                    data.push(rowData);
+                }
+
+                let wb = XLSX.utils.book_new();
+                let ws = XLSX.utils.aoa_to_sheet(data);
+                XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+                XLSX.writeFile(wb, filename || 'export.xlsx');
             }
 
+
             let tableId = 'incomingSilicaSandDetailsTable';
 
              document.getElementById('incomingSilicaSandDetailsExport').addEventListener('click',function(){