From 3b77fc827db1f6d6d5a66a9230122d8bae447a0d Mon Sep 17 00:00:00 2001 From: Alejandro Date: Fri, 17 Apr 2026 13:26:15 +0200 Subject: [PATCH] arreglos registroPersonal --- .../Components/Pages/InfoPers.razor | 102 +++++++++++++++++- .../Components/Layout/MainLayout.razor | 2 +- .../DatosAdministrativos.razor | 9 +- .../Pages/InfoVidaAdministrativa.razor | 12 ++- .../wwwroot/Content/Site.css | 28 +++-- .../SwaggerAntifraude/appsettings.json | 14 +-- 6 files changed, 143 insertions(+), 24 deletions(-) diff --git a/Antifraude.Net/GestionPersonalWeb/Components/Pages/InfoPers.razor b/Antifraude.Net/GestionPersonalWeb/Components/Pages/InfoPers.razor index 3e2ee9a..3e893ca 100644 --- a/Antifraude.Net/GestionPersonalWeb/Components/Pages/InfoPers.razor +++ b/Antifraude.Net/GestionPersonalWeb/Components/Pages/InfoPers.razor @@ -26,6 +26,18 @@ @* *@ + + +

Se van a dar de alta o modificar datos de la persona seleccionada ¿desea continuar?

+ + + + + + + + +
@@ -352,10 +364,96 @@ private List lOcupacion = new List(); private List lSexo = new List(); private Tabs tabsDtsPer { get; set; } = new Tabs(); - + private Modal popupConfirmacion = default!; + List mensajes = new List(); private async Task GuardarPersona() { - + CerrarConfirmacion(); + cliente = Utilidades.ObtenerCliente(UserState.Token, HttpClientFactory); + // ValidarTodos(); + if (!editContext.GetValidationMessages().Any()) + + { + persona.AÑOCAMBIORESIDENCIA = 0; + + //Te quedaste en que tienes que coger la foto del navigation y guardarla (Por cierto el nuevo no aparece en la lista) + if (persona.IDFICHEROFOTONavigation != null) + { + FICHEROS fi = persona.IDFICHEROFOTONavigation; + if (persona.IDFICHEROFOTO != null) + { + var responsef = await Utilidades.ActualizarObjeto(cliente, "/api/FICHEROS/" + fi.IDFICHERO, fi); + persona.IDFICHEROFOTO = responsef.IDFICHERO; + + } + else + + { + var responsef = await Utilidades.NuevoObjeto(cliente, "/api/FICHEROS", fi); + persona.IDFICHEROFOTO = responsef.IDFICHERO; + } + } + + if (persona.IDPERSONA == 0)//Nuevo + { + + var response = await Utilidades.NuevoObjeto(cliente, "/api/PERSONAS", persona); + string link = "/InfoPers?cl=" + tsUtilidades.crypt.FEncS(response.NIF, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.:/-*", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.:/-*", 875421649); + NavigationManager.NavigateTo(link, forceLoad: true); + + } + else//Actualizar + { + var responsea = await Utilidades.ActualizarObjeto(cliente, "/api/PERSONAS/" + persona.IDPERSONA, persona); + var url = NavigationManager.ToAbsoluteUri(NavigationManager.Uri); + if (QueryHelpers.ParseQuery(url.Query).TryGetValue("cl", out var clValue)) { cl = clValue; } + cliente = Utilidades.ObtenerCliente(UserState.Token, HttpClientFactory); + string nifDesencriptado = tsUtilidades.crypt.FEncS(cl, + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.:/-*", + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.:/-*", + -875421649); + var response = await cliente.GetAsync($"/api/PERSONAS/PersonaNominaNif/{nifDesencriptado}"); + if (!response.IsSuccessStatusCode) + { + throw new Exception($"Error al obtener los datos de la persona. Código: {response.StatusCode}"); + } + + var resultContent = await response.Content.ReadAsStringAsync(); + persona = JsonConvert.DeserializeObject(resultContent) ?? throw new Exception("Error al deserializar los datos de la persona."); + mensajes.Add(new ToastMessage + { + Type = ToastType.Primary, + Message = $"Guardado correctamente.", + }); + } + } + else + { + var html = ""; + html += "Revise los errores antes de guardar:"; + foreach (string m in editContext.GetValidationMessages()) + { + html += "\n" + m + ". "; + } + + mensajes.Add(new ToastMessage + { + Type = ToastType.Danger, + + Message = html, + + }); + + } + + } + private async Task CerrarConfirmacion() + { + await popupConfirmacion.HideAsync(); + } + private async Task abrirGuardar() + { + await popupConfirmacion.ShowAsync(); } private async Task OnTabShownAsync(TabsEventArgs args) { diff --git a/Antifraude.Net/RegistroPersonalAN/Components/Layout/MainLayout.razor b/Antifraude.Net/RegistroPersonalAN/Components/Layout/MainLayout.razor index 5733c3d..7eb71af 100644 --- a/Antifraude.Net/RegistroPersonalAN/Components/Layout/MainLayout.razor +++ b/Antifraude.Net/RegistroPersonalAN/Components/Layout/MainLayout.razor @@ -14,7 +14,7 @@ - + diff --git a/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoPersonasComponents/DatosAdministrativos.razor b/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoPersonasComponents/DatosAdministrativos.razor index 2389c88..f8a0532 100644 --- a/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoPersonasComponents/DatosAdministrativos.razor +++ b/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoPersonasComponents/DatosAdministrativos.razor @@ -163,7 +163,7 @@
- +
@@ -295,6 +295,7 @@ private List listadoComCar = new List(); private List listadotramos = new List(); private int? IDTRAMOCOMCAR { get; set; } + private string? inputCuentaBancaria { get; set; } private DateTime? FECHACOMCAR { get; set; } private List listadoCausaBaja = new List(); private List listadoMutua = new List(); @@ -311,7 +312,11 @@ StateHasChanged(); } - + private void QuitarEspacios(ChangeEventArgs e) + { + Persona.CUENTABANCARIA = e.Value?.ToString().Replace(" ", ""); + StateHasChanged(); + } private async Task CargarCompCar() { diff --git a/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoVidaAdministrativa.razor b/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoVidaAdministrativa.razor index ecbdd70..faafc85 100644 --- a/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoVidaAdministrativa.razor +++ b/Antifraude.Net/RegistroPersonalAN/Components/Pages/InfoVidaAdministrativa.razor @@ -30,7 +30,7 @@ } @if (mostrarMensajeCuerpo == true) { -
+

No es posible editar vidas administrativas si la persona no tiene un cuerpo asignado

@@ -39,7 +39,7 @@ } @if (mostrarMensajeEliminar == true) { -
+

¿Esta seguro de eliminar esta vida administrativa?

@@ -51,7 +51,7 @@ } @if (mostrarAnadirLineaVida == true) { -
+
@@ -75,7 +75,7 @@ } @if (mostrarEditarLineaVida == true) { -
+
@@ -928,6 +928,9 @@ } protected async void AnadirLineaVida() { + mostrar = true; + await Task.Delay(1); + LINEASVIDAADMINISTRATIVA VA = new LINEASVIDAADMINISTRATIVA(); VA.IDTIPO = IDTIPODOCU; VA.FECHASUBIDA = DateTime.Now; @@ -1074,6 +1077,7 @@ cargarGridLineas(); cerrarAnadirLineaVida(); + mostrar = false; StateHasChanged(); } diff --git a/Antifraude.Net/RegistroPersonalAN/wwwroot/Content/Site.css b/Antifraude.Net/RegistroPersonalAN/wwwroot/Content/Site.css index 0f531cf..7aeb7ce 100644 --- a/Antifraude.Net/RegistroPersonalAN/wwwroot/Content/Site.css +++ b/Antifraude.Net/RegistroPersonalAN/wwwroot/Content/Site.css @@ -582,6 +582,18 @@ body { border-bottom: 3px solid var(--AzulMuyOscuro) !important; } .loadingFrame { + display: flex; + background-color: #000000e5; + position: fixed; + left: 0; + top: 0; + z-index: 1000; + justify-content: center; + align-items: center; + width: 100%; + height: 100vh; +} +.loadingFrameVida { display: flex; background-color: #000000e5; position: fixed; @@ -593,14 +605,14 @@ body { width: 100%; height: 100vh; } -.loadingDiv{ - padding:20px; - border-radius:5px; - background-color:white; - display:flex; - justify-content:center; - align-items:center; -} + .loadingDiv { + padding: 20px; + border-radius: 5px; + background-color: white; + display: flex; + justify-content: center; + align-items: center; + } .loadingImg { background-image: url(imagenes/cargaOAAF.gif); width: 80px; diff --git a/Antifraude.Net/SwaggerAntifraude/appsettings.json b/Antifraude.Net/SwaggerAntifraude/appsettings.json index 16a73d3..8de5b19 100644 --- a/Antifraude.Net/SwaggerAntifraude/appsettings.json +++ b/Antifraude.Net/SwaggerAntifraude/appsettings.json @@ -5,15 +5,15 @@ "Audience": "TuDominio.com", "ExpiresInMinutes": 60 }, - //"ConnectionStrings": { - // "WriteConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDEDESARROLLO", - // "ReadOnlyConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDEDESARROLLO" - //}, - //PRODUCCION "ConnectionStrings": { - "WriteConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDE", - "ReadOnlyConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDE" + "WriteConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDEDESARROLLO", + "ReadOnlyConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDEDESARROLLO" }, + //PRODUCCION + //"ConnectionStrings": { + // "WriteConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDE", + // "ReadOnlyConnection": "DATA SOURCE=192.168.41.203:21521/XE;PASSWORD=antifraude2022;PERSIST SECURITY INFO=True;USER ID=ANTIFRAUDE" + //}, "Logging": { "LogLevel": { "Default": "Information",