diff --git a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs b/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs
index f935882a..decbdddd 100644
--- a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs
+++ b/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs
@@ -108,28 +108,28 @@ namespace EgwCoreLib.Lux.Data.Services
/// Base url IMG server (da config)
/// Live = in fase di calcolo (cache REDIS), altrimenti da filesystem
/// UID elemento/immagine
+ /// Environment item
///
- public string ImageUrl(string baseUrl, bool isLive, string imgUID)
+ public string ImageUrl(string baseUrl, bool isLive, string imgUID, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS envir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
{
string tag = isLive ? liveTag : cacheTag;
if (!imgUID.EndsWith(".svg"))
{
imgUID += ".svg";
}
- string fullUrl = $"{baseUrl}/{tag}/{imgUID}".Replace("////", "//");
+ string fullUrl = $"{baseUrl}/{tag}/{imgUID}?envir={envir}".Replace("////", "//");
return fullUrl;
}
///
/// Recupera img redis SVG x id item richiesto
///
- /// UID item
- /// Environment item
- ///
- public string LoadSvg(string imgUid, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS env = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
+ /// UID item
+ /// Environment item
+ public string LoadSvg(string imgUid, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS envir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
{
// recupero img da cache
- string currKey = $"{redisBaseKey}:{env}:Images:{imgUid.Replace("/", ":")}";
+ string currKey = $"{redisBaseKey}:{envir}:Images:{imgUid.Replace("/", ":")}";
var rawVal = _redisService.Get(currKey);
return $"{rawVal}";
}
@@ -138,11 +138,11 @@ namespace EgwCoreLib.Lux.Data.Services
/// Recupera img redis SVG x id item richiesto async
///
/// UID item
- /// Environment item
- public async Task LoadSvgAsync(string imgId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS env = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
+ /// Environment item
+ public async Task LoadSvgAsync(string imgId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS envir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
{
// recupero img da cache
- string currKey = $"{redisBaseKey}:{env}:Images:{imgId.Replace("/", ":")}";
+ string currKey = $"{redisBaseKey}:{envir}:Images:{imgId.Replace("/", ":")}";
var rawVal = await _redisService.GetAsync(currKey);
return $"{rawVal}";
}
diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs
index 37e62715..3efe2cd6 100644
--- a/Lux.API/Controllers/WindowController.cs
+++ b/Lux.API/Controllers/WindowController.cs
@@ -119,6 +119,12 @@ namespace Lux.API.Controllers
}
string svgContent = await _imgService.LoadSvgAsync(id, env);
+ // se vuoto --> leggo img logo...
+ if(string.IsNullOrEmpty(svgContent))
+ {
+ string filePath = Path.Combine("DemoImg", "LogoEgalware.svg");
+ svgContent = await System.IO.File.ReadAllTextAsync(filePath);
+ }
byte[] bytes = System.Text.Encoding.UTF8.GetBytes(svgContent);
sw.Stop();
diff --git a/Lux.API/DemoImg/LogoEgalware.svg b/Lux.API/DemoImg/LogoEgalware.svg
new file mode 100644
index 00000000..fcf9b327
--- /dev/null
+++ b/Lux.API/DemoImg/LogoEgalware.svg
@@ -0,0 +1,51 @@
+
+
+
diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor
index 76a7ca05..ad029b37 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor
@@ -57,7 +57,7 @@ else
@if (DisplayMode == EgwCoreLib.Lux.Core.Enum.DisplayMode.Edit)
{
-
+
|
}
@item.OfferRowUID |
diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor.cs b/Lux.UI/Components/Compo/OfferRowMan.razor.cs
index 9717b215..f9fa03a2 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor.cs
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor.cs
@@ -38,9 +38,12 @@ namespace Lux.UI.Components.Compo
EditRecord = curRec;
}
- protected string imgUrl(string imgUid)
+ protected string imgUrl(string imgUid, string env)
{
- return ICService.ImageUrl($"{apiUrl}/{imgBasePath}", false, imgUid);
+ // cast string su env..
+ EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS envir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW;
+ Enum.TryParse(env, out envir);
+ return ICService.ImageUrl($"{apiUrl}/{imgBasePath}", false, imgUid, envir);
}
protected override void OnInitialized()