From bb2147a22f1403fd51954ccec24a99648e052932 Mon Sep 17 00:00:00 2001 From: Perea Date: Mon, 19 Jan 2026 11:34:47 +0100 Subject: [PATCH] se confia en sergio --- .../Components/Pages/HerramientaCASAS.razor | 31 ++++--------------- HerramientaCASA/Program.cs | 3 +- HerramientaCASA/ServicioPDF.cs | 11 ++++--- HerramientaCASA/appsettings.json | 2 +- .../wwwroot/Imprimir/HeaderImprimir.html | 2 +- HerramientaCASA/wwwroot/Imprimir/header.html | 21 +++++++++++++ 6 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 HerramientaCASA/wwwroot/Imprimir/header.html diff --git a/HerramientaCASA/Components/Pages/HerramientaCASAS.razor b/HerramientaCASA/Components/Pages/HerramientaCASAS.razor index c188492..2dece1b 100644 --- a/HerramientaCASA/Components/Pages/HerramientaCASAS.razor +++ b/HerramientaCASA/Components/Pages/HerramientaCASAS.razor @@ -376,18 +376,7 @@ public async Task imprimir() { - - var a = PdfService.obtenerURL(); - - mensajes.Add(new ToastMessage - { - Type = ToastType.Danger, - Message = a, - }); - - try - { - var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); + var cssPath = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Content", "Site.css"); var cssContent = await File.ReadAllTextAsync(cssPath); var contenidoHtml = await JSA.InvokeAsync("obtenerPDFImprimir", "DespachoImprimir"); @@ -404,21 +393,13 @@ "; - var arrayPDF = PdfService.GenerarPdf("fullHtml"); - + var arrayPDF = PdfService.GenerarPdf(fullHtml); - string base64Pdf = Convert.ToBase64String(arrayPDF); + string base64Pdf = Convert.ToBase64String(arrayPDF); - await JSA.InvokeVoidAsync("descargarPdf", "SimulacionHerramientaCASA_" + DateTime.Now , null); - }catch(Exception ex) - { - mensajes.Add(new ToastMessage - { - Type = ToastType.Danger, - Message = ex.Message, - }); - } - + + + await JSA.InvokeVoidAsync("descargarPdf", "SimulacionHerramientaCASA_" + DateTime.Now, base64Pdf); } } diff --git a/HerramientaCASA/Program.cs b/HerramientaCASA/Program.cs index 43981c1..4b01a66 100644 --- a/HerramientaCASA/Program.cs +++ b/HerramientaCASA/Program.cs @@ -54,6 +54,7 @@ builder.Services.AddSession(options => options.Cookie.HttpOnly = true; options.Cookie.IsEssential = true; }); +builder.Services.AddHttpClient(); builder.Services.AddBlazorBootstrap(); builder.Services.AddAntiforgery(); @@ -127,7 +128,7 @@ app.MapGet("/HeaderPdf", () => var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: true); var logoByte = bd.ficheros - .First(x => x.NombreFichero.Contains("LogoColegio2")) + .FirstOrDefault(x => x.NombreFichero.Contains("LogoColegio2")) .Fichero; var logoBase64 = Convert.ToBase64String(logoByte); diff --git a/HerramientaCASA/ServicioPDF.cs b/HerramientaCASA/ServicioPDF.cs index e024e43..b8a36f2 100644 --- a/HerramientaCASA/ServicioPDF.cs +++ b/HerramientaCASA/ServicioPDF.cs @@ -11,14 +11,17 @@ namespace HerramientaCASA { private readonly IConverter _converter; private readonly IWebHostEnvironment _env; + private readonly HttpClient _http; - public ServicioPDF(IConverter converter, IWebHostEnvironment env) + + public ServicioPDF(IConverter converter, IWebHostEnvironment env, HttpClient http) { _converter = converter; _env = env; + _http = http; } - public byte[] GenerarPdf(string html) + public byte[] GenerarPdf(string html) { try { @@ -40,9 +43,9 @@ namespace HerramientaCASA HtmlContent = html, HeaderSettings = new HeaderSettings { - //HtmUrl = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Imprimir", "HeaderImprimir.html") + HtmUrl = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Imprimir", "HeaderImprimir.html") //HtmUrl = "https://localhost:7275/HeaderPdf" - HtmUrl = obtenerURL() + //HtmUrl = obtenerURL() }, } } diff --git a/HerramientaCASA/appsettings.json b/HerramientaCASA/appsettings.json index eec639f..08e3571 100644 --- a/HerramientaCASA/appsettings.json +++ b/HerramientaCASA/appsettings.json @@ -15,7 +15,7 @@ // CONEXIÓN COACYLE //"WriteConnection": "Server=77.229.174.85;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;", - //"ReadOnlyConnection": "Server=77.229.174.85;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;" + //"ReadOnlyConnection": "Server=77.229.174.85;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;", "WriteConnection": "Server=localhost;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;", "ReadOnlyConnection": "Server=localhost;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;" diff --git a/HerramientaCASA/wwwroot/Imprimir/HeaderImprimir.html b/HerramientaCASA/wwwroot/Imprimir/HeaderImprimir.html index 83189f9..16b0b74 100644 --- a/HerramientaCASA/wwwroot/Imprimir/HeaderImprimir.html +++ b/HerramientaCASA/wwwroot/Imprimir/HeaderImprimir.html @@ -9,7 +9,7 @@
- Image + Costes Asociados a los Servicios de Arquitectura - CASA diff --git a/HerramientaCASA/wwwroot/Imprimir/header.html b/HerramientaCASA/wwwroot/Imprimir/header.html new file mode 100644 index 0000000..e8fbddd --- /dev/null +++ b/HerramientaCASA/wwwroot/Imprimir/header.html @@ -0,0 +1,21 @@ + + + + + + + +
+ + + + + +
+Image + +Costes Asociados a los Servicios de Arquitectura - CASA +
+
+ + \ No newline at end of file