- ChangeStartVert(e)">
+ @if (User)
+ {
+
+ }
+ else
+ {
+ ChangeStartVert(e)">
+ }
diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs
index 60d7ae2..513ed3b 100644
--- a/WebWindowComplex/Compo/CardSplit.razor.cs
+++ b/WebWindowComplex/Compo/CardSplit.razor.cs
@@ -33,6 +33,12 @@ namespace WebWindowComplex.Compo
[Parameter]
public Frame FrameWindow { get; set; } = null!;
+ ///
+ /// Livello di accesso (utente base)
+ ///
+ [CascadingParameter(Name = "User")]
+ public bool User { get; set; } = false!;
+
///
/// Evento per richiedere reset dizionario
///
diff --git a/WebWindowComplex/Compo/EditJoint.razor b/WebWindowComplex/Compo/EditJoint.razor
index 18b71de..eee5480 100644
--- a/WebWindowComplex/Compo/EditJoint.razor
+++ b/WebWindowComplex/Compo/EditJoint.razor
@@ -1,23 +1,31 @@
@using static WebWindowComplex.LayoutConst
-
- @if (CurrRec.ParentArea is Frame &&
- (CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.DOUBLEARC ||
- CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.ARC_FULL ||
- CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.THREECENTERARC) &&
- (CurrRec.nIndex == 3 || CurrRec.nIndex == 4))
+ @if (User)
{
-
+ @((PositionJoints)(CurrRec.nIndex - 1))
+
}
else
{
-
+
+ @if (CurrRec.ParentArea is Frame &&
+ (CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.DOUBLEARC ||
+ CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.ARC_FULL ||
+ CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.THREECENTERARC) &&
+ (CurrRec.nIndex == 3 || CurrRec.nIndex == 4))
+ {
+
+ }
+ else
+ {
+
+ }
}
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/EditJoint.razor.cs b/WebWindowComplex/Compo/EditJoint.razor.cs
index f3f02ba..9598932 100644
--- a/WebWindowComplex/Compo/EditJoint.razor.cs
+++ b/WebWindowComplex/Compo/EditJoint.razor.cs
@@ -17,6 +17,12 @@ namespace WebWindowComplex.Compo
[Parameter]
public EventCallback
EC_Update { get; set; }
+ ///
+ /// Livello di accesso (utente base)
+ ///
+ [CascadingParameter(Name = "User")]
+ public bool User { get; set; } = false!;
+
#endregion Public Properties
#region Private Properties
diff --git a/WebWindowComplex/Compo/EditOptionCombo.razor b/WebWindowComplex/Compo/EditOptionCombo.razor
index e02c3a3..3436936 100644
--- a/WebWindowComplex/Compo/EditOptionCombo.razor
+++ b/WebWindowComplex/Compo/EditOptionCombo.razor
@@ -1,9 +1,24 @@

-
-
+ else
+ {
+
+ }
+ }
+ else
+ {
+
+
+ }
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/EditOptionCombo.razor.cs b/WebWindowComplex/Compo/EditOptionCombo.razor.cs
index 17e625e..5809b31 100644
--- a/WebWindowComplex/Compo/EditOptionCombo.razor.cs
+++ b/WebWindowComplex/Compo/EditOptionCombo.razor.cs
@@ -13,6 +13,12 @@ namespace WebWindowComplex.Compo
[Parameter]
public AGBOptionCombo CurrOpt { get; set; } = null!;
+ ///
+ /// Livello di accesso (utente base)
+ ///
+ [CascadingParameter(Name = "User")]
+ public bool User { get; set; } = false!;
+
[Parameter]
public EventCallback EC_Update { get; set; }
diff --git a/WebWindowComplex/Compo/EditOptionText.razor b/WebWindowComplex/Compo/EditOptionText.razor
index a655b5f..3dbfb2e 100644
--- a/WebWindowComplex/Compo/EditOptionText.razor
+++ b/WebWindowComplex/Compo/EditOptionText.razor
@@ -1,22 +1,56 @@

-
- @if (CurrOpt.sName.Equals("HMan"))
+ @if (User)
{
-
- }
- else if (CurrOpt.ValueList.Count > 0)
- {
-
+ else
+ {
+
+ }
+ }
+ else
+ {
+ if (CurrValue is String)
+ {
+
+ }
+ else
+ {
+
+ }
+ }
}
else
{
-
+
+ @if (CurrOpt.sName.Equals("HMan"))
+ {
+
+ }
+ else if (CurrOpt.ValueList.Count > 0)
+ {
+
+ }
+ else
+ {
+
+ }
+
}
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/EditOptionText.razor.cs b/WebWindowComplex/Compo/EditOptionText.razor.cs
index dd42442..52cfd38 100644
--- a/WebWindowComplex/Compo/EditOptionText.razor.cs
+++ b/WebWindowComplex/Compo/EditOptionText.razor.cs
@@ -13,6 +13,12 @@ namespace WebWindowComplex.Compo
[Parameter]
public AGBOptionText CurrOpt { get; set; } = null!;
+ ///
+ /// Livello di accesso (utente base)
+ ///
+ [CascadingParameter(Name = "User")]
+ public bool User { get; set; } = false!;
+
[Parameter]
public EventCallback EC_Update { get; set; }
diff --git a/WebWindowComplex/Compo/General.razor b/WebWindowComplex/Compo/General.razor
index 77bcf26..7f9b856 100644
--- a/WebWindowComplex/Compo/General.razor
+++ b/WebWindowComplex/Compo/General.razor
@@ -14,22 +14,38 @@
@@ -41,13 +57,21 @@
-
-
+ @if (User)
+ {
+ Glass
+
+ }
+ else
+ {
+
+
+ }
@@ -65,13 +89,21 @@
- @if(SplittedList != null && SplittedList.Count > 0)
+ @if(!baseUser && SplittedList != null && SplittedList.Count > 0)
{
Splitted currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault()?? new Splitted(null, null);
@if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null){
@@ -181,13 +202,6 @@
}
}
- @* @foreach (var currSplitted in m_SplittedList)
- {
- @if (currSplitted.AreaList.First().Equals(FillList[currFillIndex]))
- {
-
- }
- } *@
}
}
else if (currStep == CompileStep.General)
@@ -195,6 +209,7 @@
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 2af4fe8..3122280 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -92,6 +92,12 @@ namespace WebWindowComplex
[Parameter]
public LivePayload LiveData { get; set; } = null!;
+ ///
+ /// Livello di accesso (utente base)
+ ///
+ [Parameter]
+ public bool baseUser { get; set; } = false!;
+
#endregion Public Properties
#region Public Methods
@@ -1294,6 +1300,20 @@ namespace WebWindowComplex
}
}
+ ///
+ /// Calcola bottone per tutti i Fill
+ ///
+ ///
+ private string buttonFillCss(FillTypes reqFillTypes)
+ {
+ foreach (var fill in FillList)
+ {
+ if (!fill.FillType.Equals(reqFillTypes))
+ return "btn btn-outline-secondary btn-sm";
+ }
+ return "btn btn-secondary btn-sm";
+ }
+
#endregion Private Methods
}
}
\ No newline at end of file
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index e20b419..8925ad2 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
-
2.7.1.1615
+
2.7.1.1910
Annamaria Sassi
Egalware
Componente gestione Configurazioni avanzate Window per LUX
@@ -30,441 +30,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 3666e7e..07cb0e1 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
-
2.7.1.1615
+
2.7.1.1910
Annamaria Sassi
Egalware
Componente gestione JWD per LUX
@@ -37,630 +37,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-