diff --git a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs index a48230e4..6a409cbe 100644 --- a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs +++ b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs @@ -4496,24 +4496,6 @@ namespace EgwCoreLib.Lux.Data.Controllers .FirstOrDefaultAsync(); if (dbResult != null) { -#if false - //dbCtx.DbSetItem.Remove(newCount); - dbResult.Cost = currRec.Cost; - dbResult.Description = currRec.Description; - dbResult.Envir = currRec.Envir; - dbResult.ExtItemCode = currRec.ExtItemCode; - dbResult.IsService = currRec.IsService; - dbResult.ItemCode = currRec.ItemCode; - dbResult.ItemSteps = currRec.ItemSteps; - dbResult.JobID = currRec.JobID; - dbResult.Margin = currRec.Margin; - dbResult.SerStruct = currRec.SerStruct; - dbResult.SourceType = currRec.SourceType; - dbResult.SupplCode = currRec.SupplCode; - dbResult.UM = currRec.UM; - dbResult.ImgType = currRec.ImgType; - dbCtx.Entry(dbResult).State = EntityState.Modified; -#endif dbCtx.Entry(dbResult).CurrentValues.SetValues(currRec); } diff --git a/EgwCoreLib.Lux.Data/DbModel/Sales/TemplateRowModel.cs b/EgwCoreLib.Lux.Data/DbModel/Sales/TemplateRowModel.cs index 6d59f538..38e4e588 100644 --- a/EgwCoreLib.Lux.Data/DbModel/Sales/TemplateRowModel.cs +++ b/EgwCoreLib.Lux.Data/DbModel/Sales/TemplateRowModel.cs @@ -58,7 +58,27 @@ namespace EgwCoreLib.Lux.Data.DbModel.Sales [NotMapped] public string ImgUID { - get => ImgType == ImageType.Fixed ? FileName : ImgUrl(TemplateRowID); + get + { + string answ = ""; + if (ImgType == ImageType.Fixed) + { + answ = FileName; + } + else + { + // se non ha img --> uso mamma... + if (SellingItemNav != null) + { + answ = SellingItemNav.ImgUID; + } + else + { + answ = ImgUrl(TemplateRowID); + } + } + return answ; + } } /// diff --git a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs index f639656f..d5b50c53 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs +++ b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs @@ -767,13 +767,13 @@ namespace Lux.UI.Components.Compo.Templates string answ = ""; switch (tipoImg) { - case Enums.ImageType.ND: case 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 Enums.ImageType.ND: case Enums.ImageType.Fixed: answ = $"{apiUrl}/{imgBasePath}/static/{imgUid}"; break;