diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 5e47db7e..b7e17c59 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2605.2911 + 1.1.2605.2913 diff --git a/Lux.UI/Components/Layout/NavMenu.razor.cs b/Lux.UI/Components/Layout/NavMenu.razor.cs index 5f610cb6..2b91ba2e 100644 --- a/Lux.UI/Components/Layout/NavMenu.razor.cs +++ b/Lux.UI/Components/Layout/NavMenu.razor.cs @@ -87,7 +87,7 @@ namespace Lux.UI.Components.Layout // Inserimento nomi segnaposto nav-item NameDict.Add("Articoli", new List() { "Articoli", "Buy", "Sell" }); NameDict.Add("Ciclo prod", new List() { "Ciclo prod", "Risorse", "Cicli" }); - NameDict.Add("Contatti", new List() { "Contatti", "Clienti", "Fornitori" }); + NameDict.Add("Contatti", new List() { "Contatti", "Clienti", "Venditori" }); // Inserimento icone IconDict.Add("Articoli", new List() { "fa-book-open", "fa-book", "fa-book-bookmark" }); diff --git a/Lux.UI/Components/Pages/ConfListNew.razor b/Lux.UI/Components/Pages/ConfListNew.razor index f97399da..8ed9d2c7 100644 --- a/Lux.UI/Components/Pages/ConfListNew.razor +++ b/Lux.UI/Components/Pages/ConfListNew.razor @@ -1,6 +1,60 @@ @page "/ConfListNew" -
+
+
+ Configurazioni + +
+
+ +
+ @if (isLoading) + { + + } + else + { +
+
+
+ + + + +
+
+ @if (showConf == 0) + { +
+ +
+ } + else if (showConf == 1) + { +
+ +
+ } + else if (showConf == 2) + { +
+ +
+ } + else if (showConf == 3) + { +
+ +
+ } +
+ } +
+ + + + +@*
@@ -51,6 +105,6 @@
}
-
+
*@ diff --git a/Lux.UI/Components/Pages/ConfListNew.razor.css b/Lux.UI/Components/Pages/ConfListNew.razor.css index cecf7494..0ef27983 100644 --- a/Lux.UI/Components/Pages/ConfListNew.razor.css +++ b/Lux.UI/Components/Pages/ConfListNew.razor.css @@ -10,19 +10,18 @@ border-radius: 8px; transition: all 0.2s ease-in-out; width: 100%; - /* Lo fa occupare tutta la larghezza della colonna */ + transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out; } /* Effetto quando passi il mouse sopra */ .btn-menu:hover { background-color: #2690c9; color: #000; + transform: scale(1.05); + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3); } /* 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 index dfbb9258..6984752d 100644 --- a/Lux.UI/Components/Pages/ConfListNew.razor.less +++ b/Lux.UI/Components/Pages/ConfListNew.razor.less @@ -9,13 +9,16 @@ color: white !important; border-radius: 8px; transition: all 0.2s ease-in-out; - width: 100%; /* Lo fa occupare tutta la larghezza della colonna */ + width: 100%; + transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out; } /* Effetto quando passi il mouse sopra */ .btn-menu:hover { background-color: #2690c9; color: #000; + transform: scale(1.05); + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3); } /* Effetto quando il bottone è selezionato */ @@ -23,8 +26,4 @@ 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 index 48962b8f..a700dc19 100644 --- a/Lux.UI/Components/Pages/ConfListNew.razor.min.css +++ b/Lux.UI/Components/Pages/ConfListNew.razor.min.css @@ -1 +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 +.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%;transition:transform .2s ease-in-out,box-shadow .2s ease-in-out;}.btn-menu:hover{background-color:#2690c9;color:#000;transform:scale(1.05);box-shadow:0 5px 15px rgba(0,0,0,.3);}.btn-menu.active{background-color:#57b6eb;color:#fff!important;font-weight:bold;} \ No newline at end of file diff --git a/Lux.UI/Components/Pages/Home.razor b/Lux.UI/Components/Pages/Home.razor index 71335ee7..cf7a46e0 100644 --- a/Lux.UI/Components/Pages/Home.razor +++ b/Lux.UI/Components/Pages/Home.razor @@ -16,6 +16,7 @@
  • Offerte e ricalcoli
  • Configuratore
  • Ordini
  • +
  • Stampe
  • @@ -25,7 +26,6 @@
  • Cicli
  • Sistema Costing
  • Pianificazione Produzione
  • -
  • Stampe
  • diff --git a/Lux.UI/Components/Pages/Orders.razor.cs b/Lux.UI/Components/Pages/Orders.razor.cs index bfa509ec..84d63580 100644 --- a/Lux.UI/Components/Pages/Orders.razor.cs +++ b/Lux.UI/Components/Pages/Orders.razor.cs @@ -577,6 +577,7 @@ namespace Lux.UI.Components.Pages private void SaveNumRec(int newNum) { numRecord = newNum; + currPage = 1; UpdateTable(); } diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index aae753eb..993d0f6e 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.2911 + 1.1.2605.2913 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 5698e62a..135c8394 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

    Versione: 1.1.2605.2911

    +

    Versione: 1.1.2605.2913


    Note di rilascio:
    • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index e29ee419..c4d0e3ab 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2605.2911 +1.1.2605.2913 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index aac2237c..3dec2f56 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2605.2911 + 1.1.2605.2913 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false