From db99928bf2aa966b2f22c64eea2db3ccf644c5cb Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Wed, 5 Mar 2025 08:36:42 -0600
Subject: [PATCH 1/5] Se elimino codigo residual

---
 .../views/adminGen/contactos/export.blade.php | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/resources/views/adminGen/contactos/export.blade.php b/resources/views/adminGen/contactos/export.blade.php
index 333b072..f51c698 100644
--- a/resources/views/adminGen/contactos/export.blade.php
+++ b/resources/views/adminGen/contactos/export.blade.php
@@ -16,34 +16,6 @@
             <p><b>Nota: </b>Este módulo aun se encuentra en desarrollo, por lo que podría haber errores.</p>
             <div class="p-6 bg-gray-100 rounded-lg shadow-md">
                 <form method="GET" action="" class="space-y-4" onsubmit="event.preventDefault(); logData();">
-                    <!-- Listas -->
-                    <!-- <div class="flex flex-col space-y-2">
-                        <label for="listas" class="text-gray-700 font-semibold">Listas:</label>
-                        <div class="flex space-x-2">
-                            <select id="listas" class="w-full px-3 py-2 bg-white border border-gray-300 rounded-md">
-                                <option value="" disabled selected>Selecciona una lista</option>
-                                @foreach($listas as $lista)
-                                    <option value="{{ $lista->id }}">{{ $lista->nombre }}</option>
-                                @endforeach
-                            </select>
-                            <button type="button" onclick="agregarEtiqueta('listas', 'listasAgregadas')" class="bg-blue-500 text-white px-3 py-2 rounded-md">Agregar</button>
-                        </div>
-                        <div id="listasAgregadas" class="flex flex-wrap space-x-2 mt-2"></div>
-                    </div> -->
-                    <!-- Características -->
-                    <!-- <div class="flex flex-col space-y-2">
-                        <label for="caracteristicas" class="text-gray-700 font-semibold">Características:</label>
-                        <div class="flex space-x-2">
-                            <select id="caracteristicas" class="w-full px-3 py-2 bg-white border border-gray-300 rounded-md">
-                                <option value="" disabled selected>Selecciona una característica</option>
-                                @foreach($caracteristicas as $caracteristica)
-                                    <option value="{{ $caracteristica->id }}">{{ $caracteristica->nombre }}</option>
-                                @endforeach
-                            </select>
-                            <button type="button" onclick="agregarEtiqueta('caracteristicas', 'caracteristicasAgregadas')" class="bg-blue-500 text-white px-3 py-2 rounded-md">Agregar</button>
-                        </div>
-                        <div id="caracteristicasAgregadas" class="flex flex-wrap space-x-2 mt-2"></div>
-                    </div> -->
 
                     <!-- Contacto -->
                     <div class="flex items-center space-x-2">
@@ -144,13 +116,6 @@ class="w-full px-3 py-2 bg-white border border-gray-300 rounded-md"
                 </form>
             </div>
 
-            <div class="flex items-center flex-wrap mb-5">
-            </div>
-            <table id="myTable" class="whitespace-nowrap table-hover">
-                <thead></thead>
-                <tbody></tbody>
-            </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>
-- 
GitLab


From 3c3eccd0baa5d55c3045939beb67b121d6bf950c Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Fri, 7 Mar 2025 09:24:49 -0600
Subject: [PATCH 2/5] Mensaje de error en caso de no encontrar contactos con
 los filtros seleccionados

---
 app/Exports/ContactosExport.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Exports/ContactosExport.php b/app/Exports/ContactosExport.php
index f8b57ef..390a244 100644
--- a/app/Exports/ContactosExport.php
+++ b/app/Exports/ContactosExport.php
@@ -6,6 +6,7 @@
 use Maatwebsite\Excel\Concerns\WithHeadings;
 use App\Models\Contacto;
 use App\Models\Grupos;
+use Exception;
 
 class ContactosExport implements FromCollection, WithHeadings
 {
@@ -49,11 +50,16 @@ public function collection()
             $contactos = $contactos->merge($contactosObligatorios)->unique('id');    
 
         }
-
-        // Mapear los datos a un formato exportable
-        return $contactos->map(function ($contacto) {
-            return $this->formatContactoData($contacto);
-        });
+        
+        if (!$contactos->isEmpty()) {
+            return $contactos->map(function ($contacto) {
+            
+                return $this->formatContactoData($contacto);
+            });
+        }else{
+            return throw new Exception('No se encontraron contactos con los filtros seleccionados.');
+        }
+        
     }
 
     public function headings(): array
@@ -77,7 +83,7 @@ private function applyFilters($query)
             });
         } elseif (!empty($this->filters['grupos'])) {
             $grupoId = $this->filters['grupos'];
-            $subgruposIds = Grupos::find($grupoId)->subgrupos->pluck('id')->toArray();
+            $subgruposIds = Grupos::find(153)->subgrupos->pluck('id')->toArray();
     
             $query->where(function ($query) use ($grupoId, $subgruposIds) {
                 // Contactos directamente en el grupo
-- 
GitLab


From faa4d110e54f051a50cd70af870edd60f499fe2c Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Fri, 7 Mar 2025 09:25:28 -0600
Subject: [PATCH 3/5] Punto final en un mensaje

---
 resources/views/adminGen/contactos/export.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/adminGen/contactos/export.blade.php b/resources/views/adminGen/contactos/export.blade.php
index f51c698..39c6d0c 100644
--- a/resources/views/adminGen/contactos/export.blade.php
+++ b/resources/views/adminGen/contactos/export.blade.php
@@ -267,7 +267,7 @@ function logData() {
             })
             .catch(err => {
                 console.error("Error al descargar el archivo:", err);
-                showToast(err.message || 'Error al descargar el archivo', 'Error', 'error');
+                showToast(err.message || 'Error al descargar el archivo.', 'Error', 'error');
             })
             .finally(() => {
                 document.getElementById('loader-container').classList.add('hidden');
-- 
GitLab


From 39562d9c240e0a298405d94dd85c1839252626ea Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Fri, 7 Mar 2025 09:26:32 -0600
Subject: [PATCH 4/5] Ruta para exportar los contactos que tengan las listas

---
 routes/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web.php b/routes/web.php
index 56ee1c4..9b113fd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -158,4 +158,5 @@
         Route::get('/reportes/contactos/buscar', [ReporteController::class, 'find'])->name('find')->middleware(CheckRoles::class . ':admingen,admin,capturista,lector');
         Route::post('/reportes/contactos/exportar', [ReporteController::class, 'export'])->name('export')->middleware(CheckRoles::class . ':admingen,admin,capturista,lector');
         Route::get('/reportes/subgrupos/{id}', [ReporteController::class, 'getSubgrupos'])->name('subgrupos')->middleware(CheckRoles::class . ':admingen,admin,capturista,lector');
+        Route::post("/reportes/listas/exportar", [ReporteController::class, 'exportListas'])->name('exportListas')->middleware(CheckRoles::class . ':admingen,admin,capturista,lector');
     });
\ No newline at end of file
-- 
GitLab


From 297cd7c4a56972054a301670ad29539b17f5b217 Mon Sep 17 00:00:00 2001
From: Alfonso Rafael Solis Rangel <alfonsorafaelsolisrangel@gmail.com>
Date: Mon, 10 Mar 2025 09:38:14 -0600
Subject: [PATCH 5/5] Cambio en la ruta de subgrupos

---
 .../views/components/common/sidebaradmin.blade.php   |  3 ++-
 routes/web.php                                       | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/common/sidebaradmin.blade.php b/resources/views/components/common/sidebaradmin.blade.php
index 9fb2dcf..652385b 100644
--- a/resources/views/components/common/sidebaradmin.blade.php
+++ b/resources/views/components/common/sidebaradmin.blade.php
@@ -138,7 +138,8 @@ class="before:bg-gray-300 before:w-[5px] before:h-[5px] before:rounded ltr:befor
                                     <a href="/catalogos/grupos">Grupos</a>
                                 </li>
                                 <li>
-                                    <a href="/catalogos/grupos/subgrupos">Subgrupos</a>
+                                    <a href="/catalogos/subgrupos">Subgrupos</a>
+                                </li>
                             </ul>
                         </li>
                     </ul>
diff --git a/routes/web.php b/routes/web.php
index 9b113fd..62d5d54 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -67,12 +67,12 @@
     Route::put('/catalogos/dependencias', [DependenciaController::class, 'update'])->name('dependencias.update')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
     Route::delete('/catalogos/dependencias/{id}', [DependenciaController::class, 'destroy'])->name('dependencias.destroy')->middleware(CheckRoles::class . ':admingen,admin' );
 
-    Route::get('/catalogos/grupos/subgrupos', [SubgrupoController::class, 'index'])->name('subgrupos.get')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
-    Route::get('/catalogos/grupos/subgrupos/crear', [SubgrupoController::class, 'create'])->name('subgrupos.create')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
-    Route::post('/catalogos/grupos/subgrupos/crear', [SubgrupoController::class, 'store'])->name('subgrupos.store')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
-    Route::get('/catalogos/grupos/subgrupos/{id}/editar', [SubgrupoController::class, 'edit'])->name('subgrupos.edit')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
-    Route::put('/catalogos/grupos/subgrupos/{id}/editar', [SubgrupoController::class, 'update'])->name('subgrupos.update')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
-    Route::delete('/catalogos/grupos/subgrupos/{id}', [SubgrupoController::class, 'destroy'])->name('subgrupos.destroy')->middleware(CheckRoles::class . ':admingen,admin' );
+    Route::get('/catalogos/subgrupos', [SubgrupoController::class, 'index'])->name('subgrupos.get')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
+    Route::get('/catalogos/subgrupos/crear', [SubgrupoController::class, 'create'])->name('subgrupos.create')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
+    Route::post('/catalogos/subgrupos/crear', [SubgrupoController::class, 'store'])->name('subgrupos.store')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
+    Route::get('/catalogos/subgrupos/{id}/editar', [SubgrupoController::class, 'edit'])->name('subgrupos.edit')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
+    Route::put('/catalogos/subgrupos/{id}/editar', [SubgrupoController::class, 'update'])->name('subgrupos.update')->middleware(CheckRoles::class . ':admingen,admin,capturista' );
+    Route::delete('/catalogos/subgrupos/{id}', [SubgrupoController::class, 'destroy'])->name('subgrupos.destroy')->middleware(CheckRoles::class . ':admingen,admin' );
 });
 
 Route::middleware('auth:sanctum',
-- 
GitLab