diff --git a/Test.UI/Test.UI.csproj b/Test.UI/Test.UI.csproj index 75050e1..d8ab4c3 100644 --- a/Test.UI/Test.UI.csproj +++ b/Test.UI/Test.UI.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/WebAedificaConfigurator/WebAedificaConfigurator.csproj b/WebAedificaConfigurator/WebAedificaConfigurator.csproj index 63b386c..e31212a 100644 --- a/WebAedificaConfigurator/WebAedificaConfigurator.csproj +++ b/WebAedificaConfigurator/WebAedificaConfigurator.csproj @@ -12,7 +12,7 @@ - + diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index b79d269..9fac3ff 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -1,228 +1,229 @@ -@using static WebWindowComplex.LayoutConst -
- @if (isLoading) - { - - } - else - { - if (listErrPre != null && listErrPre.Count > 0) - { -
-
Errori validazione!
-
- -
    - @foreach (var item in listErrPre) - { -
  • @item.Value
    • - } -
-
-
- } - @* else if (listErrLink != null && listErrLink.Count > 0) - { -
-
Errore configurazione:
-
-
    - @foreach (var item in listErrLink) - { -
  • @item.Value
    • - } -
-
-
- } *@ - else - { -
-
-
-
-
-
    -
  • - -
    • -
  • - -
    • - @* @if (FrameWindow.Shape == Json.WindowConst.Shapes.ARC || - FrameWindow.Shape == Json.WindowConst.Shapes.ARC_FULL || - FrameWindow.Shape == Json.WindowConst.Shapes.DOUBLEARC || - FrameWindow.Shape == Json.WindowConst.Shapes.THREECENTERARC) - { -
  • - -
    • - } *@ -
-
-
-
- -
-
- -
-
- -
-
-
-
-
- @if (currStep == CompileStep.Tree) - { - - - } - else if (currStep == CompileStep.Frame) - { - @if (m_CurrWindow != null) - { - m_PreviousWindow = m_CurrWindow; - } - - - - - - - - - } - else if (currStep == CompileStep.Split) - { - @if (currSplitIndex >= SplitList.Count || currSplitIndex == -1) - { - currStep = CompileStep.Tree; - } - else - { - - - } - } - else if (currStep == CompileStep.Sash) - { - @if (currSashIndex >= SashList.Count || currSashIndex == -1) - { - currStep = CompileStep.Tree; - } - else - { - - - - - - - - - } - } - else if (currStep == CompileStep.Fill) - { - @if (currFillIndex >= FillList.Count || currFillIndex == -1) - { - currStep = CompileStep.Tree; - } - else - { - - -
-
-
-
-
All fill
-
-
- -
-
- -
-
-
-
- Splitted currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault(); - @if (currSplitted != null) { - - - } - @* @foreach (var currSplitted in m_SplittedList) - { - @if (currSplitted.AreaList.First().Equals(FillList[currFillIndex])) - { - - } - } *@ - } - } - else if (currStep == CompileStep.General) - { - - - } - @* else if (currStep == CompileStep.ArcElement) - { - - - } *@ -
-
-
-
- @outSvg -
- if (listWarnings != null && listWarnings.Count > 0) - { -
-
Mancata corrispondenza valori:
-
-
    - @foreach (var item in listWarnings) - { -
  • @item.Value
    • - } -
-
-
- } - } - } +@using static WebWindowComplex.LayoutConst +
+ @if (isLoading) + { + + } + else + { + if (listErrPre != null && listErrPre.Count > 0) + { +
+
Errori validazione!
+
+ +
    + @foreach (var item in listErrPre) + { +
  • @item.Value
    • + } +
+
+
+ } + @* else if (listErrLink != null && listErrLink.Count > 0) + { +
+
Errore configurazione:
+
+
    + @foreach (var item in listErrLink) + { +
  • @item.Value
    • + } +
+
+
+ } *@ + else + { +
+
+
+
+
+
    +
  • + +
    • +
  • + +
    • + @* @if (FrameWindow.Shape == Json.WindowConst.Shapes.ARC || + FrameWindow.Shape == Json.WindowConst.Shapes.ARC_FULL || + FrameWindow.Shape == Json.WindowConst.Shapes.DOUBLEARC || + FrameWindow.Shape == Json.WindowConst.Shapes.THREECENTERARC) + { +
  • + +
    • + } *@ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ @if (currStep == CompileStep.Tree) + { + + + } + else if (currStep == CompileStep.Frame) + { + @if (m_CurrWindow != null) + { + m_PreviousWindow = m_CurrWindow; + } + + + + + + + + + } + else if (currStep == CompileStep.Split) + { + @if (currSplitIndex >= SplitList.Count || currSplitIndex == -1) + { + currStep = CompileStep.Tree; + } + else + { + + + } + } + else if (currStep == CompileStep.Sash) + { + @if (currSashIndex >= SashList.Count || currSashIndex == -1) + { + currStep = CompileStep.Tree; + } + else + { + + + + + + + + + } + } + else if (currStep == CompileStep.Fill) + { + @if (currFillIndex >= FillList.Count || currFillIndex == -1) + { + currStep = CompileStep.Tree; + } + else + { + + +
+
+
+
+
All fill
+
+
+ +
+
+ +
+
+
+
+ Splitted currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault(); + @if (currSplitted != null) { + + + } + @* @foreach (var currSplitted in m_SplittedList) + { + @if (currSplitted.AreaList.First().Equals(FillList[currFillIndex])) + { + + } + } *@ + } + } + else if (currStep == CompileStep.General) + { + + + } + @* else if (currStep == CompileStep.ArcElement) + { + + + } *@ +
+
+
+
+ @outSvg +
+ if (listWarnings != null && listWarnings.Count > 0) + { +
+
Mancata corrispondenza valori:
+
+
    + @foreach (var item in listWarnings) + { +
  • @item.Value
    • + } +
+
+
+ } + } + }
\ No newline at end of file diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 9c097fd..88d8c97 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.12.2311 + 2.7.12.2312 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -18,7 +18,7 @@ - + @@ -430,6 +430,8 @@ + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 54f2407..01f1737 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.12.2311 + 2.7.12.2312 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -26,7 +26,7 @@ - + @@ -541,6 +541,8 @@ + + diff --git a/WebWindowTest/WebWindowTest.csproj b/WebWindowTest/WebWindowTest.csproj index 9a892fc..a0b7269 100644 --- a/WebWindowTest/WebWindowTest.csproj +++ b/WebWindowTest/WebWindowTest.csproj @@ -12,7 +12,7 @@ - +