diff --git a/WebWindowComplex/Compo/CardSplit.razor b/WebWindowComplex/Compo/CardSplit.razor index 6e17f49..7bf2997 100644 --- a/WebWindowComplex/Compo/CardSplit.razor +++ b/WebWindowComplex/Compo/CardSplit.razor @@ -117,9 +117,10 @@ @for (int i = 0; i < CurrSplit.SplitHorizList.Count; i++) { + Name="Height" + Index="i" + TotElem="CurrSplit.SplitHorizList.Count" + EC_Update="UpdateDimension"> } @@ -127,7 +128,7 @@ @foreach (var element in horizList()) {
- +
} @@ -162,9 +163,10 @@ @for (int i = 0; i < CurrSplit.SplitVertList.Count; i++) { + Name="Width" + Index="i" + TotElem="CurrSplit.SplitVertList.Count" + EC_Update="UpdateDimension"> } @@ -172,7 +174,7 @@ @foreach (var element in vertList()) {
- +
} diff --git a/WebWindowComplex/Compo/EditSplitDimensions.razor b/WebWindowComplex/Compo/EditSplitDimensions.razor index ae8f656..e256a0e 100644 --- a/WebWindowComplex/Compo/EditSplitDimensions.razor +++ b/WebWindowComplex/Compo/EditSplitDimensions.razor @@ -2,7 +2,10 @@
- @(Name + " " + (Index+ 1)) + @* @(Name + " " + (Index+ 1)) *@ + + + @if(BaseUser) { diff --git a/WebWindowComplex/Compo/EditSplitDimensions.razor.cs b/WebWindowComplex/Compo/EditSplitDimensions.razor.cs index f83a4c8..e478496 100644 --- a/WebWindowComplex/Compo/EditSplitDimensions.razor.cs +++ b/WebWindowComplex/Compo/EditSplitDimensions.razor.cs @@ -25,6 +25,12 @@ namespace WebWindowComplex.Compo [Parameter] public int Index { get; set; } = -1; + /// + /// Indice dello split dimension + /// + [Parameter] + public int TotElem { get; set; } = -1; + /// /// Livello di accesso (utente base) /// @@ -81,17 +87,7 @@ namespace WebWindowComplex.Compo } } - //private string SplitDimCss() - //{ - // if(CurrRec.Parent is Split split) - // { - // if (split.SelSplitShape.Equals(Json.WindowConst.SplitShapes.GRID)) - // return ""; - // else - // return "col-md-12 col-lg-6"; - // } - // return ""; - //} + #endregion Private Properties /// /// Metodo per avere il numero di decimali da usare nella form-input @@ -141,7 +137,25 @@ namespace WebWindowComplex.Compo return 0; } - #endregion Private Properties + private string GetImageDimensionPath() + { + string nameFile = Name; + if (Index == 0) + { + nameFile = nameFile + "1"; + } + else if (Index == TotElem - 1) + { + nameFile = nameFile + "3"; + } + else + { + nameFile = nameFile + "2"; + } + return $"_content/Egw.Lux.WebWindowComplex/icone/split/dimension/{nameFile}.svg"; + } + + } /// diff --git a/WebWindowComplex/Compo/EditSplitElement.razor b/WebWindowComplex/Compo/EditSplitElement.razor index 9f37eed..e0da414 100644 --- a/WebWindowComplex/Compo/EditSplitElement.razor +++ b/WebWindowComplex/Compo/EditSplitElement.razor @@ -1,6 +1,10 @@ @using static WebWindowComplex.LayoutConst
- @CurrRec.nIndex + + + @CurrRec.nIndex + + @* @CurrRec.nIndex *@ @if (BaseUser) { diff --git a/WebWindowComplex/Compo/EditSplitElement.razor.cs b/WebWindowComplex/Compo/EditSplitElement.razor.cs index 3a57a2a..0d728d0 100644 --- a/WebWindowComplex/Compo/EditSplitElement.razor.cs +++ b/WebWindowComplex/Compo/EditSplitElement.razor.cs @@ -13,6 +13,12 @@ namespace WebWindowComplex.Compo [Parameter] public SplitElementDimension CurrRec { get; set; } = null!; + /// + /// Tipo dello split element corrente + /// + [Parameter] + public string Type { get; set; } = null!; + [Parameter] public EventCallback EC_Update { get; set; } @@ -27,6 +33,12 @@ namespace WebWindowComplex.Compo #region Private Properties + private string GetImageElemPath() => $"_content/Egw.Lux.WebWindowComplex/icone/split/element/{Type}.svg"; + + #endregion Private Properties + + #region Private Properties + /// /// Metodo per aggiornare element corrente /// @@ -48,15 +60,6 @@ namespace WebWindowComplex.Compo return "Min: " + CurrRec.dMinDim + ", Max: " + CurrRec.dMaxDim; } - //private string name() - //{ - // string ans = ""; - // if (CurrRec.nSubArea > 0) - // ans = ans + "A:" + CurrRec.nSubArea + ", "; - // ans = ans + "N:" + CurrRec.nIndex; - // return ans; - //} - #endregion Private Properties } } \ No newline at end of file diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 52176ee..98d1870 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -319,8 +319,28 @@ namespace WebWindowComplex //PendReq.Remove("Profile"); //await EC_PendantAction.InvokeAsync(PendReq); } - if(Vocabulary != null) + if (Vocabulary == null) { + string filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data", "Lemmi.json"); + + if (File.Exists(filePath)) + { + string jsonText = await File.ReadAllTextAsync(filePath); + List? tradList = JsonConvert.DeserializeObject>(jsonText); + if (tradList != null) + { + Log.Info("Richiesta Traduzione"); + prevReqTrad = true; + await EC_ReqTraduzione.InvokeAsync(tradList); + } + } + else + { + Log.Info("File Json non trovato"); + } + } + else + { CurrVocabulary = Vocabulary; TableCDict = Vocabulary.Where(x => x.Key.Contains("CWTableC_")).ToDictionary(x => x.Key, y => y.Value); if ((TableCDict == null || TableCDict.Count != 13) && !prevReqTrad) diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 3f0135a..0574b63 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,17 +6,21 @@ net8.0 enable enable - 3.1.8.1809 + 3.1.8.1810 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX - - - PreserveNewest - - + + + true + content\Data + true + PreserveNewest + PreserveNewest + + @@ -40,223 +44,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebWindowComplex/wwwroot/icone/split/dimension/Height1.svg b/WebWindowComplex/wwwroot/icone/split/dimension/Height1.svg new file mode 100644 index 0000000..3321dab --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/dimension/Height1.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/dimension/Height2.svg b/WebWindowComplex/wwwroot/icone/split/dimension/Height2.svg new file mode 100644 index 0000000..5d7c1aa --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/dimension/Height2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/dimension/Height3.svg b/WebWindowComplex/wwwroot/icone/split/dimension/Height3.svg new file mode 100644 index 0000000..090e215 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/dimension/Height3.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/dimension/Width1.svg b/WebWindowComplex/wwwroot/icone/split/dimension/Width1.svg new file mode 100644 index 0000000..c9f032d --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/dimension/Width1.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/dimension/Width2.svg b/WebWindowComplex/wwwroot/icone/split/dimension/Width2.svg new file mode 100644 index 0000000..07b6d20 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/dimension/Width2.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/dimension/Width3.svg b/WebWindowComplex/wwwroot/icone/split/dimension/Width3.svg new file mode 100644 index 0000000..0c9a78f --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/dimension/Width3.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/element/Horizontal.svg b/WebWindowComplex/wwwroot/icone/split/element/Horizontal.svg new file mode 100644 index 0000000..f111222 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/element/Horizontal.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/split/element/Vertical.svg b/WebWindowComplex/wwwroot/icone/split/element/Vertical.svg new file mode 100644 index 0000000..499f427 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/split/element/Vertical.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index be1f1ea..21dd8d5 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.1809 + 3.1.8.1810 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -37,538 +37,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -