Merge branch 'develop' of https://gitlab.steamware.net/egalware/webdoorcreator into develop
This commit is contained in:
@@ -74,6 +74,17 @@ namespace WebDoorCreator.Data.Services
|
||||
RedisValue svgVal = await redisDb.StringGetAsync(currSvgKey);
|
||||
return svgVal.ToString();
|
||||
}
|
||||
/// <summary>
|
||||
/// Restitusice gli errori della porta in oggetto
|
||||
/// </summary>
|
||||
/// <param name="doorIdVers">formato DoorId:Versione</param>
|
||||
/// <returns></returns>
|
||||
public async Task<string> DoorErrGet(string doorIdVers)
|
||||
{
|
||||
RedisKey currErrKey = new RedisKey($"{Constants.CALC_REQ_ERRS}:{doorIdVers}");
|
||||
RedisValue errVal = await redisDb.StringGetAsync(currErrKey);
|
||||
return errVal.ToString();
|
||||
}
|
||||
|
||||
public async Task<bool> FlushRedisCache()
|
||||
{
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
<div class="" style="height:100%; width:100%; position:sticky; background: linear-gradient(#AFCFD1, #92B2C4);min-height: 46rem;max-height: 46rem;">
|
||||
@if (IsErr)
|
||||
{
|
||||
<div class="alert alert-warning text-center fs-2">@ErrCode</div>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(@SvgContent))
|
||||
{
|
||||
@svgPreview
|
||||
@*<b>@SvgContent</b>*@
|
||||
}
|
||||
</div>
|
||||
@@ -18,6 +18,11 @@ namespace WebDoorCreator.UI.Components.DoorDef
|
||||
//StateHasChanged();
|
||||
}
|
||||
}
|
||||
[Parameter]
|
||||
public string ErrCode { get; set; } = "ERROREEEEE";
|
||||
[Parameter]
|
||||
public bool IsErr { get; set; } = false;
|
||||
|
||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
||||
|
||||
protected string _svgContent { get; set; } = "";
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-5 p-0">
|
||||
<CascadingValue Value="@idDoor">
|
||||
<DoorPreview SvgContent="@DoorSvgContent"></DoorPreview>
|
||||
<CascadingValue Value="@idDoor">
|
||||
<DoorPreview IsErr="@IsErr" ErrCode="@ErrCode" SvgContent="@DoorSvgContent"></DoorPreview>
|
||||
</CascadingValue>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -170,6 +170,9 @@ namespace WebDoorCreator.UI.Pages
|
||||
|
||||
#region Private Methods
|
||||
|
||||
protected string ErrCode { get; set; } = "ERRORE GRAVISSIMO! NON SI FA!!!!";
|
||||
protected bool IsErr { get; set; } = false;
|
||||
|
||||
private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
|
||||
{
|
||||
DoorSvgContent = "";
|
||||
@@ -181,6 +184,11 @@ namespace WebDoorCreator.UI.Pages
|
||||
string doorSvgVers = currArgs.newMessage;
|
||||
//cerco su redis la porta in oggetto
|
||||
DoorSvgContent = await QDataServ.DoorSvgGet(doorSvgVers);
|
||||
if (string.IsNullOrEmpty(DoorSvgContent))
|
||||
{
|
||||
IsErr = true;
|
||||
ErrCode = await QDataServ.DoorErrGet(doorSvgVers);
|
||||
}
|
||||
await Task.Run(async () => await InvokeAsync(StateHasChanged));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user