diff --git a/HerramientaCASA/Components/Layout/LoginLayout.razor b/HerramientaCASA/Components/Layout/LoginLayout.razor index ee0a0a4..e822446 100644 --- a/HerramientaCASA/Components/Layout/LoginLayout.razor +++ b/HerramientaCASA/Components/Layout/LoginLayout.razor @@ -39,22 +39,22 @@ @code{ - // protected override void OnAfterRender(bool firstRender) - // { - // if (firstRender) - // { - // string? urlAnterior = HttpContextAccessor.HttpContext?.Request.Headers["Referer"].ToString(); - // string rutaActual = Navigation.ToBaseRelativePath(Navigation.Uri); + protected override void OnAfterRender(bool firstRender) + { + if (firstRender) + { + string? urlAnterior = HttpContextAccessor.HttpContext?.Request.Headers["Referer"].ToString(); + string rutaActual = Navigation.ToBaseRelativePath(Navigation.Uri); - // if (rutaActual != "Denegado") - // { - // if (string.IsNullOrEmpty(urlAnterior) || urlAnterior.Contains("cacoa.es")) - // { - // Navigation.NavigateTo("/Denegado", true); - // } - // } - // } - // } + if (rutaActual != "Denegado") + { + if (string.IsNullOrEmpty(urlAnterior) || urlAnterior.Contains("cacoa.es")) + { + Navigation.NavigateTo("/Denegado", true); + } + } + } + } } diff --git a/HerramientaCASA/Components/Pages/HerramientaCASAS.razor b/HerramientaCASA/Components/Pages/HerramientaCASAS.razor index 9377863..d045a28 100644 --- a/HerramientaCASA/Components/Pages/HerramientaCASAS.razor +++ b/HerramientaCASA/Components/Pages/HerramientaCASAS.razor @@ -52,7 +52,7 @@
- + @* *@
@@ -377,23 +377,27 @@ public async Task imprimir() { - // var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); - // var cssContent = await File.ReadAllTextAsync(cssPath); + var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); + var cssContent = await File.ReadAllTextAsync(cssPath); var contenidoHtml = await JSA.InvokeAsync("obtenerPDFImprimir", "DespachoImprimir"); var fullHtml = $@" + + + + + {contenidoHtml} "; - // var arrayPDF = PdfService.HtmlToPdfWithSiteCss(fullHtml, Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css")); var arrayPDF = PdfService.GenerarPdf(fullHtml); string base64Pdf = Convert.ToBase64String(arrayPDF); - await JSA.InvokeVoidAsync("descargarPdf", "prueba", base64Pdf); + await JSA.InvokeVoidAsync("descargarPdf", "SimulacionHerramientaCASA_"+ DateTime.Now , base64Pdf); } } diff --git a/HerramientaCASA/Components/Pages/HerramientaURBAN.razor b/HerramientaCASA/Components/Pages/HerramientaURBAN.razor index 4a5f465..1c95574 100644 --- a/HerramientaCASA/Components/Pages/HerramientaURBAN.razor +++ b/HerramientaCASA/Components/Pages/HerramientaURBAN.razor @@ -9,6 +9,8 @@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @inject ProtectedLocalStorage ProtectedLocalStore @inject IJSRuntime JS +@inject ServicioPDF PdfService + @rendermode InteractiveServer @inject NavigationManager Navigation @@ -350,4 +352,30 @@ // await JS.InvokeVoidAsync("mostrarPdf", Convert.ToBase64String(pdfBytes)); // } + public async Task imprimir() + { + + var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); + var cssContent = await File.ReadAllTextAsync(cssPath); + + var contenidoHtml = await JS.InvokeAsync("obtenerPDFImprimir", "DespachoURBANImprimir"); + var fullHtml = $@" + + + + + + + + {contenidoHtml} + + "; + + + var arrayPDF = PdfService.GenerarPdf(fullHtml); + + string base64Pdf = Convert.ToBase64String(arrayPDF); + + await JS.InvokeVoidAsync("descargarPdf", "SimulacionHerramientaUrbanismo_" + DateTime.Now, base64Pdf); + } } diff --git a/HerramientaCASA/Components/Pages/Imprimir/HerramientaCASAImprimir.razor b/HerramientaCASA/Components/Pages/Imprimir/HerramientaCASAImprimir.razor index 3790f7a..38764ba 100644 --- a/HerramientaCASA/Components/Pages/Imprimir/HerramientaCASAImprimir.razor +++ b/HerramientaCASA/Components/Pages/Imprimir/HerramientaCASAImprimir.razor @@ -6,7 +6,7 @@ @msTextoEncabezado

-
+

@@ -14,35 +14,18 @@
@* TABLA COSTE HORA DESPACHO PROFESIONAL *@ - - - - - -
- hola - adios
+
Coste hora de los trabajos realizados por el despacho profesional
- + - + diff --git a/HerramientaCASA/Components/Pages/Licitaciones.razor b/HerramientaCASA/Components/Pages/Licitaciones.razor index b50e49f..0d42e8b 100644 --- a/HerramientaCASA/Components/Pages/Licitaciones.razor +++ b/HerramientaCASA/Components/Pages/Licitaciones.razor @@ -7,6 +7,8 @@ @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @inject ProtectedLocalStorage ProtectedLocalStore @inject IJSRuntime JS +@inject ServicioPDF PdfService + @page "/LicitacionCASA" @page "/LicitacionCASA/{idSimulador}" @@ -516,4 +518,32 @@ string urlManual = bd.enumeraciones.FirstOrDefault(x => x.Codigo.Contains("MANUAL.LICITACIONCASA")).ValorAlfabeticoLargo; await JS.InvokeVoidAsync("abrirManual", urlManual); } + + + public async Task imprimir() + { + + var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); + var cssContent = await File.ReadAllTextAsync(cssPath); + + var contenidoHtml = await JS.InvokeAsync("obtenerPDFImprimir", "LicitacionesCASAImprimir"); + var fullHtml = $@" + + + + + + + + {contenidoHtml} + + "; + + + var arrayPDF = PdfService.GenerarPdf(fullHtml); + + string base64Pdf = Convert.ToBase64String(arrayPDF); + + await JS.InvokeVoidAsync("descargarPdf", "SimulacionLicitacionCASA_" + DateTime.Now, base64Pdf); + } } diff --git a/HerramientaCASA/Components/Pages/LicitacionesURBAN.razor b/HerramientaCASA/Components/Pages/LicitacionesURBAN.razor index 64ae3b7..95675d8 100644 --- a/HerramientaCASA/Components/Pages/LicitacionesURBAN.razor +++ b/HerramientaCASA/Components/Pages/LicitacionesURBAN.razor @@ -8,6 +8,7 @@ @using bdHerramientaCACOA.db @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @inject IJSRuntime JS +@inject ServicioPDF PdfService @inject ProtectedLocalStorage ProtectedLocalStore @@ -588,4 +589,32 @@ objetoLicitacionUrban.EsPorUsos = guardarSeleccion; } + + + public async Task imprimir() + { + + var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); + var cssContent = await File.ReadAllTextAsync(cssPath); + + var contenidoHtml = await JS.InvokeAsync("obtenerPDFImprimir", "LiciURBANImprimir"); + var fullHtml = $@" + + + + + + + + {contenidoHtml} + + "; + + + var arrayPDF = PdfService.GenerarPdf(fullHtml); + + string base64Pdf = Convert.ToBase64String(arrayPDF); + + await JS.InvokeVoidAsync("descargarPdf", "SimulacionLicitacionUrbanismo_" + DateTime.Now, base64Pdf); + } } diff --git a/HerramientaCASA/ServicioPDF.cs b/HerramientaCASA/ServicioPDF.cs index 79d004b..3aad5d7 100644 --- a/HerramientaCASA/ServicioPDF.cs +++ b/HerramientaCASA/ServicioPDF.cs @@ -22,8 +22,7 @@ namespace HerramientaCASA }, Objects = { new ObjectSettings() { - HtmlContent = html, - WebSettings = { DefaultEncoding = "utf-8", UserStyleSheet = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css") } + HtmlContent = html } } };
Tipo de costes Coste/hora