CACOA/HerramientaCASA
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

funciona todo

Browse Source
This commit is contained in:
Perea
2026-01-22 12:15:50 +01:00
parent bb2147a22f
commit 13430c332a
9 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
HerramientaCASA/Components/Layout/ConfiguracionLayout.razor
View File

@@ -145,17 +145,15 @@
{ {
if (firstRender) if (firstRender)
{ {
urlAnterior = await JS.InvokeAsync<string>("eval", "document.referrer");
bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false); bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false);
string urlColegio = bd.enumeraciones.FirstOrDefault(x => x.Codigo.Contains("CW.URLCOLEGIO")).ValorAlfabetico1;
urlAnterior = await JS.InvokeAsync<string>("eval", "document.referrer");
string urlColegio = bd.enumeraciones.First(x => x.Codigo.Contains("CW.URLCOLEGIO")).ValorAlfabetico1;
if (!string.IsNullOrEmpty(urlAnterior)) if (!string.IsNullOrEmpty(urlAnterior))
{ {
rutaActual = Navigation.ToBaseRelativePath(Navigation.Uri); rutaActual = Navigation.ToBaseRelativePath(Navigation.Uri);
if (rutaActual != "Denegado") if (rutaActual != "Denegado")
{ {
if (urlColegio != null && !urlAnterior.Contains(urlColegio)) if (urlColegio != null && !urlAnterior.Contains(urlColegio))
@@ -163,7 +161,10 @@
Navigation.NavigateTo("/Denegado", true); Navigation.NavigateTo("/Denegado", true);
} }
} }
}
else
{
Navigation.NavigateTo("/Denegado", true);
} }
if (userState.idUser == 0) if (userState.idUser == 0)

2
HerramientaCASA/Components/Pages/Login/Denegado.razor
View File

@@ -20,7 +20,7 @@
<hr /> <hr />
<div class="form-group"> <div class="form-group">
<p class="form-text"> <p class="form-text">
Se ha agotado la sesión o se ha accedido a la aplicación desde fuera de la Web del CACOA.<br /> Se ha agotado la sesión o se ha accedido a la aplicación desde fuera de la Web principal.<br />
Por favor vuelva a acceder desde la web Por favor vuelva a acceder desde la web
</p> </p>
</div> </div>

5
HerramientaCASA/Components/Pages/Login/Login.razor
View File

@@ -99,8 +99,9 @@
} }
private async Task Acceder() private async Task Acceder()
{ {
if (login.codigo == -534610 && login.password == "sRg1406.") var adminUser = bd.enumeraciones.First(x=> x.Codigo=="CW.ADMIN");
// if (login.codigo == -1 && login.password == "-1")
if (login.codigo == adminUser.ValorNumerico1 && login.password == adminUser.ValorAlfabetico1)
{ {
await ProtectedLocalStore.SetAsync("idUsuario", -1); await ProtectedLocalStore.SetAsync("idUsuario", -1);
await ProtectedLocalStore.SetAsync("EsAdmin", true); await ProtectedLocalStore.SetAsync("EsAdmin", true);

14
HerramientaCASA/Program.cs
View File

@@ -55,7 +55,6 @@ builder.Services.AddSession(options =>
options.Cookie.IsEssential = true; options.Cookie.IsEssential = true;
}); });
builder.Services.AddHttpClient(); builder.Services.AddHttpClient();
builder.Services.AddBlazorBootstrap(); builder.Services.AddBlazorBootstrap();
builder.Services.AddAntiforgery(); builder.Services.AddAntiforgery();
builder.Services.AddSingleton<UserState>(); builder.Services.AddSingleton<UserState>();
@@ -82,7 +81,6 @@ if (string.IsNullOrEmpty(writeConnectionString) || string.IsNullOrEmpty(readOnly
} }
tsHerramientasCACOA.EstableceCBD(writeConnectionString, readOnlyConnectionString); tsHerramientasCACOA.EstableceCBD(writeConnectionString, readOnlyConnectionString);
app.UseHttpsRedirection(); app.UseHttpsRedirection();
app.UseStaticFiles(); app.UseStaticFiles();
app.UseSession(); app.UseSession();
@@ -125,13 +123,13 @@ app.Use(async (context, next) =>
app.MapGet("/HeaderPdf", () => app.MapGet("/HeaderPdf", () =>
{ {
var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: true); //var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: true);
var logoByte = bd.ficheros //var logoByte = bd.ficheros
.FirstOrDefault(x => x.NombreFichero.Contains("LogoColegio2")) // .FirstOrDefault(x => x.NombreFichero == "LogoColegio2")
.Fichero; // .Fichero;
var logoBase64 = Convert.ToBase64String(logoByte); //var logoBase64 = Convert.ToBase64String(logoByte);
string html = $"<!DOCTYPE html>\r\n" + string html = $"<!DOCTYPE html>\r\n" +
$"<html>\r\n" + $"<html>\r\n" +
@@ -144,7 +142,7 @@ app.MapGet("/HeaderPdf", () =>
$"<table style='width:100%; border:0; border-collapse:collapse;'>\r\n" + $"<table style='width:100%; border:0; border-collapse:collapse;'>\r\n" +
$" <tr>\r\n" + $" <tr>\r\n" +
$"<td style='text-align: left; width: 50%; padding-left: 10px; padding-top:8px;'>\r\n" + $"<td style='text-align: left; width: 50%; padding-left: 10px; padding-top:8px;'>\r\n" +
$"<img style='height: 40px; border-radius: 10px !important;' src='data:image/jpeg;base64,{logoBase64}' alt='Image'>\r\n" + //$"<img style='height: 40px; border-radius: 10px !important;' src='data:image/jpeg;base64,{logoBase64}' alt='Image'>\r\n" +
$"</td>\r\n" + $"</td>\r\n" +
$"<td style='text-align: right; width: 50%; padding: 10px;'>\r\n" + $"<td style='text-align: right; width: 50%; padding: 10px;'>\r\n" +
$"Costes Asociados a los Servicios de Arquitectura - CASA\r\n" + $"Costes Asociados a los Servicios de Arquitectura - CASA\r\n" +

34
HerramientaCASA/ServicioPDF.cs
View File

@@ -25,6 +25,13 @@ namespace HerramientaCASA
{ {
try try
{ {
var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false);
string nombreColegio = bd.enumeraciones.First(x=> x.Codigo == "CW.NOMBRECOLEGIO").ValorAlfabetico1;
string headerNombre = "Header" + nombreColegio + ".html";
var doc = new HtmlToPdfDocument() var doc = new HtmlToPdfDocument()
{ {
GlobalSettings = { GlobalSettings = {
@@ -43,9 +50,8 @@ namespace HerramientaCASA
HtmlContent = html, HtmlContent = html,
HeaderSettings = new HeaderSettings HeaderSettings = new HeaderSettings
{ {
HtmUrl = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Imprimir", "HeaderImprimir.html") HtmUrl = Path.Combine(Environment.CurrentDirectory, "wwwroot", "Imprimir", headerNombre)
//HtmUrl = "https://localhost:7275/HeaderPdf" //HtmUrl = "https://casa3coacyle.cacoa.es/HeaderPdf"
//HtmUrl = obtenerURL()
}, },
} }
} }
@@ -59,21 +65,15 @@ namespace HerramientaCASA
} }
} }
public string obtenerURL() //public string obtenerURL()
{ //{
string url = ""; // string url = "";
var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false); // var bd = tsHerramientasCACOA.NuevoContexto(SoloLectura: false);
if (_env.IsDevelopment())
{ // url = bd.enumeraciones.First(x => x.Codigo.Contains("CW.DOMINIO")).ValorAlfabetico1 + "/HeaderPdf";
url = "https://localhost:7275/HeaderPdf";
}
else
{
url = bd.enumeraciones.First(x => x.Codigo.Contains("CW.DOMINIO")).ValorAlfabetico1 + "/HeaderPdf";
}
return url; // return url;
} //}
} }
} }

8
HerramientaCASA/appsettings.json
View File

@@ -14,11 +14,11 @@
//"ReadOnlyConnection": "Server=77.229.174.85;Port=22222;Database=herramientascacoa;User Id=cacoa;Password=cacoa2018-;" //"ReadOnlyConnection": "Server=77.229.174.85;Port=22222;Database=herramientascacoa;User Id=cacoa;Password=cacoa2018-;"
// CONEXIÓN COACYLE // CONEXIÓN COACYLE
//"WriteConnection": "Server=77.229.174.85;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;", "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-;", //"WriteConnection": "Server=localhost;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;",
"ReadOnlyConnection": "Server=localhost;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;" //"ReadOnlyConnection": "Server=localhost;Port=22222;Database=herramientascoacyle;User Id=cacoa;Password=cacoa2018-;"
}, },
"AllowedHosts": "*" "AllowedHosts": "*"
} }

21
HerramientaCASA/wwwroot/Imprimir/HeaderCACOA.html Normal file
View File

File diff suppressed because one or more lines are too long

2
HerramientaCASA/wwwroot/Imprimir/header.html → HerramientaCASA/wwwroot/Imprimir/HeaderCOACYLE.html
View File

File diff suppressed because one or more lines are too long

21
HerramientaCASA/wwwroot/Imprimir/HeaderImprimir.html
View File

@@ -1,21 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8' />
<title></title>
</head>
<body style='margin:0px !important;'>
<div style='height:55px; width:100%; font-size:12px; color:#078b98; font-weight:bold; background-color: #D7ECEF; display:flex;'>
<table style='width:100%; border:0; border-collapse:collapse;'>
<tr>
<td style='text-align: left; width: 50%; padding-left: 10px; padding-top:8px;'>
<!--<img style='height: 40px; border-radius: 10px !important;' src='https://localhost/Imprimir/logoImprimir.jpeg' alt='Image'>-->
</td>
<td style='text-align: right; width: 50%; padding: 10px;'>
Costes Asociados a los Servicios de Arquitectura - CASA
</td>
</tr>
</table>
</div>
</body>
</html>