Commit c78e44e7 authored by Alfonso Rafael Solis Rangel's avatar Alfonso Rafael Solis Rangel
Browse files

Merge branch 'correcciones' into 'main' 

Correcciones

See merge request !32
parents 6019d161 f277602d

app/Exports/ContactosExport.php

+4 −1
Original line number Diff line number Diff line
@@ -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 = [];

app/Http/Controllers/GruposController.php

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


use App\Models\Grupos;

use Illuminate\Http\Request;

use Illuminate\Support\Facades\DB;

use Carbon\Carbon;



class GruposController extends Controller

{

resources/views/adminGen/contactos/export.blade.php

+10 −0
Original line number Diff line number Diff line
@@ -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');

            });



        }