diff --git a/WebDoorCreator.Data/Services/QueueDataService.cs b/WebDoorCreator.Data/Services/QueueDataService.cs
index 06a4b5e..55cca09 100644
--- a/WebDoorCreator.Data/Services/QueueDataService.cs
+++ b/WebDoorCreator.Data/Services/QueueDataService.cs
@@ -150,6 +150,30 @@ namespace WebDoorCreator.Data.Services
return errVal.ToString();
}
+ ///
+ /// Cerca nelle esecuzioni ultimo SVG della porta e lo restituisce...
+ ///
+ ///
+ ///
+ public async Task DoorGetLastSvg(int DoorId)
+ {
+ string answ = "";
+ // cerco in hashtable dei task eseguiti ultimo x porta corrente...
+ var doorData = await RequestDoneGetSingle(DoorId);
+ if (doorData != null && doorData.Count > 0)
+ {
+ var firstRecord = doorData.FirstOrDefault();
+ // recupero da REDIS
+ var currSvgKey = new RedisKey($"{Constants.CALC_REQ_SVG_CACHE}:{firstRecord.Key}:{firstRecord.Value}");
+ var rawData = await redisDb.StringGetAsync(currSvgKey);
+ if (rawData.HasValue)
+ {
+ answ = $"{rawData}";
+ }
+ }
+ return answ;
+ }
+
///
/// Remove for single hash record
///
@@ -369,6 +393,7 @@ namespace WebDoorCreator.Data.Services
Log.Debug($"RequestDone | {source} in: {ts.TotalMilliseconds} ms");
return dictResult;
}
+
///
/// Get LAST request done for DoorId
///
@@ -390,7 +415,6 @@ namespace WebDoorCreator.Data.Services
if (rawData.HasValue)
{
dictResult.Add($"{DoorId}", $"{rawData}");
-
}
}
stopWatch.Stop();
@@ -663,29 +687,6 @@ namespace WebDoorCreator.Data.Services
}
return answ;
}
- ///
- /// Cerca nelle esecuzioni ultimo SVG della porta e lo restituisce...
- ///
- ///
- ///
- public async Task DoorGetLastSvg(int DoorId)
- {
- string answ = "";
- // cerco in hashtable dei task eseguiti ultimo x porta corrente...
- var doorData = await RequestDoneGetSingle(DoorId);
- if (doorData != null && doorData.Count > 0)
- {
- var firstRecord = doorData.FirstOrDefault();
- // recupero da REDIS
- var currSvgKey = new RedisKey($"{Constants.CALC_REQ_SVG_CACHE}:{firstRecord.Key}:{firstRecord.Value}");
- var rawData = await redisDb.StringGetAsync(currSvgKey);
- if (rawData.HasValue)
- {
- answ = $"{rawData}";
- }
- }
- return answ;
- }
///
/// Invio richiesta di calcolo per la porta indicata, dato il suo DDF
@@ -990,13 +991,6 @@ namespace WebDoorCreator.Data.Services
{
get => TimeSpan.FromHours(24);
}
- ///
- /// Durata cache di 24h
- ///
- private TimeSpan WeekLongCache
- {
- get => TimeSpan.FromHours(24 * 7);
- }
///
/// Durata cache lunga (+ perturbazione percentuale +/-10%)
@@ -1022,6 +1016,14 @@ namespace WebDoorCreator.Data.Services
get => TimeSpan.FromSeconds(cacheTtlLong * 10 * rnd.Next(900, 1100) / 1000);
}
+ ///
+ /// Durata cache di 24h
+ ///
+ private TimeSpan WeekLongCache
+ {
+ get => TimeSpan.FromHours(24 * 7);
+ }
+
#endregion Private Properties
#region Private Methods
diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
index b2c7fa1..9253987 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
@@ -4,13 +4,13 @@
{
}
diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
index 2c5cebd..9cef7db 100644
--- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
+++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
@@ -24,7 +24,6 @@
- @**@
@if (ShowPlusMinus)
@@ -35,7 +34,6 @@
else if (ShowClone)
{
execClone()" />
-
}
diff --git a/WebDoorCreator.UI/wwwroot/images/LogoEgw01.png b/WebDoorCreator.UI/wwwroot/images/LogoEgw01.png
index a7231ed..90385b4 100644
Binary files a/WebDoorCreator.UI/wwwroot/images/LogoEgw01.png and b/WebDoorCreator.UI/wwwroot/images/LogoEgw01.png differ
diff --git a/WebDoorCreator.UI/wwwroot/images/LogoEgwBlack.png b/WebDoorCreator.UI/wwwroot/images/LogoEgwBlack.png
new file mode 100644
index 0000000..90385b4
Binary files /dev/null and b/WebDoorCreator.UI/wwwroot/images/LogoEgwBlack.png differ
diff --git a/WebDoorCreator.UI/wwwroot/images/LogoEgwBlue.png b/WebDoorCreator.UI/wwwroot/images/LogoEgwBlue.png
new file mode 100644
index 0000000..a12ef35
Binary files /dev/null and b/WebDoorCreator.UI/wwwroot/images/LogoEgwBlue.png differ
diff --git a/WebDoorCreator.UI/wwwroot/images/LogoEgwGray.png b/WebDoorCreator.UI/wwwroot/images/LogoEgwGray.png
new file mode 100644
index 0000000..0ec844d
Binary files /dev/null and b/WebDoorCreator.UI/wwwroot/images/LogoEgwGray.png differ
diff --git a/WebDoorCreator.UI/wwwroot/images/LogoEgwWhite.png b/WebDoorCreator.UI/wwwroot/images/LogoEgwWhite.png
new file mode 100644
index 0000000..e9fa2e3
Binary files /dev/null and b/WebDoorCreator.UI/wwwroot/images/LogoEgwWhite.png differ