From c8f32d6e57bedf00305f87ee32b3e21e040d5473 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Fri, 10 Jan 2025 16:44:56 +0530
Subject: [PATCH] GWM : client feedback

---
 app/Views/attendance.php       | 51 +++++++++++++++++++++++++---------
 app/Views/monthlypayinputs.php | 50 +++++++++++++++++++++++++--------
 2 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index 6f71c214..a08b9030 100755
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -600,37 +600,62 @@ $currentday = date('d');
     }); });
 </script>
 
-
+<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
 <script type="text/javascript">
 
 $(document).ready(function () {
-    function exportTableToExcel(tableId, filename = 'attendance.xlsx') {
+        // function exportTableToExcel(tableId, filename = 'attendance.xlsx') {
+        //     var table = document.getElementById(tableId);
+        //     var rows = table.rows;
+        //     var csv = [];
+
+        //     // Loop through table rows and cells
+        //     for (var i = 0; i < rows.length; i++) {
+        //         var row = rows[i];
+        //         var cols = row.querySelectorAll('td, th');
+        //         var rowData = [];
+                
+        //         // Loop through each cell in the row
+        //         for (var j = 0; j < cols.length; j++) {
+        //             rowData.push(cols[j].innerText);
+        //         }
+                
+        //         csv.push(rowData.join('\t'));
+        //     }
+
+        //     // Create a Blob from the CSV data
+        //     var blob = new Blob([csv.join('\n')], { type: 'application/vnd.ms-excel' });
+        //     var link = document.createElement('a');
+        //     link.href = URL.createObjectURL(blob);
+        //     link.download = filename;
+
+        //     // Trigger download
+        //     link.click();
+        // }
+
+
+        function exportTableToExcel(tableId, filename = 'attendance.xlsx') {
             var table = document.getElementById(tableId);
             var rows = table.rows;
-            var csv = [];
+            var data = [];
 
-            // Loop through table rows and cells
             for (var i = 0; i < rows.length; i++) {
                 var row = rows[i];
                 var cols = row.querySelectorAll('td, th');
                 var rowData = [];
                 
-                // Loop through each cell in the row
                 for (var j = 0; j < cols.length; j++) {
                     rowData.push(cols[j].innerText);
                 }
                 
-                csv.push(rowData.join('\t'));
+                data.push(rowData);
             }
 
-            // Create a Blob from the CSV data
-            var blob = new Blob([csv.join('\n')], { type: 'application/vnd.ms-excel' });
-            var link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.download = filename;
+            var wb = XLSX.utils.book_new();
+            var ws = XLSX.utils.aoa_to_sheet(data);
 
-            // Trigger download
-            link.click();
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+            XLSX.writeFile(wb, filename);
         }
 
         // Add click event listener to the export button
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php
index 99b75f9e..84ff514e 100755
--- a/app/Views/monthlypayinputs.php
+++ b/app/Views/monthlypayinputs.php
@@ -557,37 +557,63 @@
 
 
  <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
  <script type="text/javascript">
 
 
 $(document).ready(function () {
-    function exportTableToExcel(tableId, filename = 'monthlyPay.xlsx') {
+        // function exportTableToExcel(tableId, filename = 'monthlyPay.xlsx') {
+        //     var table = document.getElementById(tableId);
+        //     var rows = table.rows;
+        //     var csv = [];
+
+        //     // Loop through table rows and cells
+        //     for (var i = 0; i < rows.length; i++) {
+        //         var row = rows[i];
+        //         var cols = row.querySelectorAll('td, th');
+        //         var rowData = [];
+                
+        //         // Loop through each cell in the row
+        //         for (var j = 0; j < cols.length; j++) {
+        //             rowData.push(cols[j].innerText);
+        //         }
+                
+        //         csv.push(rowData.join('\t'));
+        //     }
+
+        //     // Create a Blob from the CSV data
+        //     var blob = new Blob([csv.join('\n')], { type: 'application/vnd.ms-excel' });
+        //     var link = document.createElement('a');
+        //     link.href = URL.createObjectURL(blob);
+        //     link.download = filename;
+
+        //     // Trigger download
+        //     link.click();
+        // }
+
+
+        function exportTableToExcel(tableId, filename = 'monthlypay.xlsx') {
             var table = document.getElementById(tableId);
             var rows = table.rows;
-            var csv = [];
+            var data = [];
 
-            // Loop through table rows and cells
             for (var i = 0; i < rows.length; i++) {
                 var row = rows[i];
                 var cols = row.querySelectorAll('td, th');
                 var rowData = [];
                 
-                // Loop through each cell in the row
                 for (var j = 0; j < cols.length; j++) {
                     rowData.push(cols[j].innerText);
                 }
                 
-                csv.push(rowData.join('\t'));
+                data.push(rowData);
             }
 
-            // Create a Blob from the CSV data
-            var blob = new Blob([csv.join('\n')], { type: 'application/vnd.ms-excel' });
-            var link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-            link.download = filename;
+            var wb = XLSX.utils.book_new();
+            var ws = XLSX.utils.aoa_to_sheet(data);
 
-            // Trigger download
-            link.click();
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+            XLSX.writeFile(wb, filename);
         }
 
         // Add click event listener to the export button