").Replace(" ", " "); } + protected string SelColorMaterial { get; set; } = ""; + protected string SelFamilyHardware { get; set; } = ""; + protected string SelGlass { get; set; } = ""; + protected string SelMaterial { get; set; } = ""; + #endregion Protected Properties #region Protected Methods @@ -93,10 +112,6 @@ namespace Test.UI.Components.Pages protected override async Task OnInitializedAsync() { ConfInit(); - SelFamilyHardware = "Natura"; - //SelColorMaterial = "Black"; - //SelColorMaterial = "Pine"; - //SelGlass = "4T/16/4T"; InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd"); currJwd = InitialJwd; // rileggo altri dati @@ -107,6 +122,8 @@ namespace Test.UI.Components.Pages ColorMaterial = AvailColorMaterialList, FamilyHardware = AvailFamilyHardwareList, Glass = AvailGlassList, + //Hardware = new List
+
\ No newline at end of file
diff --git a/WebWindowComplex/AreaFrame.razor.cs b/WebWindowComplex/AreaFrame.razor.cs
new file mode 100644
index 0000000..e48429e
--- /dev/null
+++ b/WebWindowComplex/AreaFrame.razor.cs
@@ -0,0 +1,48 @@
+using Microsoft.AspNetCore.Components;
+
+namespace WebWindowComplex
+{
+ public partial class AreaFrame
+ {
+ #region Public Properties
+
+ [Parameter]
+ public Frame CurrFrameWindow { get; set; } = null!;
+
+ [Parameter]
+ public List
+
+
+
+
+
+ Area frame
+
+ @if (CurrSashList.Count == 0 && CurrSplitList.Count == 0)
+ {
+
+
+
+
+
+ }
+
+ @if (!(CurrFrameWindow.AreaList[0] is Split))
+ {
+
+
+
+
+ }
+
+
\ No newline at end of file
diff --git a/WebWindowComplex/General.razor.cs b/WebWindowComplex/General.razor.cs
new file mode 100644
index 0000000..4eb2303
--- /dev/null
+++ b/WebWindowComplex/General.razor.cs
@@ -0,0 +1,102 @@
+using Microsoft.AspNetCore.Components;
+using WebWindowComplex.DTO;
+
+namespace WebWindowComplex
+{
+ public partial class General
+ {
+ #region Public Properties
+
+ ///
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ General
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ Fill type
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Color
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+ @if (isLoading)
+ {
+
+
- Errori validazione!
+
+
+
-
+ @foreach (var item in listErrPre)
+ {
+
- @item.Value + } +
-
- @if (string.IsNullOrEmpty(LiveData.CurrJwd))
- {
- @if (currStep == CompileStep.Template && ListPayload.TemplateDTO != null)
- {
-
-
-
- }
- }
- @if (currStep == CompileStep.Tree)
- {
-
| # | -Image | -Description | -
|---|---|---|
| @item.Index | -@item.Description | -
-
-
- @for (int i = 0; i < ItemTableList.Count; i++)
- {
-
-
+ }
+ else if (listErrLink != null && listErrLink.Count > 0)
+ {
+ | - - | - } - else - { -@FillTable(i, j) | - } - } -
+
Errore configurazione:
+
- }
- else if (currStep == CompileStep.Frame)
- {
- @if (m_CurrWindow != null)
+
-
+ @foreach (var item in listErrLink)
{
- m_PreviousWindow = m_CurrWindow;
+
- @item.Value } -
- @item.Value + } +
-
-
-
-
-
-
-
-
-
-
-
- Frame
-
-
-
-
-
-
-
-
- -
-
+ }
+ else
+ {
+
-
+ Dimension
- @foreach (FrameDimension dimension in FrameWindow.DimensionList) + +
+
+
+
+
+
+
+
+
+
+
+
+ @if (string.IsNullOrEmpty(LiveData.CurrJwd))
+ {
+ @if (currStep == CompileStep.Template && ListPayload.TemplateDTO != null)
+ {
+
+
+
+ }
+ }
+ @if (currStep == CompileStep.Tree)
+ {
+
| # | +Image | +Description | +
|---|---|---|
| @item.Index | +@item.Description | +
+
+
+ @for (int i = 0; i < ItemTableList.Count; i++)
+ {
+
+
+
+ }
+ else if (currStep == CompileStep.Frame)
+ {
+ @if (m_CurrWindow != null)
+ {
+ m_PreviousWindow = m_CurrWindow;
+ }
+ | + + | + } + else + { +@FillTable(i, j) | + } + } +
+
- }
- else if (currStep == CompileStep.Split)
- {
- @if (currSplit >= SplitList.Count || currSplit == -1)
- {
- currStep = CompileStep.Tree;
- }
- else
- {
- Split item = SplitList[currSplit];
-
+
-
+
-
+
-
+
-
+
- @if (!(FrameWindow.AreaList[0] is Split) || (SashList.Count == 0 && SplitList.Count == 0))
- {
-
+
-
+
+
Frame
- @foreach (Joint joint in FrameWindow.JointList)
- {
+
-
-
-
-
- }
-
- @if (m_SashList.Count == 0)
- {
-
+
-
-
- Bottom rail
+
+ +
+
-
-
+
+ Dimension
+ @foreach (FrameDimension dimension in FrameWindow.DimensionList) + { +
+ @dimension.sName
+
+ mm
+
+ }
+
+
- }
- Threshold
- Quantity
-
+
+
-
- }
-
-
-
-
-
-
- Area frame
- @if (SashList.Count == 0 && SplitList.Count == 0)
- {
-
-
-
-
-
- }
-
- @if (!(FrameWindow.AreaList[0] is Split))
- {
-
-
-
-
- }
-
-
-
-
- > EC_OnUpdate { get; set; }
+ ///
+ /// Sollevo evento errore validazione con una lista di errori rilevati
+ ///
+ [Parameter]
+ public EventCallback> EC_ValidError { get; set; }
+
///
/// Elenco anagrafiche di base
///
@@ -85,122 +91,6 @@ namespace WebWindowComplex
#endregion Protected Fields
-#if false
- [Parameter]
- public string CurrJwd
- {
- get => m_CurrJwd;
- set
- {
- // Se viene passato un JWD
- if (m_CurrJwd != value && value != "")
- {
- m_CurrJwd = value;
- // Aggiornati parametri di ingresso selezionati
- UpdateSelParameter();
- JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_CurrJwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
- if (m_CurrWindow != null)
- {
- m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview;
- m_CurrWindow = null;
- }
- m_CurrWindow = WindowFromJson.Deserialize();
- m_CurrWindow.OnPreview += M_CurrWindow_OnPreview;
- // Recupero dimensioni Frame e Joint del frame della finestra precedente
- if (m_PreviousWindow != null)
- {
- for (int i = 0; i < 2; i++)
- m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i];
- for (int i = 0; i < 4; i++)
- m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i];
- }
- }
- if (m_CurrWindow != null)
- {
- // Aggiornate liste di sash, split, splitted, fill e itemTable
- UpdateLists();
- }
- }
- }
- [Parameter]
- public string LiveSVG
- {
- get => m_SelSVG;
- set => m_SelSVG = value;
- }
-#endif
-
-#if false
- [Parameter]
- public Template IN_SelTemplate
- {
- get => m_SelTemplate;
- set
- {
- // Se viene passato il template selezionato oppure se non è ancora stato selezionato un template oppure se si cambia template di selezione
- if (value != null && (m_SelTemplate == null || (m_SelTemplate != null && value.nIndex != m_SelTemplate.nIndex)) && !string.IsNullOrEmpty(value.JWD))
- {
- m_SelTemplate = value;
- // Aggiornamento parametri di ingresso selezionati
- UpdateSelParameter();
- JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
- if (m_CurrWindow != null)
- {
- m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview;
- m_CurrWindow = null;
- }
- m_CurrWindow = WindowFromJson.Deserialize();
- m_CurrWindow.OnPreview += M_CurrWindow_OnPreview;
- // Recupero dimensioni Frame e Joint del frame della finestra precedente
- if (m_PreviousWindow != null)
- {
- for (int i = 0; i < 2; i++)
- m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i];
- for (int i = 0; i < 4; i++)
- m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i];
- }
- }
- if (m_CurrWindow != null)
- {
- // Aggiornamento liste sash, split, splitted, fill e itemTable
- UpdateLists();
- }
- }
- }
-
- [Parameter]
- public List IN_TemplateDTOList { get; set; } = null!;
-
- [Parameter]
- public List IN_FamilyHardwareList { get; set; } = null!;
-
- [Parameter]
- public List IN_HardwareList { get; set; } = null!;
-
- [Parameter]
- public List IN_ColorMaterialList { get; set; } = null!;
-
- [Parameter]
- public List IN_MaterialList { get; set; } = null!;
-
- [Parameter]
- public List IN_GlassList { get; set; } = null!;
-#endif
-
-#if false
- [Parameter]
- public string IN_SelFamilyHardware { get; set; } = null!;
-
- [Parameter]
- public string? IN_SelColorMaterial { get; set; } = null;
-
- [Parameter]
- public string? IN_SelMaterial { get; set; } = null;
-
- [Parameter]
- public string? IN_SelGlass { get; set; } = null;
-#endif
-
#region Protected Enums
protected enum CompileStep
@@ -242,8 +132,6 @@ namespace WebWindowComplex
get => m_ItemTableList;
}
- protected string? m_CurrJwd { get; set; }
-
protected string m_SelSVG { get; set; } = "";
///
@@ -265,30 +153,7 @@ namespace WebWindowComplex
}
protected string SelColorMaterial { get; set; } = "";
-
- protected string SelFamilyHardware
- {
- get
- {
- return m_SelFamilyHardware;
- }
- set
- {
- m_SelFamilyHardware = value;
- Sash.s_SelFamilyHW = value;
- for (int i = 0; i < SashList.Count; i++)
- {
- SashList[i].RefreshHardwareList();
- SashList[i].RefreshHardwareOptionList();
- SashList[i].SetFirstHardware();
- }
- if (m_CurrWindow != null)
- {
- m_CurrWindow.OnUpdatePreview(m_CurrWindow.sSerialized());
- }
- }
- }
-
+ protected string SelFamilyHardware { get; set; } = "";
protected string SelGlass { get; set; } = "";
protected string SelMaterial { get; set; } = ""!;
@@ -644,7 +509,7 @@ namespace WebWindowComplex
if (string.IsNullOrEmpty(LiveData.CurrJwd))
WindowFromJson = JsonConvert.DeserializeObject(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
else
- WindowFromJson = JsonConvert.DeserializeObject(m_CurrJwd!, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
+ WindowFromJson = JsonConvert.DeserializeObject(LiveData.CurrJwd!, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
if (m_CurrWindow != null)
{
m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview;
@@ -659,6 +524,7 @@ namespace WebWindowComplex
currSplit = -1;
currStep = CompileStep.Tree;
editLock = false;
+ bError = false;
await DoPreviewSvg();
}
@@ -684,6 +550,11 @@ namespace WebWindowComplex
await EC_OnSelectedTemplate.InvokeAsync(newSel);
}
+ protected override void OnAfterRender(bool firstRender)
+ {
+ isLoading = false;
+ }
+
///
/// Primo init componente
///
@@ -691,6 +562,11 @@ namespace WebWindowComplex
{
// reset editLock...
editLock = false;
+ // reset variabile errori
+ bError = false;
+ listErrPre = new Dictionary();
+ listErrLink = new Dictionary();
+ listWarnings = new Dictionary();
}
///
@@ -698,53 +574,152 @@ namespace WebWindowComplex
///
protected override async Task OnParametersSetAsync()
{
- bool updateSvg = false;
- // controllo elenchi BasePayload siano validi...
- if (ListPayload.IsValid())
+ isLoading = true;
+ // SOLO SE sono presenti...
+ if (ListPayload.IsPopulated() && LiveData.IsValid())
{
- // controllo sia popolato anche per la componente LIVE
- if (LiveData.IsValid())
+ bool updateSvg = false;
+ listErrPre = new Dictionary();
+ listErrLink = new Dictionary();
+ listWarnings = new Dictionary();
+ // controllo elenchi BasePayload siano validi...
+ if (ListPayload.IsValid())
{
- // SOLO SE modificato live data...
- if (prevLiveData == null || !prevLiveData.Equals(LiveData))
+ // controllo sia popolato anche per la componente LIVE
+ if (LiveData.IsValid())
{
- prevLiveData = LiveData;
- m_CurrJwd = LiveData.CurrJwd;
- m_SelSVG = LiveData.SvgPreview;
- // Aggiornati parametri di ingresso selezionati
- UpdateSelParameter();
- JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_CurrJwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
- setCurrWindow(WindowFromJson);
- //SOLO SE non sono in edit...
- if (!editLock)
+ // SOLO SE modificato live data...
+ if (prevLiveData == null || !prevLiveData.Equals(LiveData))
{
- currStep = CompileStep.Tree;
+ prevLiveData = new LivePayload()
+ {
+ CurrJwd = LiveData.CurrJwd,
+ SvgPreview = LiveData.SvgPreview
+ };
+ m_SelSVG = LiveData.SvgPreview;
+ // Aggiornati parametri di ingresso selezionati
+ UpdateSelParameter();
+ JsonWindow WindowFromJson = new JsonWindow("", "", "", "");
+ // provo a deserializzare
+ try
+ {
+ WindowFromJson = JsonConvert.DeserializeObject(LiveData.CurrJwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
+ setCurrWindow(WindowFromJson);
+ //SOLO SE non sono in edit...
+ if (!editLock)
+ {
+ currStep = CompileStep.Tree;
+ }
+ }
+ // altrimenti errore!
+ catch (Exception ex)
+ {
+ listErrLink.Add("Window", $"Deserializing Error:{Environment.NewLine}{ex}");
+ }
+
+ updateSvg = true;
+ }
+ checkWarnings();
+ }
+ else if (CurrSelection != null && CurrSelection.Template != null)
+ {
+ // Se viene passato il template selezionato oppure se non è ancora stato selezionato un template oppure se si cambia template di selezione
+ if (m_SelTemplate == null || (m_SelTemplate != null && CurrSelection.Template.nIndex != m_SelTemplate.nIndex) && !string.IsNullOrEmpty(CurrSelection.Template.JWD))
+ {
+ m_SelTemplate = CurrSelection.Template;
+ // Aggiornamento parametri di ingresso selezionati
+ UpdateSelParameter();
+ JsonWindow WindowFromJson = new JsonWindow("", "", "", "");
+ // provo a deserializzare
+ try
+ {
+ WindowFromJson = JsonConvert.DeserializeObject(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
+ setCurrWindow(WindowFromJson);
+ currStep = CompileStep.Template;
+ }
+ // altrimenti errore!
+ catch (Exception ex)
+ {
+ listErrLink.Add("Window", $"Deserializing Error:{Environment.NewLine}{ex}");
+ }
}
updateSvg = true;
}
- }
- else if (CurrSelection != null && CurrSelection.Template != null)
- {
- // Se viene passato il template selezionato oppure se non è ancora stato selezionato un template oppure se si cambia template di selezione
- if (m_SelTemplate == null || (m_SelTemplate != null && CurrSelection.Template.nIndex != m_SelTemplate.nIndex) && !string.IsNullOrEmpty(CurrSelection.Template.JWD))
+ if (SashList.Count > 0)
{
- m_SelTemplate = CurrSelection.Template;
- // Aggiornamento parametri di ingresso selezionati
- UpdateSelParameter();
- JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
- setCurrWindow(WindowFromJson);
- currStep = CompileStep.Template;
+ currAnta = 0;
+ }
+ if (updateSvg)
+ {
+ await DoPreviewSvg();
}
- updateSvg = true;
}
- if (SashList.Count > 0)
- currAnta = 0;
-
- if (updateSvg)
+ else
{
- await DoPreviewSvg();
+ checkErrorPre();
+ }
+ isLoading = false;
+ }
+ }
+
+ ///
+ /// Verifica errori prelimionari per mostrare dove sia il problema
+ ///
+ private void checkErrorPre()
+ {
+ // verifico 1:1 le liste e indico cosa manca
+ if (ListPayload.Hardware == null || ListPayload.Hardware.Count == 0)
+ {
+ listErrPre.Add("Hardware", "Missing Hardware List!");
+ }
+ else
+ {
+ if (ListPayload.FamilyHardware == null || ListPayload.FamilyHardware.Count == 0)
+ {
+ listErrPre.Add("FamilyHardware", "Missing Famly HW List!");
}
}
+ if (ListPayload.Glass == null || ListPayload.Glass.Count == 0)
+ {
+ listErrPre.Add("Glass", "Missing Glass List!");
+ }
+ if (ListPayload.Material == null || ListPayload.Material.Count == 0)
+ {
+ listErrPre.Add("Material", "Missing Material List!");
+ }
+ if (ListPayload.ColorMaterial == null || ListPayload.ColorMaterial.Count == 0)
+ {
+ listErrPre.Add("ColorMaterial", "Missing ColorMaterial List!");
+ }
+ }
+
+ ///
+ /// Verifica warning minori (es coerenza colori...)
+ ///
+ private void checkWarnings()
+ {
+ // verifico 1:1 le liste e i valori siano coerenti...
+ if (ListPayload.ColorMaterial != null && ListPayload.ColorMaterial.Count > 0)
+ {
+ // verifico colore attuale sia consistente...
+ if (m_CurrWindow != null)
+ {
+ if (!ListPayload.ColorMaterial.Contains(m_CurrWindow.sColorMaterial))
+ {
+ listWarnings.Add("ColorMaterial", $"Missing Color: {m_CurrWindow.sColorMaterial}");
+ }
+ }
+ }
+ }
+
+ ///
+ /// Calcola CSS warning
+ ///
+ ///
+ ///
+ /// Booleana fase loading
+ ///
+ private bool isLoading = false;
+
+ ///
+ /// ELenco errori di coerenza/link dati (vanno risolti per disegnare/procedere)
+ ///
+ private Dictionary listErrLink = new Dictionary();
+
+ ///
+ /// Elenco errori preliminari (mancano elementi di base di validazione modello dati))
+ ///
+ private Dictionary listErrPre = new Dictionary();
+
+ ///
+ /// Elenco warnings non bloccanti
+ ///
+ private Dictionary listWarnings = new Dictionary();
+
private List m_FillList = new List();
private Frame? m_Frame;
@@ -861,6 +855,11 @@ namespace WebWindowComplex
#region Private Methods
+ private void AddSashToFrame(Frame f)
+ {
+ bError = f.AddFirstSash();
+ }
+
///
/// Metodo per andare allo step successivo
///
@@ -1099,7 +1098,7 @@ namespace WebWindowComplex
/// Metodo per cambiare step e aggiornare preview svg
///
/// step successivo
- private async void NextStepAndPreview(CompileStep newStep, int Index = -1)
+ private void NextStepAndPreview(CompileStep newStep, int Index = -1)
{
editLock = true;
currStep = newStep;
@@ -1131,7 +1130,6 @@ namespace WebWindowComplex
#if false
await DoPreviewSvg();
#endif
- await Task.Delay(1);
}
///
@@ -1193,5 +1191,26 @@ namespace WebWindowComplex
}
#endregion Private Methods
+ private void SelectColor(string newVal)
+ {
+ if (m_CurrWindow != null)
+ {
+ m_CurrWindow.sColorMaterial = newVal;
+ }
+ }
+ private void SelectMat(string newVal)
+ {
+ if (m_CurrWindow != null)
+ {
+ m_CurrWindow.sMaterial = newVal;
+ }
+ }
+ private void SelectGlass(string newVal)
+ {
+ if (m_CurrWindow != null)
+ {
+ m_CurrWindow.sGlass = newVal;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 44a06df..9392c8c 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.10.717
+ 2.7.10.1012
Annamaria Sassi
Egalware
Componente gestione Configurazioni avanzate Window per LUX
@@ -18,7 +18,7 @@
-
+ /// MockUp chiamata a c++ x scelta forma sash per Hw
+ ///
+ /// m_ShapeList = new ObservableCollection
+
+ private List m_ShapeList = new List
{
new IdNameStruct((int)Shapes.RECTANGLE, "Rectangle"),
new IdNameStruct((int)Shapes.RIGHTCHAMFER, "Right Chamfer"),
@@ -327,7 +359,7 @@ namespace WebWindowComplex
new IdNameStruct((int)Shapes.DOUBLEARC, "Double Arc"),
new IdNameStruct((int)Shapes.TRIANGLE, "Triangle")
};
- public ObservableCollection ShapeList
+ public List ShapeList
{
get
{
@@ -431,10 +463,6 @@ namespace WebWindowComplex
JointList.Add(new Joint(this, 2, oldJointType));
JointList.Add(new Joint(this, 3, oldJointType));
JointList.Add(new Joint(this, 4, oldJointType));
- //JointList.Add(new Joint(this, 1, Joints.FULL_H));
- //JointList.Add(new Joint(this, 2, Joints.FULL_H));
- //JointList.Add(new Joint(this, 3, Joints.FULL_H));
- //JointList.Add(new Joint(this, 4, Joints.FULL_H));
break;
}
@@ -571,8 +599,8 @@ namespace WebWindowComplex
m_Shape = Value;
}
- private ObservableCollection m_DimensionList = new ObservableCollection();
- public ObservableCollection DimensionList
+ private List m_DimensionList = new List();
+ public List DimensionList
{
get
{
@@ -580,8 +608,8 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_JointList = new ObservableCollection();
- public ObservableCollection JointList
+ private List m_JointList = new List();
+ public List JointList
{
get
{
@@ -681,8 +709,6 @@ namespace WebWindowComplex
public static List m_HardwareCompleteList = new List();
// Lista hardware completa passata dal chiamante del componente
public static List s_FamilyHardwareList = new List();
- // Macro famiglia hardware scelta dal chiamante
- public static string s_SelFamilyHW = "";
public int nSashQty
{
@@ -940,8 +966,8 @@ namespace WebWindowComplex
m_bIsMeasureGlass = IsMeasureGlass;
}
- private ObservableCollection m_SashList = new ObservableCollection();
- public ObservableCollection SashList
+ private List m_SashList = new List();
+ public List SashList
{
get
{
@@ -970,8 +996,8 @@ namespace WebWindowComplex
m_SashType = SashType;
}
- private ObservableCollection m_JointList = new ObservableCollection();
- public ObservableCollection JointList
+ private List m_JointList = new List();
+ public List JointList
{
get
{
@@ -1039,8 +1065,36 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_HardwareList = new ObservableCollection();
- public ObservableCollection HardwareList
+ private string m_SelFamilyHardware;
+ public string SelFamilyHardware
+ {
+ get
+ {
+ return m_SelFamilyHardware;
+ }
+ set
+ {
+ m_SelFamilyHardware = value;
+ RefreshHardwareList();
+ RefreshHardwareOptionList();
+ SetFirstHardware();
+ m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized());
+ }
+ }
+
+ internal string SetSelFamilyHardwareFromIndex(string codHardware)
+ {
+ if (string.IsNullOrEmpty(m_SelFamilyHardware))
+ {
+ SelFamilyHardware = (m_HardwareCompleteList
+ .Where(x => x.Id == codHardware)
+ .First()).FamilyName;
+ }
+ return SelFamilyHardware;
+ }
+
+ private List m_HardwareList = new List();
+ public List HardwareList
{
get
{
@@ -1138,29 +1192,23 @@ namespace WebWindowComplex
internal void SetSelHardwareFromId(string sId)
{
if (m_HardwareList.Count == 0)
- m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0);
+ m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
else
- m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0);
+ m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
if (m_SelHardware == null)
m_SelHardware = m_HardwareList[0];
+ //SelFamilyHardware = m_SelHardware.FamilyName;
}
- public int SelHardwareTypeIndex
+ public string SelHardwareFromId
{
get
{
- for (int i = 0; i < m_HardwareList.Count; i++)
- {
- if (m_HardwareList[i].Equals(m_SelHardware))
- return i;
- }
- return 0;
- //return IdNameStruct.IndFromId((int)m_SelHardware, m_HardwareList);
+ return m_SelHardware.Id;
}
set
{
- m_SelHardware = m_HardwareList[value];
- //m_SelOpeningType = (Openings)IdNameStruct.IdFromInd(value, m_OpeningTypeList);
+ m_SelHardware = m_HardwareList.FirstOrDefault(x => !string.IsNullOrEmpty(value) && x.Id.Equals(value)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
}
}
@@ -1173,8 +1221,8 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_HwdOptionList = new ObservableCollection();
- public ObservableCollection HwdOptionList
+ private List m_HwdOptionList = new List();
+ public List HwdOptionList
{
get
{
@@ -1199,6 +1247,7 @@ namespace WebWindowComplex
newSash.JointList.Add(new Joint(newSash, JointIndex + 1, Joints.FULL_H));
newSash.SetSashBottomRail(false);
newSash.SetSashBottomRailQty(0);
+ newSash.SelFamilyHardware = Sash.s_FamilyHardwareList.First();
newSash.RefreshHardwareList();
newSash.RefreshHardwareOptionList();
newSash.SetFirstHardware();
@@ -1209,109 +1258,75 @@ namespace WebWindowComplex
return "Rectangular";
}
- internal OpeningTypes GetOpeningType(Openings OpeningType)
+ internal Enums.OpeningTypes GetOpeningType(Openings OpeningType)
{
switch (OpeningType)
{
case Openings.TURNONLY_LEFT:
case Openings.TURNONLY_RIGHT:
{
- return OpeningTypes.TURNONLY;
+ return Enums.OpeningTypes.TurnOnly;
}
case Openings.TILTTURN_LEFT:
case Openings.TILTTURN_RIGHT:
{
- return OpeningTypes.TILTTURN;
+ return Enums.OpeningTypes.TiltTurn;
}
case Openings.TILTONLY_TOP:
case Openings.TILTONLY_BOTTOM:
{
- return OpeningTypes.TILTONLY;
+ return Enums.OpeningTypes.TiltOnly;
}
case Openings.PIVOT:
{
- return OpeningTypes.PIVOT;
+ return Enums.OpeningTypes.Pivot;
}
case Openings.FIXED:
{
- return OpeningTypes.FIXED;
+ return Enums.OpeningTypes.Fixed;
}
case Openings.COMPLANARSLIDE_LEFT:
case Openings.COMPLANARSLIDE_RIGHT:
{
- return OpeningTypes.COMPLANARSLIDE;
+ return Enums.OpeningTypes.ComplanarSlide;
}
case Openings.LIFTSLIDE_LEFT:
case Openings.LIFTSLIDE_RIGHT:
{
- return OpeningTypes.LIFTSLIDE;
+ return Enums.OpeningTypes.LiftSlide;
}
default:
{
- return OpeningTypes.NULL;
+ return Enums.OpeningTypes.Null;
}
}
}
-
- private string ConvertOpeningType()
+ private Enums.OpeningTypes ConvertOpeningType()
{
+ var answ = Enums.OpeningTypes.Null;
if (m_SashList.Count > 1)
{
for (int i = 0; i < m_SashList.Count; i++)
{
if (m_SashList[i].bHasHandle)
{
- if (GetOpeningType(m_SashList[i].OpeningType) == OpeningTypes.TURNONLY)
- return "ANTA_BANDIERA";
- else
- return "ANTA_RIBALTA";
+ answ = GetOpeningType(m_SashList[i].OpeningType);
}
}
- return "";
}
- else if (m_SashList.Count == 1)
+ else
{
- switch (GetOpeningType(m_SashList[0].OpeningType))
- {
- case OpeningTypes.TILTTURN:
- {
- return "ANTA_RIBALTA";
- }
- case OpeningTypes.TURNONLY:
- {
- return "ANTA_BANDIERA";
- }
- case OpeningTypes.TILTONLY:
- {
- return "VASISTAS";
- }
- case OpeningTypes.PIVOT:
- {
- return "PIVOT";
- }
- case OpeningTypes.COMPLANARSLIDE:
- {
- return "COMPLANARE";
- }
- case OpeningTypes.LIFTSLIDE:
- {
- return "ALZANTE_SCORREVOLE";
- }
- default:
- {
- return "";
- }
- }
+ answ = GetOpeningType(m_SashList[0].OpeningType);
}
- return "";
+ return answ;
}
public void RefreshHardwareList()
@@ -1320,26 +1335,21 @@ namespace WebWindowComplex
{
m_HardwareList.Clear();
string sSashShape = FindSashShape();
- string sOpeningType = ConvertOpeningType();
+ Enums.OpeningTypes sOpeningType = ConvertOpeningType();
var iComp = StringComparison.InvariantCultureIgnoreCase;
var rawList = m_HardwareCompleteList
- .Where(x => x.Id == "000000" ||
- (!string.IsNullOrEmpty(s_SelFamilyHW) && x.FamilyName.Equals(s_SelFamilyHW, iComp) && x.SashQty == nSashQty && x.Shape.Equals(sSashShape, iComp) && x.OpeningType.Equals(sOpeningType, iComp))
- )
- .ToList();
+ .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)
+ )
+ .ToList();
if (rawList != null && rawList.Count > 0)
{
- m_HardwareList = new ObservableCollection(rawList);
+ m_HardwareList = new List(rawList);
}
else
{
- m_HardwareList = new ObservableCollection();
+ m_HardwareList = new List();
}
-#if false
- m_HardwareList = new ObservableCollection(from Hardware in m_HardwareCompleteList
- where Hardware.Id == "000000" || (Hardware.FamilyName == s_SelFamilyHW && Hardware.SashQty == nSashQty && Hardware.Shape == sSashShape && Hardware.OpeningType == sOpeningType)
- select Hardware);
-#endif
}
}
@@ -1388,6 +1398,7 @@ namespace WebWindowComplex
newSash.SetIsSashVertical(bIsSashVertical);
newSash.SetOrientationSashType(OrientationSashType);
newSash.SetSashBottomRailQty(SashBottomRailQty);
+ newSash.SetSelFamilyHardwareFromIndex(SelHardware.Id);
newSash.RefreshHardwareList();
newSash.RefreshHardwareOptionList();
newSash.SetSelHardware(SelHardware);
@@ -1681,14 +1692,14 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_SplitShapeList = new ObservableCollection
+ private List m_SplitShapeList = new List
{
new IdNameStruct((int)SplitShapes.VERTICAL, "Vertical"),
new IdNameStruct((int)SplitShapes.HORIZONTAL, "Horizontal"),
new IdNameStruct((int)SplitShapes.GRID, "Grid"),
new IdNameStruct((int)SplitShapes.CUSTOM, "Custom")
};
- public ObservableCollection SplitShapeList
+ public List SplitShapeList
{
get
{
@@ -1763,8 +1774,8 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_SplitPositionList = new ObservableCollection();
- public ObservableCollection SplitPositionList
+ private List m_SplitPositionList = new List();
+ public List SplitPositionList
{
get
{
@@ -1776,8 +1787,8 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_SplitVertList = new ObservableCollection();
- public ObservableCollection SplitVertList
+ private List m_SplitVertList = new List();
+ public List SplitVertList
{
get
{
@@ -1789,8 +1800,8 @@ namespace WebWindowComplex
}
}
- private ObservableCollection m_SplitHorizList = new ObservableCollection();
- public ObservableCollection SplitHorizList
+ private List m_SplitHorizList = new List();
+ public List SplitHorizList
{
get
{
@@ -1915,6 +1926,7 @@ namespace WebWindowComplex
return m_FillTypeList;
}
}
+
private FillTypes m_SelFillType;
public FillTypes SelFillType
{
@@ -2750,23 +2762,6 @@ namespace WebWindowComplex
return Name;
}
- public static int IndFromId(int Id, ObservableCollection List)
- {
- checked
- {
- int num = List.Count - 1;
- for (int i = 0; i <= num; i++)
- {
- if (List[i].Id == Id)
- {
- return i;
- }
- }
-
- return 0;
- }
- }
-
public static int IndFromId(int Id, List List)
{
checked
@@ -2784,33 +2779,11 @@ namespace WebWindowComplex
}
}
- public static int IdFromInd(int Ind, ObservableCollection List)
- {
- return List[Ind].Id;
- }
-
public static int IdFromInd(int Ind, List List)
{
return List[Ind].Id;
}
- public static int IndFromId(int Id, ObservableCollection
-
- x.sValue == HdwOptionParam.ValoreCorrente)?? new AGBOptionParameter("", "");
+ m_sValue = m_ValueList.FirstOrDefault(x => x.sValue == HdwOptionParam.ValoreCorrente) ?? new AGBOptionParameter("", "");
}
}
@@ -2295,7 +2258,7 @@ namespace WebWindowTest
{
// reference
private Sash m_Parent;
-
+
private int m_nSashId;
public int nSashId
{
@@ -2626,7 +2589,7 @@ namespace WebWindowTest
List RelativeDimList = new List();
if (bIsVertListDim)
RelativeDimList = m_Parent.SplitVertList.Where(x => x.bIsRelative).ToList();
- else
+ else
RelativeDimList = m_Parent.SplitHorizList.Where(x => x.bIsRelative).ToList();
// verifico se ci sono assoluti
//List RelativeDimList = m_Parent.SplitPositionList.Where(x => x.bIsRelative).ToList();
@@ -2671,7 +2634,7 @@ namespace WebWindowTest
dRes += RelativeDimList[Ind].dDimension;
}
dRes = (100 - dRes);
- if(dRes != 0)
+ if (dRes != 0)
RelativeDimList[nIndex - 1].SetDimension(dRes);
else
return;
@@ -2690,8 +2653,8 @@ namespace WebWindowTest
}
m_dDimension = value;
m_Parent.ParentWindow.OnUpdatePreview(m_Parent.ParentWindow.sSerialized());
- }
-
+ }
+
}
}
internal void SetDimension(double dValue)
-
+@if (bError)
+{
+
-
- }
- }
- else if (currStep == CompileStep.Sash)
- {
- @if (currSash >= SashList.Count || currSash == -1)
- {
- currStep = CompileStep.Tree;
- }
- else
- {
- Sash item = SashList[currSash];
-
-
-
-
-
-
- @(descParentSplit(item))
-
-
-
-
-
+
+
- +
+
-
-
-
-
-
+ Split
+
+
- Joints
- @if ((item.nSplitQtyVert == 1 && item.nSplitQtyHoriz == 0) || (item.nSplitQtyVert == 0 && item.nSplitQtyHoriz == 1))
- {
-
-
-
-
- }
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+ @foreach (Joint joint in FrameWindow.JointList)
+ {
-
-
-
-
- @if (item.nSplitQtyVert > 0)
- {
-
-
-
- }
- @if (item.nSplitQtyHoriz > 0)
- {
-
- QtyVert
-
-
-
-
}
- QtyHoriz
-
-
-
- @if (item.SplitVertList.Count > 0 && item.SplitHorizList.Count > 0)
- {
-
- @if (item.SelSplitShape == Json.WindowConst.SplitShapes.GRID)
+
- @foreach (var dim in item.SplitVertList)
- {
-
-
- Width
-
- %
-
- }
-
- @foreach (var dim in item.SplitHorizList)
- {
-
- }
- else if (item.SplitHorizList.Count > 0)
- {
- @foreach (var dim in item.SplitHorizList)
- {
-
- Height
-
- %
-
-
- }
-
-
- }
- }
- else if (item.SplitVertList.Count > 0)
- {
- @foreach (var dim in item.SplitVertList)
- {
-
- Height
-
- %
-
-
-
- }
- }
-
- Width
-
- %
-
-
+ @if (m_SashList.Count == 0)
{
-
-
-
-
+
-
+
-
-
-
-
-
- Bottom rail
+
+
}
+ Quantity
+
-
- }
- }
- else if (currStep == CompileStep.Fill)
- {
- @if (currFill >= FillList.Count || currFill == -1)
- {
- currStep = CompileStep.Tree;
- }
- else
- {
- Fill item = FillList[currFill];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @if (SashList.Count > 1)
- {
-
- Window @(currSash + 1)
- } - else - { -Window
- } -
-
-
-
-
-
-
-
-
-
- Qty sash
-
-
-
-
-
-
-
-
-
-
-
-
-
- Qty bottom rail
-
-
- -
-
-
-
-
- @foreach (Joint joint in item.JointList)
- {
-
-
- Joints
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
-
-
-
-
-
-
-
-
- Hardware
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @for (int i = 0; i <= item.SashList.Count / 2; i++)
- {
- for (int j = 0; j < 2 && (i * 2 + j <= item.SashList.Count - 1); j++)
- {
- SashDimension sash = item.SashList[i * 2 + j];
- Area anta;
- @if (item.AreaList[i * 2 + j] is Splitted)
- {
- anta = item.AreaList[i * 2 + j];
- }
- else
- {
- anta = item;
- }
-
-
- @if (item.SashList.Count == 1)
- {
-
-
- }
- }
- Sash
- } - else - { -Sash @(i * 2 + j + 1)
- } -
-
-
-
-
- Dimension
-
- %
-
-
-
- @if (!(anta.AreaList[0] is Split))
- {
-
-
-
-
-
-
-
-
- }
-
-
-
-
-
-
-
-
-
-
-
- @for (int k = 0; k <= item.SashList.Count - 1; k++)
- {
- @if (k != i * 2 + j)
- {
- int IndexCopy = k;
- int IndexModify = i * 2 + j;
-
-
-
- }
- }
-
-
-
-
-
+ }
+ else if (currStep == CompileStep.Split)
+ {
+ @if (currSplit >= SplitList.Count || currSplit == -1)
+ {
+ currStep = CompileStep.Tree;
+ }
+ else
+ {
+ Split item = SplitList[currSplit];
+
-
+
-
+
-
+
-
+
-
- @for (int i = 0; i < SplittedList.Count; i++)
- {
- Splitted currSplitted = SplittedList[i];
- @if (currSplitted.AreaList[0].Equals(item))
+ @if (!(FrameWindow.AreaList[0] is Split) || (SashList.Count == 0 && SplitList.Count == 0))
{
+
-
-
-
-
-
-
- Fill @(currFill + 1)
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- Selected all fill
-
-
-
-
-
-
-
-
-
-
-
+
- @if (currStep != CompileStep.Template)
- {
-
+
-
+
-
+
-
-
- }
- }
- else if (currStep == CompileStep.General)
- {
-
-
-
- @if (SplittedList.Count > 1)
- {
-
- Area split @(i + 1)
- } - else - { -Area split
- } +
+
- @(descParentSplit(item))
-
- @for (int j = 0; j < SashList.Count; j++)
- {
- int Index = j;
-
-
-
-
-
- }
- }
-
-
+
+
+
-
+
-
+
- }
-
+
+
+
+ Split
+
+ @if ((item.nSplitQtyVert == 1 && item.nSplitQtyHoriz == 0) || (item.nSplitQtyVert == 0 && item.nSplitQtyHoriz == 1))
+ {
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (item.nSplitQtyVert > 0)
+ {
+
+
+
+ }
+ @if (item.nSplitQtyHoriz > 0)
+ {
+
+ QtyVert
+
+
+
+
+ }
+
+ QtyHoriz
+
+
+
+ @if (item.SplitVertList.Count > 0 && item.SplitHorizList.Count > 0)
+ {
+
+ @if (item.SelSplitShape == Json.WindowConst.SplitShapes.GRID)
+ {
+
+ @foreach (var dim in item.SplitVertList)
+ {
+
+
+ Width
+
+ %
+
+ }
+
+ @foreach (var dim in item.SplitHorizList)
+ {
+
+ }
+ else if (item.SplitHorizList.Count > 0)
+ {
+ @foreach (var dim in item.SplitHorizList)
+ {
+
+ Height
+
+ %
+
+
+ }
+
+
+ }
+ }
+ else if (item.SplitVertList.Count > 0)
+ {
+ @foreach (var dim in item.SplitVertList)
+ {
+
+ Height
+
+ %
+
+
+
+ }
+ }
+
+ Width
+
+ %
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
-
-
- }
+
-
+ }
+ }
+ else if (currStep == CompileStep.Sash)
+ {
+ @if (currSash >= SashList.Count || currSash == -1)
+ {
+ currStep = CompileStep.Tree;
+ }
+ else
+ {
+ Sash item = SashList[currSash];
+
-
-
-
-
-
-
-
-
-
-
- General
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
@@ -846,21 +441,384 @@
-
-
-
- Fill type
-
-
-
-
-
-
-
-
-
-
-
-
-
- Color
-
-
-
-
-
-
-
-
+
+
+ }
+ }
+ else if (currStep == CompileStep.Fill)
+ {
+ @if (currFill >= FillList.Count || currFill == -1)
+ {
+ currStep = CompileStep.Tree;
+ }
+ else
+ {
+ Fill item = FillList[currFill];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @if (SashList.Count > 1)
+ {
+
+ Window @(currSash + 1)
+ } + else + { +Window
+ } +
+
+
+
+
+
+
+
+
+
+ Qty sash
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Qty bottom rail
+
+
+ +
+
+
+
+
+
+ @foreach (Joint joint in item.JointList)
+ {
+
+
+ Joints
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ Hardware
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @for (int i = 0; i <= item.SashList.Count / 2; i++)
+ {
+ for (int j = 0; j < 2 && (i * 2 + j <= item.SashList.Count - 1); j++)
+ {
+ SashDimension sash = item.SashList[i * 2 + j];
+ Area anta;
+ @if (item.AreaList[i * 2 + j] is Splitted)
+ {
+ anta = item.AreaList[i * 2 + j];
+ }
+ else
+ {
+ anta = item;
+ }
+
+
+ @if (item.SashList.Count == 1)
+ {
+
+
+ }
+ }
+ Sash
+ } + else + { +Sash @(i * 2 + j + 1)
+ } +
+
+
+
+
+ Dimension
+
+ %
+
+
+
+ @if (!(anta.AreaList[0] is Split))
+ {
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ @for (int k = 0; k <= item.SashList.Count - 1; k++)
+ {
+ @if (k != i * 2 + j)
+ {
+ int IndexCopy = k;
+ int IndexModify = i * 2 + j;
+
+
+
+ }
+ }
+
+
+
+
+
+ }
+ }
+ else if (currStep == CompileStep.General)
+ {
+
+
+
+
+
+
+
+
+
+
+ @foreach (var currSplitted in SplittedList)
+ @* @for (int i = 0; i < SplittedList.Count; i++) *@
+ {
+ @* Splitted currSplitted = SplittedList[i]; *@
+ @if (currSplitted.AreaList[0].Equals(item))
+ {
+
+
+
+
+
+
+
+ Fill @(currFill + 1)
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ Selected all fill
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+
+
+
+ @if (SplittedList.Count > 1)
+ {
+
+ Area split @(SplittedList.IndexOf(currSplitted) + 1)
+ } + else + { +Area split
+ } +
+
+ @foreach (var Index in SashList)
+ @* @for (int j = 0; j < SashList.Count; j++) *@
+ {
+ @* int Index = j; *@
+
+
+
+
+
+ }
+
+
+
+
- @*
+ @if (currStep != CompileStep.Template)
+ {
+ *@
- @outSvg
- @*
*@
-
+ @outSvg
+
+ }
+ if (listWarnings != null && listWarnings.Count > 0)
+ {
+
+
+ }
+ }
}
Mancata corrispondenza valori:
+
+
+
+ -
+ @foreach (var item in listWarnings)
+ {
+
+ Aggiunta finestra non possibile.
+
+}
+
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 3019e57..4505d2e 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -49,6 +49,12 @@ namespace WebWindowComplex
[Parameter]
public EventCallback