diff --git a/Test.UI/Components/Pages/Aedifica.razor.cs b/Test.UI/Components/Pages/Aedifica.razor.cs
index 6acc280..263b519 100644
--- a/Test.UI/Components/Pages/Aedifica.razor.cs
+++ b/Test.UI/Components/Pages/Aedifica.razor.cs
@@ -27,7 +27,7 @@ namespace Test.UI.Components.Pages
public void Dispose()
{
- DLService.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
}
protected MarkupString JsonSer
@@ -40,7 +40,7 @@ namespace Test.UI.Components.Pages
protected override async Task OnInitializedAsync()
{
ConfInit();
- DLService.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
//await ReloadData();
await Task.Delay(1);
}
@@ -67,7 +67,7 @@ namespace Test.UI.Components.Pages
}
}
- private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
+ private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index 928c418..2966db4 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -61,7 +61,7 @@ namespace Test.UI.Components.Pages
public void Dispose()
{
- DLService.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
}
#endregion Public Methods
@@ -174,7 +174,7 @@ namespace Test.UI.Components.Pages
CurrJwd = InitialJwd,
SvgPreview = currSvg
};
- DLService.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
}
#endregion Protected Methods
@@ -207,7 +207,7 @@ namespace Test.UI.Components.Pages
#region Private Methods
- private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
+ private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
diff --git a/Test.UI/Components/Pages/Gerarchia.razor.cs b/Test.UI/Components/Pages/Gerarchia.razor.cs
index 010780f..39bcbad 100644
--- a/Test.UI/Components/Pages/Gerarchia.razor.cs
+++ b/Test.UI/Components/Pages/Gerarchia.razor.cs
@@ -25,7 +25,7 @@ namespace Test.UI.Components.Pages
public void Dispose()
{
- DLService.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
}
#endregion Public Methods
@@ -96,7 +96,7 @@ namespace Test.UI.Components.Pages
SelColorMaterial = "Black";
SelMaterial = "Pine";
SelGlass = "4T/16/4T";
- DLService.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
await ReloadData();
}
@@ -123,7 +123,7 @@ namespace Test.UI.Components.Pages
#region Private Methods
- private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
+ private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs
index b28dd71..e749c4c 100644
--- a/Test.UI/Components/Pages/Home.razor.cs
+++ b/Test.UI/Components/Pages/Home.razor.cs
@@ -20,7 +20,7 @@ namespace Test.UI.Components.Pages
public void Dispose()
{
- DLService.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
}
#endregion Public Methods
@@ -62,7 +62,7 @@ namespace Test.UI.Components.Pages
{
isLoading = true;
ConfInit();
- DLService.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
await ReloadData();
}
@@ -105,7 +105,7 @@ namespace Test.UI.Components.Pages
#region Private Methods
- private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
+ private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
diff --git a/Test.UI/Components/Pages/TestComponentJWD.razor.cs b/Test.UI/Components/Pages/TestComponentJWD.razor.cs
index 6e8cd90..38f9c50 100644
--- a/Test.UI/Components/Pages/TestComponentJWD.razor.cs
+++ b/Test.UI/Components/Pages/TestComponentJWD.razor.cs
@@ -25,7 +25,7 @@ namespace Test.UI.Components.Pages
public void Dispose()
{
- DLService.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
}
#endregion Public Methods
@@ -98,7 +98,7 @@ namespace Test.UI.Components.Pages
//SelGlass = "4T/16/4T";
InitialJwd = File.ReadAllText("Data\\FinDueAnteBottomFisso.jwd");
currJwd = InitialJwd;
- DLService.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
await ReloadData();
}
@@ -125,7 +125,7 @@ namespace Test.UI.Components.Pages
#region Private Methods
- private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
+ private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
diff --git a/Test.UI/Components/Pages/TestComponentTemplate.razor.cs b/Test.UI/Components/Pages/TestComponentTemplate.razor.cs
index faeb0d8..efb1b5d 100644
--- a/Test.UI/Components/Pages/TestComponentTemplate.razor.cs
+++ b/Test.UI/Components/Pages/TestComponentTemplate.razor.cs
@@ -25,7 +25,7 @@ namespace Test.UI.Components.Pages
public void Dispose()
{
- DLService.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
}
#endregion Public Methods
@@ -96,7 +96,7 @@ namespace Test.UI.Components.Pages
SelColorMaterial = "Black";
SelMaterial = "Pine";
SelGlass = "4T/16/4T";
- DLService.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+ DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
await ReloadData();
}
@@ -123,7 +123,7 @@ namespace Test.UI.Components.Pages
#region Private Methods
- private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e)
+ private async void PipeSvg_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
diff --git a/Test.UI/Test.UI.csproj b/Test.UI/Test.UI.csproj
index 7368494..4fc0374 100644
--- a/Test.UI/Test.UI.csproj
+++ b/Test.UI/Test.UI.csproj
@@ -34,8 +34,8 @@
-
-
+
+
diff --git a/Test.UI/appsettings.json b/Test.UI/appsettings.json
index e0a0df8..b1e6c3b 100644
--- a/Test.UI/appsettings.json
+++ b/Test.UI/appsettings.json
@@ -10,20 +10,21 @@
"Redis": "redis.ufficio:26379, serviceName=devel, DefaultDatabase=6, keepAlive=180, connectTimeout=15000, syncTimeout=15000, asyncTimeout=15000, abortConnect=false, ssl=false, allowAdmin=true"
},
"ServerConf": {
- "PubChannel": "EgwEngineInput",
- "SubChannel": "EgwEngineOutput",
- "SvgChannel": "Egw:svg:img",
- "ShapeChannel": "Egw:shape:curr",
+ "BomChannel": "Egw:bom",
+ "HwListChannel": "Egw:hw:list",
"HwOptChannel": "Egw:hw:opt",
"ProfListChannel": "Egw:prof:list",
- "BomChannel": "Egw:bom",
+ "PubChannel": "EgwEngineInput",
+ "ShapeChannel": "Egw:shape:curr",
+ "SubChannel": "EgwEngineOutput",
+ "SvgChannel": "Egw:svg:img",
"UpdateChannel": "Egw:update",
"Prog.ApiUrl": "https://office.egalware.com/lux/srv/api",
"ImageBaseUrl": "window",
"GenericBaseUrl": "generic",
- "ImageLiveTag": "svg",
- "ImageFileTag": "svgfile",
"ImageCalcTag": "svg-preview",
+ "ImageFileTag": "svgfile",
+ "ImageLiveTag": "svg",
"CalcTag": "calc"
}
}
diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs
index c60fe9b..8a67060 100644
--- a/WebWindowComplex/Json/JsonUtility.cs
+++ b/WebWindowComplex/Json/JsonUtility.cs
@@ -399,7 +399,7 @@ namespace WebWindowComplex.Json
foreach (var Joint in m_JointList)
newSash.JointList.Add(Joint.Deserialize((Area)ParentArea));
newSash.SetSelFamilyHardwareFromIndex(Hardware);
- newSash.RefreshHardwareList();
+ newSash.ReqRefreshShape();
newSash.SetSelHardwareFromId(Hardware);
foreach (var Area in AreaList)
{
diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs
index 8cac943..2d5de4e 100644
--- a/WebWindowComplex/Models/Area.cs
+++ b/WebWindowComplex/Models/Area.cs
@@ -47,16 +47,16 @@ namespace WebWindowComplex.Models
}
}
- public int IdGroup
+ public int GroupId
{
get
{
- return m_IdGroup;
+ return m_GroupId;
}
set
{
- m_IdGroup = value;
+ m_GroupId = value;
}
}
@@ -115,7 +115,7 @@ namespace WebWindowComplex.Models
{
// seleziono la famiglia del primo hw trovato...
SashArea.SelFamilyHardware = listHwValid.FamilyName;
- SashArea.RefreshHardwareList();
+ SashArea.ReqRefreshShape();
if (SashArea.HardwareList.Count == 0)
{
SashArea.Remove();
@@ -196,7 +196,7 @@ namespace WebWindowComplex.Models
public void SetIdGroup(int nIdGroup)
{
- m_IdGroup = nIdGroup;
+ m_GroupId = nIdGroup;
}
public void SwapAree()
@@ -243,7 +243,7 @@ namespace WebWindowComplex.Models
private List m_AreaList = new List();
private AreaTypes m_AreaType;
- private int m_IdGroup;
+ private int m_GroupId;
private Area m_ParentArea;
#endregion Private Fields
diff --git a/WebWindowComplex/Models/Fill.cs b/WebWindowComplex/Models/Fill.cs
index 5fe8ee1..be23281 100644
--- a/WebWindowComplex/Models/Fill.cs
+++ b/WebWindowComplex/Models/Fill.cs
@@ -86,9 +86,9 @@ namespace WebWindowComplex.Models
internal override JsonArea Serialize()
{
- if (nCounterGroup < IdGroup)
- Area.nCounterGroup = IdGroup;
- JsonFill JsonFill = new JsonFill(FillType, IdGroup);
+ if (nCounterGroup < GroupId)
+ Area.nCounterGroup = GroupId;
+ JsonFill JsonFill = new JsonFill(FillType, GroupId);
foreach (var Area in AreaList)
JsonFill.AreaList.Add(Area.Serialize());
return JsonFill;
diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs
index c83b55c..7434d54 100644
--- a/WebWindowComplex/Models/Frame.cs
+++ b/WebWindowComplex/Models/Frame.cs
@@ -240,9 +240,9 @@ namespace WebWindowComplex.Models
internal override JsonArea Serialize()
{
Area.nCounterGroup = 0;
- if (nCounterGroup < IdGroup)
- Area.nCounterGroup = IdGroup;
- JsonFrame JsonFrame = new JsonFrame(m_Shape, m_bBottomRail, m_nBottomRailQty, IdGroup);
+ if (nCounterGroup < GroupId)
+ Area.nCounterGroup = GroupId;
+ JsonFrame JsonFrame = new JsonFrame(m_Shape, m_bBottomRail, m_nBottomRailQty, GroupId);
foreach (var Dimension in DimensionList)
JsonFrame.DimensionList.Add(Dimension.Serialize());
foreach (var Joint in JointList)
diff --git a/WebWindowComplex/Models/OnReqShapeEventArgs.cs b/WebWindowComplex/Models/OnReqShapeEventArgs.cs
new file mode 100644
index 0000000..a90de9a
--- /dev/null
+++ b/WebWindowComplex/Models/OnReqShapeEventArgs.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebWindowComplex.Models
+{
+ public class OnReqShapeEventArgs : EventArgs
+ {
+ #region Public Fields
+
+ public string sJwd;
+ public int groupId;
+
+ #endregion Public Fields
+
+ #region Public Constructors
+
+ public OnReqShapeEventArgs(string sJwd, int nGroupId)
+ {
+ this.sJwd = sJwd;
+ this.groupId = nGroupId;
+ }
+
+ #endregion Public Constructors
+ }
+}
\ No newline at end of file
diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs
index 67c8924..219bb2c 100644
--- a/WebWindowComplex/Models/Sash.cs
+++ b/WebWindowComplex/Models/Sash.cs
@@ -11,6 +11,19 @@ namespace WebWindowComplex.Models
{
public class Sash : Area
{
+
+ public event EventHandler OnReqShape = delegate { };
+
+ internal void OnReqShapePreview(string sJwd, int groupId)
+ {
+ OnReqShapeEventArgs e = new OnReqShapeEventArgs(sJwd, groupId);
+ EventHandler handler = OnReqShape;
+ if (handler != null)
+ {
+ handler(this, e);
+ }
+ }
+
#region Public Fields
// Lista hardware completa passata dal chiamante del componente
@@ -211,7 +224,7 @@ namespace WebWindowComplex.Models
}
}
}
- RefreshHardwareList();
+ ReqRefreshShape();
RefreshHardwareOptionList();
SetFirstHardware();
m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized());
@@ -304,7 +317,7 @@ namespace WebWindowComplex.Models
set
{
m_SelFamilyHardware = value;
- RefreshHardwareList();
+ ReqRefreshShape();
RefreshHardwareOptionList();
SetFirstHardware();
m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized());
@@ -454,7 +467,7 @@ namespace WebWindowComplex.Models
newSash.SetOrientationSashType(OrientationSashType);
newSash.SetSashBottomRailQty(SashBottomRailQty);
newSash.SetSelFamilyHardwareFromIndex(SelHardware.Id);
- newSash.RefreshHardwareList();
+ newSash.ReqRefreshShape();
newSash.RefreshHardwareOptionList();
newSash.SetSelHardware(SelHardware);
for (int i = 0; i < SashList.Count; i++)
@@ -477,17 +490,45 @@ namespace WebWindowComplex.Models
return newSash;
}
+ ///
+ /// Richiesta calcolo shape corrente
+ ///
+ public void ReqRefreshShape()
+ {
+ if (m_HardwareCompleteList != null && m_HardwareCompleteList.Count > 0)
+ {
+ m_HardwareList.Clear();
+ // reset shape corrente
+ m_CurrShape = "";
+
+ // chiamata evento calcolo shape: gruppo da calcolare
+ OnReqShapePreview(m_ParentWindow.sSerialized(), GroupId);
+ }
+ }
+
+ ///
+ /// Agfgiornamento HW List conseguente a ricezione nuiova Shape
+ ///
+ ///
+ public void UpdateShape(string newShape)
+ {
+ m_CurrShape = newShape;
+ RefreshHardwareList();
+ }
+
+ ///
+ /// Update valori ammissibili x HW list
+ ///
public void RefreshHardwareList()
{
if (m_HardwareCompleteList != null && m_HardwareCompleteList.Count > 0)
{
m_HardwareList.Clear();
- string sSashShape = FindSashShape();
Enums.OpeningTypes sOpeningType = ConvertOpeningType();
var iComp = StringComparison.InvariantCultureIgnoreCase;
var rawList = m_HardwareCompleteList
.Where(x => x.Id == "000000" ||
- (!string.IsNullOrEmpty(m_SelFamilyHardware) && x.FamilyName.Equals(m_SelFamilyHardware, iComp) && x.SashQty == nSashQty && x.Shape.Equals(sSashShape, iComp) && x.OpeningType == sOpeningType)
+ (!string.IsNullOrEmpty(m_SelFamilyHardware) && x.FamilyName.Equals(m_SelFamilyHardware, iComp) && x.SashQty == nSashQty && x.Shape.Equals(m_CurrShape, iComp) && x.OpeningType == sOpeningType)
)
.ToList();
if (rawList != null && rawList.Count > 0)
@@ -501,6 +542,7 @@ namespace WebWindowComplex.Models
}
}
+
public void Remove()
{
ParentArea.AreaList.Remove(this);
@@ -528,7 +570,7 @@ namespace WebWindowComplex.Models
newSash.SetSashBottomRail(false);
newSash.SetSashBottomRailQty(0);
newSash.SelFamilyHardware = Sash.s_FamilyHardwareList.First();
- newSash.RefreshHardwareList();
+ newSash.ReqRefreshShape();
newSash.RefreshHardwareOptionList();
newSash.SetFirstHardware();
return newSash;
@@ -621,9 +663,9 @@ namespace WebWindowComplex.Models
internal override JsonArea Serialize()
{
- if (nCounterGroup < IdGroup)
- Area.nCounterGroup = IdGroup;
- JsonSash JsonSash = new JsonSash(m_bIsSashVertical, m_SashType, m_bSashBottomRail, m_nSashBottomRailQty, m_SelHardware.Id, IdGroup);
+ if (nCounterGroup < GroupId)
+ Area.nCounterGroup = GroupId;
+ JsonSash JsonSash = new JsonSash(m_bIsSashVertical, m_SashType, m_bSashBottomRail, m_nSashBottomRailQty, m_SelHardware.Id, GroupId);
foreach (var SashDimension in SashList)
JsonSash.SashList.Add(SashDimension.Serialize());
foreach (var Joint in JointList)
@@ -766,6 +808,7 @@ namespace WebWindowComplex.Models
private List m_SashList = new List();
private SashTypes m_SashType;
private string m_SelFamilyHardware;
+ private string m_CurrShape = "";
private Hardware m_SelHardware;
private OrientationSash m_SelOrientationSashType;
diff --git a/WebWindowComplex/Models/SashDimension.cs b/WebWindowComplex/Models/SashDimension.cs
index cde5c8c..3fbd106 100644
--- a/WebWindowComplex/Models/SashDimension.cs
+++ b/WebWindowComplex/Models/SashDimension.cs
@@ -229,7 +229,7 @@ namespace WebWindowComplex.Models
set
{
m_SelOpeningType = value;
- m_Parent.RefreshHardwareList();
+ m_Parent.ReqRefreshShape();
m_Parent.RefreshHardwareOptionList();
m_Parent.SetFirstHardware();
}
@@ -244,7 +244,7 @@ namespace WebWindowComplex.Models
set
{
m_SelOpeningType = (Openings)IdNameStruct.IdFromInd(value, m_OpeningTypeList);
- m_Parent.RefreshHardwareList();
+ m_Parent.ReqRefreshShape();
m_Parent.RefreshHardwareOptionList();
m_Parent.SetFirstHardware();
m_Parent.ParentWindow.OnUpdatePreview(m_Parent.ParentWindow.sSerialized());
diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs
index 8481927..9a4f779 100644
--- a/WebWindowComplex/Models/Split.cs
+++ b/WebWindowComplex/Models/Split.cs
@@ -371,9 +371,9 @@ namespace WebWindowComplex.Models
internal override JsonArea Serialize()
{
- if (nCounterGroup < IdGroup)
- Area.nCounterGroup = IdGroup;
- JsonSplit JsonSplit = new JsonSplit(m_SelSplitShape, IdGroup);
+ if (nCounterGroup < GroupId)
+ Area.nCounterGroup = GroupId;
+ JsonSplit JsonSplit = new JsonSplit(m_SelSplitShape, GroupId);
//foreach (var SplitPosition in m_SplitPositionList)
// JsonSplit.SplitPositionList.Add(SplitPosition.Serialize());
JsonSplit.SplitStartVert = bSplitStartVert;
diff --git a/WebWindowComplex/Models/Splitted.cs b/WebWindowComplex/Models/Splitted.cs
index 17ba514..8549716 100644
--- a/WebWindowComplex/Models/Splitted.cs
+++ b/WebWindowComplex/Models/Splitted.cs
@@ -44,9 +44,9 @@ namespace WebWindowComplex.Models
internal override JsonArea Serialize()
{
- if (nCounterGroup < IdGroup)
- Area.nCounterGroup = IdGroup;
- JsonSplitted JsonSplitted = new JsonSplitted(IdGroup);
+ if (nCounterGroup < GroupId)
+ Area.nCounterGroup = GroupId;
+ JsonSplitted JsonSplitted = new JsonSplitted(GroupId);
foreach (var Area in AreaList)
JsonSplitted.AreaList.Add(Area.Serialize());
return JsonSplitted;
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 768d747..2494eea 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -482,8 +482,9 @@ namespace WebWindowComplex
///
/// Richiesta Shape compatibile da JWD
///
+ /// ID numerico del gruppo da valutare
///
- protected async Task DoReqShape()
+ protected async Task DoReqShape(int groupId)
{
if (m_CurrWindow != null)
{
@@ -500,6 +501,7 @@ namespace WebWindowComplex
Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.SASHSHAPE}");
Args.Add("Jwd", CurrJwd);
+ Args.Add("GroupId", $"{groupId}");
await EC_DoUpdate.InvokeAsync(Args);
}
}
@@ -1183,7 +1185,7 @@ namespace WebWindowComplex
///
private async Task UpdateSash(Sash newSash)
{
- SearchSash(m_Frame, newSash.IdGroup, newSash);
+ SearchSash(m_Frame, newSash.GroupId, newSash);
await DoPreviewSvg();
}
@@ -1197,6 +1199,19 @@ namespace WebWindowComplex
await DoReqOptHardware();
}
+
+ ///
+ /// Aggiornamento shape dato GroupId
+ ///
+ /// nuova sash
+ ///
+ private async Task UpdateShape(int groupId)
+ {
+ await DoReqShape(groupId);
+ }
+
+
+
///
/// Cerca e aggiorna la sash
///
@@ -1206,7 +1221,7 @@ namespace WebWindowComplex
///
public Area SearchSash(Area currentArea, int idSearch, Sash newSash)
{
- if (currentArea.IdGroup == idSearch && currentArea.AreaType.Equals(AreaTypes.SASH))
+ if (currentArea.GroupId == idSearch && currentArea.AreaType.Equals(AreaTypes.SASH))
{
currentArea = newSash;
return currentArea;
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 6d3232c..1ec8c7d 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.10.2118
+ 2.7.10.2212
Annamaria Sassi
Egalware
Componente gestione Configurazioni avanzate Window per LUX
@@ -41,3 +41,7 @@
+
+
+
+
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 60b6d3f..f28acee 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.10.2118
+ 2.7.10.2212
Annamaria Sassi
Egalware
Componente gestione JWD per LUX
@@ -115,6 +115,10 @@
+
+
+
+