diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php index 8f64d404..97b6c68d 100644 --- a/app/Views/CoatingMachineDetail.php +++ b/app/Views/CoatingMachineDetail.php @@ -1430,8 +1430,23 @@ $(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 table = document.getElementById(tableID); + + let cloneTable = table.cloneNode(true); // Clone the table to modify + + // Remove hidden rows + $(cloneTable).find('tr').filter(function () { + return $(this).css('display') === 'none'; + }).remove(); + + // Remove hidden columns + $(cloneTable).find('th, td').each(function () { + if ($(this).css('display') === 'none') { + $(this).remove(); + } + }); + + let ws = XLSX.utils.table_to_sheet(cloneTable); // Convert modified table to sheet 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 diff --git a/app/Views/dieselStockDetails.php b/app/Views/dieselStockDetails.php index 0a0baea1..c9ae41d2 100644 --- a/app/Views/dieselStockDetails.php +++ b/app/Views/dieselStockDetails.php @@ -1297,7 +1297,21 @@ foreach ($period as $day) { function exportTableToExcel(tableID, filename = '') { let table = document.getElementById(tableID); - let ws = XLSX.utils.table_to_sheet(table); // Convert table to worksheet + let cloneTable = table.cloneNode(true); // Clone the table to modify + + // Remove hidden rows + $(cloneTable).find('tr').filter(function () { + return $(this).css('display') === 'none'; + }).remove(); + + // Remove hidden columns + $(cloneTable).find('th, td').each(function () { + if ($(this).css('display') === 'none') { + $(this).remove(); + } + }); + + let ws = XLSX.utils.table_to_sheet(cloneTable); // Convert modified table to sheet 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