Egalware/lux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ancora update metodo calcolo URL immagine semplificato (x offerte)

Browse Source
This commit is contained in:
Samuele Locatelli
2026-04-01 18:34:31 +02:00
parent da13dbc417
commit 9e75f7424f
12 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgwCoreLib.Lux.Data/DbModel/Catalog/TemplateRowModel.cs
+11 -9
View File
@@ -81,6 +81,16 @@ namespace EgwCoreLib.Lux.Data.DbModel.Catalog
}
}
/// <summary>
/// URL Immagine calcolato
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public static string ImgUrl(int id)
{
return $"TLR.{id:X12}";
}
/// <summary>
/// Tipo immagine da visualizzare
/// </summary>
@@ -276,14 +286,6 @@ namespace EgwCoreLib.Lux.Data.DbModel.Catalog
[ForeignKey("SellingItemID")]
public virtual SellingItemModel? SellingItemNav { get; set; }
/// <summary>
/// URL Immagine calcolato
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public static string ImgUrl(int id)
{
return $"TLR.{id:X12}";
}
}
}
EgwCoreLib.Lux.Data/DbModel/Sales/OfferRowModel.cs
-2
View File
@@ -106,8 +106,6 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
[NotMapped]
public string ImgUrl
{
//get => "empty.svg";
////get => "https://iis01.egalware.com/Lux/srv/api/window/svgfile/empty.svg";
get
{
string answ = "empty.svg";
EgwCoreLib.Lux.Data/DbModel/Sales/OrderRowModel.cs
+22 -1
View File
@@ -195,7 +195,28 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales
return answ;
}
}
/// <summary>
/// Restituisce Url immagine già calcolato (da sistemare!!!)
/// </summary>
[NotMapped]
public string ImgUrl
{
get
{
string answ = "empty.svg";
string fType = Envir == Constants.EXECENVIRONMENTS.WINDOW ? "svg" : "png";
string rndImg = $"{DateTime.Now:HHmmssfff}";
if (CalcEnabled)
{
answ = $"cache/{ImgUID}-{rndImg}.{fType}?env={Envir}";
}
else
{
answ = $"static/{ImgUID}";
}
return answ;
}
}
/// <summary>
/// Valore serializzato della composizione articolo (in formato JWD x finestra)
/// </summary>
Lux.API/Lux.API.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2604.0112</Version>
<Version>1.1.2604.0118</Version>
</PropertyGroup>
<ItemGroup>
Lux.UI/Components/Compo/Offer/OfferRowMan.razor
+6 -9
View File
@@ -137,21 +137,18 @@ else
{
if (item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
{
@* <img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="48" @onclick="() => ReqEditRow()" title="Edit Item" /> *@
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop p-1" src="@(imgSrc(item.ImgUrl))" width="48" @onclick="() => ReqEditRow()" title="Edit Item" />
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop p-1" src="@imgSrc(item.ImgUrl)" width="48" @onclick="() => ReqEditRow()" title="Edit Item" />
}
else
{
@* <img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" @onclick="() => ReqEditRow()" title="Edit Item" /> *@
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop" src="@(imgSrc(item.ImgUrl))" width="64" @onclick="() => ReqEditRow()" title="Edit Item" />
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop" src="@imgSrc(item.ImgUrl)" width="64" @onclick="() => ReqEditRow()" title="Edit Item" />
}
}
else
{
if (!item.IsNote)
{
@* <img class="img-fluid p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="48" @onclick="() => ReqEditRow()" /> *@
<img class="img-fluid p-1" src="@(imgSrc(item.ImgUrl))" width="48" @onclick="() => ReqEditRow()" />
<img class="img-fluid p-1" src="@imgSrc(item.ImgUrl)" width="48" @onclick="() => ReqEditRow()" />
}
}
@@ -220,18 +217,18 @@ else
{
if (item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
{
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" @onclick="() => DoEditJwd(item)" title="Edit Item" />
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop p-1" src="@imgSrc(item.ImgUID)" width="64" @onclick="() => DoEditJwd(item)" title="Edit Item" />
}
else
{
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="150" @onclick="() => DoEditFile(item)" title="Edit Item" />
<img class="@cssReqPend(item.HasPendReq) img-fluid image-hover-pop" src="@imgSrc(item.ImgUID)" width="150" @onclick="() => DoEditFile(item)" title="Edit Item" />
}
}
else
{
if (!item.IsNote)
{
<img class="img-fluid p-1" src="@(imgUrl(item.ImgType, item.ImgUID, $"{item.Envir}"))" width="64" />
<img class="img-fluid p-1" src="@imgSrc(item.ImgUID)" width="64" />
}
}
</td>
Lux.UI/Components/Compo/Offer/OfferRowMan.razor.cs
-31
View File
@@ -1105,37 +1105,6 @@ namespace Lux.UI.Components.Compo.Offer
return (MarkupString)rawData.Replace(Environment.NewLine, "<br />").Replace("\n", "<br />");//.Replace(" ", "&nbsp;");
}
/// <summary>
/// Calcolo URL immagine
/// </summary>
/// <param name="tipoImg"></param>
/// <param name="imgUid"></param>
/// <param name="env"></param>
/// <returns></returns>
private string imgUrl(EgwCoreLib.Lux.Core.Enums.ImageType tipoImg, string imgUid, string env)
{
string answ = "";
switch (tipoImg)
{
case EgwCoreLib.Lux.Core.Enums.ImageType.Calculated:
// cast string su env..
EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS envir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW;
Enum.TryParse(env, out envir);
answ = ICService.ImageUrl($"{apiUrl}/{imgBasePath}", false, imgUid, envir);
break;
case EgwCoreLib.Lux.Core.Enums.ImageType.ND:
case EgwCoreLib.Lux.Core.Enums.ImageType.Fixed:
answ = $"{apiUrl}/{imgBasePath}/static/{imgUid}";
break;
default:
break;
}
return answ;
}
/// <summary>
/// Calcola src immagine direttamente da modello dati + base path
/// </summary>
Lux.UI/Components/Compo/Order/OrderRowMan.razor
+4 -2
View File
@@ -161,11 +161,13 @@ else
{
@if (item.Original.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
{
<img class="img-fluid image-hover-pop p-1" src="@(imgUrl(item.Original.OrderRowUID, $"{item.Original.Envir}"))" width="64" @onclick="() => DoEditJwd(item.Original)" title="Edit Item" />
@* <img class="img-fluid image-hover-pop p-1" src="@(imgUrl(item.Original.OrderRowUID, $"{item.Original.Envir}"))" width="64" @onclick="() => DoEditJwd(item.Original)" title="Edit Item" /> *@
<img class="img-fluid image-hover-pop p-1" src="@imgSrc(item.Original.ImgUrl)" width="64" @onclick="() => DoEditJwd(item.Original)" title="Edit Item" />
}
else
{
<img class="img-fluid image-hover-pop" src="@(imgUrl(item.Original.OrderRowUID, $"{item.Original.Envir}"))" width="150" @onclick="() => DoEditFile(item.Original)" title="Edit Item" />
@* <img class="img-fluid image-hover-pop" src="@(imgUrl(item.Original.OrderRowUID, $"{item.Original.Envir}"))" width="150" @onclick="() => DoEditFile(item.Original)" title="Edit Item" /> *@
<img class="img-fluid image-hover-pop" src="@imgSrc(item.Original.ImgUrl)" width="150" @onclick="() => DoEditFile(item.Original)" title="Edit Item" />
}
}
</td>
Lux.UI/Components/Compo/Order/OrderRowMan.razor.cs
+13 -1
View File
@@ -995,6 +995,17 @@ namespace Lux.UI.Components.Compo.Order
return (MarkupString)rawData.Replace(Environment.NewLine, "<br />").Replace("\n", "<br />");//.Replace(" ", "&nbsp;");
}
/// <summary>
/// Calcola src immagine direttamente da modello dati + base path
/// </summary>
/// <param name="imgUrl"></param>
/// <returns></returns>
private string imgSrc(string imgUrl)
{
return $"{apiUrl}/{imgBasePath}/{imgUrl}";
}
#if false
/// <summary>
/// Calcolo URL immagine
/// </summary>
@@ -1007,7 +1018,8 @@ namespace Lux.UI.Components.Compo.Order
EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS envir = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW;
Enum.TryParse(env, out envir);
return ICService.ImageUrl($"{apiUrl}/{imgBasePath}", false, imgUid, envir);
}
}
#endif
/// <summary>
/// Restituisce il contenuto del file salvato
Lux.UI/Lux.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
<Version>1.1.2604.0112</Version>
<Version>1.1.2604.0118</Version>
</PropertyGroup>
<ItemGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>LUX - Web Windows MES</i>
<h4>Versione: 1.1.2604.0112</h4>
<h4>Versione: 1.1.2604.0118</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2604.0112
1.1.2604.0118
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2604.0112</version>
<version>1.1.2604.0118</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>