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

Cargo y descripcion del cargo en la vista principal

parent c5a46806
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ public function obtenerEventos(Request $request){
                });
            }
        })
        ->select('id', 'nombre', 'ap_paterno', 'ap_materno', 'mes_cump', 'dia_cump')
        ->select('id', 'nombre', 'ap_paterno', 'ap_materno', 'mes_cump', 'dia_cump', 'cargo_desc')
        ->get();

        // Obtener aniversarios de instituciones en el rango de fechas visible
@@ -661,7 +661,8 @@ public function obtenerEventos(Request $request){
                'title' => $contacto->nombre . ' ' . $contacto->ap_paterno. ' ' . $contacto->ap_materno,
                'start' => now()->year . '-' . str_pad($contacto->mes_cump, 2, '0', STR_PAD_LEFT) . '-' . str_pad($contacto->dia_cump, 2, '0', STR_PAD_LEFT),
                'className' => 'success',
                'description' => 'Cumpleaños de ' . $contacto->nombre,
                'cargo' => $contacto->cargo->nombre ?? 'Sin información',
                'description' => $contacto->cargo_desc ?? 'Sin información',
            ];
        })->merge($aniversarios->map(function ($institucion) {
            return [
+11 −1
Original line number Diff line number Diff line
@@ -56,7 +56,14 @@ class="form-input" placeholder="Event Start Date" x-model="params.start"
                                            <div class="text-danger mt-2" id="startDateErr"></div>
                                        </div>
                                        <div class="mb-5">
                                            <label for="description">Descripción :</label>
                                            <label for="cargo">Cargo :</label>
                                            <input disabled id="cargo" type="text" name="cargo" id="cargo"
                                                class="form-input" placeholder="Enter Event cargo"
                                                x-model="params.cargo" required />
                                            <div class="text-danger mt-2" id="cargoErr"></div>
                                        </div>
                                        <div class="mb-5">
                                            <label for="description">Descripción del cargo:</label>
                                            <textarea disabled id="description" name="description" id="description" class="form-textarea min-h-[130px]"
                                                placeholder="Enter Event Description" x-model="params.description"></textarea>
                                        </div>
@@ -83,6 +90,7 @@ class="form-input" placeholder="Event Start Date" x-model="params.start"
                    start: '',
                    end: '',
                    description: '',
                    cargo: '',
                    type: 'primary'
                }),
                params: {
@@ -91,6 +99,7 @@ class="form-input" placeholder="Event Start Date" x-model="params.start"
                    start: '',
                    end: '',
                    description: '',
                    cargo: '',
                    type: 'primary'
                },
                isAddEventModal: false,
@@ -157,6 +166,7 @@ class="form-input" placeholder="Event Start Date" x-model="params.start"
                            end: obj.start,
                            type: obj.classNames ? obj.classNames[0] : 'primary',
                            description: obj.extendedProps ? obj.extendedProps.description : '',
                            cargo: obj.extendedProps ? obj.extendedProps.cargo : '',
                        };
                        this.minStartDate = new Date();
                        this.minEndDate = new Date();