From 273372d99049f7085ab89be7f7e73c86715b81fc Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Mon, 3 Mar 2025 09:59:39 -0600
Subject: [PATCH 1/3] Mas datos de exportacion

---
 app/Exports/ContactosExport.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Exports/ContactosExport.php b/app/Exports/ContactosExport.php
index 41f5f09..f8b57ef 100644
--- a/app/Exports/ContactosExport.php
+++ b/app/Exports/ContactosExport.php
@@ -58,7 +58,7 @@ public function collection()
 
     public function headings(): array
     {
-        $defaultHeadings = ['Profesión', 'Nombre', 'Apellido Paterno', 'Apellido Materno', 'Cargo'];
+        $defaultHeadings = ['Profesión', 'Nombre', 'Apellido Paterno', 'Apellido Materno', 'Cargo', 'Descripción del cargo', 'Grupo', 'Subgrupo'];
         $extraHeadings = $this->getExtraHeadings();
         return array_merge($defaultHeadings, $extraHeadings);
     }
@@ -146,6 +146,9 @@ private function formatContactoData($contacto)
             'Apellido Paterno' => $contacto->ap_paterno,
             'Apellido Materno' => $contacto->ap_materno ?? '',
             'Cargo' => $contacto->cargo->nombre ?? 'N/A',
+            'Descripción del cargo' => $contacto->cargo_desc ?? 'N/A',
+            'Grupo' => $contacto->grupos->pluck('nombre')[0] ?? 'N/A',
+            'Subgrupo' => $contacto->subgrupos->pluck('nombre')[0] ?? 'N/A',
         ];
 
         $extraData = [];
-- 
GitLab


From e76570699c2d10f0eed5a3e9003efa3dd60e4584 Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Mon, 3 Mar 2025 09:59:51 -0600
Subject: [PATCH 2/3] Eliminacion de importaciones innecesarias

---
 app/Http/Controllers/GruposController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Http/Controllers/GruposController.php b/app/Http/Controllers/GruposController.php
index 8cf28f4..558c7cc 100644
--- a/app/Http/Controllers/GruposController.php
+++ b/app/Http/Controllers/GruposController.php
@@ -4,8 +4,6 @@
 
 use App\Models\Grupos;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Carbon\Carbon;
 
 class GruposController extends Controller
 {
-- 
GitLab


From f277602d19555ebe5a232d8e6c1c2f4fb6200bd5 Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Mon, 3 Mar 2025 10:41:11 -0600
Subject: [PATCH 3/3] Loader de carga en las exportaciones

---
 resources/views/adminGen/contactos/export.blade.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/resources/views/adminGen/contactos/export.blade.php b/resources/views/adminGen/contactos/export.blade.php
index ac629c0..333b072 100644
--- a/resources/views/adminGen/contactos/export.blade.php
+++ b/resources/views/adminGen/contactos/export.blade.php
@@ -152,6 +152,9 @@ class="w-full px-3 py-2 bg-white border border-gray-300 rounded-md"
             </table>
 
         </div>
+        <div id="loader-container" class="fixed inset-0 flex items-center justify-center bg-gray-500 bg-opacity-75 hidden">
+            <span id="loader" class="animate-spin border-8 border-gray-300 border-l-[#780005] border-r-[#780005] rounded-full w-14 h-14"></span>
+        </div>
     </div>
 
     <link rel="stylesheet" href="{{ Vite::asset('resources/css/highlight.min.css') }}">
@@ -257,6 +260,9 @@ function logData() {
                 diaFin: fechaFin ? fechaFin.getDate().toString().padStart(2, '0') : null,
             };
 
+            document.getElementById('loader-container').classList.remove('hidden');
+            document.querySelector('form').classList.add('pointer-events-none');
+
             fetch('/reportes/contactos/exportar', {
                 method: "POST",
                 body: JSON.stringify(data),
@@ -297,6 +303,10 @@ function logData() {
             .catch(err => {
                 console.error("Error al descargar el archivo:", err);
                 showToast(err.message || 'Error al descargar el archivo', 'Error', 'error');
+            })
+            .finally(() => {
+                document.getElementById('loader-container').classList.add('hidden');
+                document.querySelector('form').classList.remove('pointer-events-none');
             });
 
         }
-- 
GitLab