diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 276e6395..85c186ac 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2605.2109 + 1.1.2605.2814 diff --git a/Lux.UI/Components/Compo/Config/GlassMan.razor b/Lux.UI/Components/Compo/Config/GlassMan.razor index b7db6495..9a70762e 100644 --- a/Lux.UI/Components/Compo/Config/GlassMan.razor +++ b/Lux.UI/Components/Compo/Config/GlassMan.razor @@ -1,8 +1,8 @@ 
-
+
-
Conf. Vetro
+
Tipologie di Vetro
@@ -10,12 +10,15 @@
- +
+
+ NB: le configurazioni sono modificabili +
@if (isLoading || ListRecords == null) @@ -31,14 +34,14 @@ - @* *@ - - - - + + + @@ -50,8 +53,8 @@ - - + +
+ IDCod.DescrizioneSize mm + Cod.DescrizioneSize mm
@item.GlassID @item.Code@item.Description@($"{item.Thickness:N2}")@item.Description@($"{item.Thickness:N2}") @if (false) { diff --git a/Lux.UI/Components/Compo/Config/GlassMan.razor.cs b/Lux.UI/Components/Compo/Config/GlassMan.razor.cs index f23e2a3f..cd687411 100644 --- a/Lux.UI/Components/Compo/Config/GlassMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/GlassMan.razor.cs @@ -115,7 +115,7 @@ namespace Lux.UI.Components.Compo.Config private GlassModel? EditRecord = null; private bool isLoading = false; private List ListRecords = new(); - private int numRecord = 5; + private int numRecord = 10; private GlassModel? SelRecord = null; private int totalCount = 0; @@ -195,6 +195,11 @@ namespace Lux.UI.Components.Compo.Config isLoading = false; } + private string btnResetCss + { + get => string.IsNullOrEmpty(searchVal) ? "btn-outline-light" : "btn-primary"; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/Config/HardwareMan.razor b/Lux.UI/Components/Compo/Config/HardwareMan.razor index d31717cd..3188e368 100644 --- a/Lux.UI/Components/Compo/Config/HardwareMan.razor +++ b/Lux.UI/Components/Compo/Config/HardwareMan.razor @@ -3,7 +3,7 @@
-
Conf. Hardware
+
Tipologie di Hardware
@@ -21,6 +21,9 @@
+
+ NB: le configurazioni sono ricevute dal sistema CAD/CAM di calcolo +
@if (isLoading || ListRecords == null) diff --git a/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs b/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs index 2465f24b..70f4b469 100644 --- a/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/HardwareMan.razor.cs @@ -57,7 +57,7 @@ namespace Lux.UI.Components.Compo.Config private List ListRecords = new(); - private int numRecord = 5; + private int numRecord = 10; private int totalCount = 0; diff --git a/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor b/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor index 4ab796c5..7093a7e1 100644 --- a/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor +++ b/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor @@ -1,4 +1,55 @@ - *@ diff --git a/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor.cs b/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor.cs index 2cf458ac..2b47ae31 100644 --- a/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor.cs +++ b/Lux.UI/Components/Compo/Config/ProfThreshDetail.razor.cs @@ -54,5 +54,6 @@ namespace Lux.UI.Components.Compo.Config { await EC_ReqClose.InvokeAsync(true); } + } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/Config/ProfileMan.razor b/Lux.UI/Components/Compo/Config/ProfileMan.razor index ce2e3c86..33924331 100644 --- a/Lux.UI/Components/Compo/Config/ProfileMan.razor +++ b/Lux.UI/Components/Compo/Config/ProfileMan.razor @@ -3,7 +3,7 @@
-
Conf. Profilo
+
Tipi di Profili
@@ -24,6 +24,9 @@
+
+ NB: le configurazioni sono ricevute dal sistema CAD/CAM di calcolo +
@if (isLoading || ListRecords == null) diff --git a/Lux.UI/Components/Compo/Config/WoodMan.razor b/Lux.UI/Components/Compo/Config/WoodMan.razor index f176f85b..dd3d77c5 100644 --- a/Lux.UI/Components/Compo/Config/WoodMan.razor +++ b/Lux.UI/Components/Compo/Config/WoodMan.razor @@ -1,8 +1,8 @@ 
-
+
-
Conf. Legno
+
Tipologie di Legno
@@ -10,12 +10,15 @@
- +
+
+ NB: le configurazioni sono modificabili +
@if (isLoading || ListRecords == null) @@ -31,14 +34,14 @@ - @* *@ - - - - + + + @@ -50,8 +53,8 @@ - - + +
+ IDCod.DescrizioneTipo + Cod.DescrizioneTipo
@item.WoodID @item.Code@item.Description@item.Type@item.Description@item.Type @if (false) { diff --git a/Lux.UI/Components/Compo/Config/WoodMan.razor.cs b/Lux.UI/Components/Compo/Config/WoodMan.razor.cs index 14d81c4a..ced5ccfe 100644 --- a/Lux.UI/Components/Compo/Config/WoodMan.razor.cs +++ b/Lux.UI/Components/Compo/Config/WoodMan.razor.cs @@ -199,6 +199,11 @@ namespace Lux.UI.Components.Compo.Config isLoading = false; } + private string btnResetCss + { + get => string.IsNullOrEmpty(searchVal) ? "btn-outline-light" : "btn-primary"; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor b/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor index d69481f9..cd2812a6 100644 --- a/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor +++ b/Lux.UI/Components/Compo/Offer/AddFromTemplate.razor @@ -35,8 +35,10 @@
@* *@ -
-
@item.TemplateRowUID
+
+
+ @item.TemplateRowUID +
@item.Name
diff --git a/Lux.UI/Components/Layout/NavMenu.razor b/Lux.UI/Components/Layout/NavMenu.razor index 2ef8bf36..545032da 100644 --- a/Lux.UI/Components/Layout/NavMenu.razor +++ b/Lux.UI/Components/Layout/NavMenu.razor @@ -77,6 +77,11 @@ Configurazioni
+
+ + Configurazioni2 + +
Stats diff --git a/Lux.UI/Components/Pages/ConfListNew.razor b/Lux.UI/Components/Pages/ConfListNew.razor new file mode 100644 index 00000000..f97399da --- /dev/null +++ b/Lux.UI/Components/Pages/ConfListNew.razor @@ -0,0 +1,56 @@ +@page "/ConfListNew" + +
+
+
+
+ Configurazioni +
+
+
+
+ @if (isLoading) + { + + } + else + { +
+
+
+ + + + +
+
+ @if (showConf == 0) + { +
+ +
+ } + else if (showConf == 1) + { +
+ +
+ } + else if (showConf == 2) + { +
+ +
+ } + else if (showConf == 3) + { +
+ +
+ } +
+ } +
+
+ + diff --git a/Lux.UI/Components/Pages/ConfListNew.razor.cs b/Lux.UI/Components/Pages/ConfListNew.razor.cs new file mode 100644 index 00000000..eff2a549 --- /dev/null +++ b/Lux.UI/Components/Pages/ConfListNew.razor.cs @@ -0,0 +1,66 @@ +namespace Lux.UI.Components.Pages +{ + public partial class ConfListNew + { + #region Protected Properties + + protected string SearchVal + { + get => searchVal; + set + { + isLoading = true; + searchVal = value; + isLoading = false; + } + } + + #endregion Protected Properties + +#if false + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await Task.Delay(500); + isLoading = false; + await InvokeAsync(StateHasChanged); + } + } +#endif + + #region Protected Methods + + protected void ResetSearch() + { + SearchVal = ""; + } + + #endregion Protected Methods + + #region Private Fields + + private bool isLoading = false; + private string searchVal = ""; + private int showConf = 0; + + #endregion Private Fields + + #region Private Methods + + private void DoOpen(int index) + { + showConf = index; + } + + private string ButtonCss(int index) + { + string ans = ""; + if (showConf == index) + ans = "active"; + return ans; + } + + #endregion Private Methods + } +} \ No newline at end of file diff --git a/Lux.UI/Components/Pages/ConfListNew.razor.css b/Lux.UI/Components/Pages/ConfListNew.razor.css new file mode 100644 index 00000000..cecf7494 --- /dev/null +++ b/Lux.UI/Components/Pages/ConfListNew.razor.css @@ -0,0 +1,28 @@ +/* Questo trasforma il bottone in un elemento di un menu */ +.btn-menu { + background: none; + border: none; + text-align: left; + padding: 10px 20px; + font-size: 1.1rem; + background-color: #b9e3fa; + color: white !important; + border-radius: 8px; + transition: all 0.2s ease-in-out; + width: 100%; + /* Lo fa occupare tutta la larghezza della colonna */ +} +/* Effetto quando passi il mouse sopra */ +.btn-menu:hover { + background-color: #2690c9; + color: #000; +} +/* Effetto quando il bottone è selezionato */ +.btn-menu.active { + background-color: #57b6eb; + color: white !important; + font-weight: bold; +} +.calc-height { + height: calc(100vh - 115px); +} \ No newline at end of file diff --git a/Lux.UI/Components/Pages/ConfListNew.razor.less b/Lux.UI/Components/Pages/ConfListNew.razor.less new file mode 100644 index 00000000..dfbb9258 --- /dev/null +++ b/Lux.UI/Components/Pages/ConfListNew.razor.less @@ -0,0 +1,30 @@ +/* Questo trasforma il bottone in un elemento di un menu */ +.btn-menu { + background: none; + border: none; + text-align: left; + padding: 10px 20px; + font-size: 1.1rem; + background-color: #b9e3fa; + color: white !important; + border-radius: 8px; + transition: all 0.2s ease-in-out; + width: 100%; /* Lo fa occupare tutta la larghezza della colonna */ +} + +/* Effetto quando passi il mouse sopra */ +.btn-menu:hover { + background-color: #2690c9; + color: #000; +} + +/* Effetto quando il bottone è selezionato */ +.btn-menu.active { + background-color: #57b6eb; + color: white !important; + font-weight: bold; +} + +.calc-height { + height: calc(100vh - 115px); +} \ No newline at end of file diff --git a/Lux.UI/Components/Pages/ConfListNew.razor.min.css b/Lux.UI/Components/Pages/ConfListNew.razor.min.css new file mode 100644 index 00000000..48962b8f --- /dev/null +++ b/Lux.UI/Components/Pages/ConfListNew.razor.min.css @@ -0,0 +1 @@ +.btn-menu{background:none;border:0;text-align:left;padding:10px 20px;font-size:1.1rem;background-color:#b9e3fa;color:#fff!important;border-radius:8px;transition:all .2s ease-in-out;width:100%;}.btn-menu:hover{background-color:#2690c9;color:#000;}.btn-menu.active{background-color:#57b6eb;color:#fff!important;font-weight:bold;}.calc-height{height:calc(100vh - 115px);} \ No newline at end of file diff --git a/Lux.UI/Components/Pages/Offers.razor.cs b/Lux.UI/Components/Pages/Offers.razor.cs index ab8706e8..2da30fef 100644 --- a/Lux.UI/Components/Pages/Offers.razor.cs +++ b/Lux.UI/Components/Pages/Offers.razor.cs @@ -219,9 +219,11 @@ namespace Lux.UI.Components.Pages EditRecord = new OfferModel() { RefYear = DateTime.Today.Year, + Inserted = DateTime.Today, Description = $"Nuova Offerta {DateTime.Today:ddd yyyy.MM.dd}", ValidUntil = DateTime.Today.AddMonths(1) }; + currStep = CompileStep.Header; } private async Task DoClone(OfferModel rec2clone) diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 23c80fcc..f4193ee7 100644 --- a/Lux.UI/Lux.UI.csproj +++ b/Lux.UI/Lux.UI.csproj @@ -5,7 +5,7 @@ enable enable aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50 - 1.1.2605.2109 + 1.1.2605.2814 diff --git a/Lux.UI/compilerconfig.json b/Lux.UI/compilerconfig.json index 2d12f6ca..4f038f69 100644 --- a/Lux.UI/compilerconfig.json +++ b/Lux.UI/compilerconfig.json @@ -22,5 +22,13 @@ { "outputFile": "Components/Layout/Item.razor.css", "inputFile": "Components/Layout/Item.razor.less" + }, + { + "outputFile": "Components/Pages/ConfList.razor.css", + "inputFile": "Components/Pages/ConfList.razor.less" + }, + { + "outputFile": "Components/Pages/ConfListNew.razor.css", + "inputFile": "Components/Pages/ConfListNew.razor.less" } ] \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 4771a40f..54591914 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2605.2109

+

Versione: 1.1.2605.2814


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index f9515b87..6ac710cb 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2605.2109 +1.1.2605.2814 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 8269b73c..e2720ca1 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2605.2109 + 1.1.2605.2814 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false