diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 91c90656..df6d3f93 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2606.0917 + 1.1.2606.1010 diff --git a/Lux.UI/Components/Compo/Common/PrintModal.razor b/Lux.UI/Components/Compo/Common/PrintModal.razor index a616bcfd..e3af7b46 100644 --- a/Lux.UI/Components/Compo/Common/PrintModal.razor +++ b/Lux.UI/Components/Compo/Common/PrintModal.razor @@ -35,8 +35,8 @@ @if (!string.IsNullOrEmpty(SelectCodGroup)) {
-
- + diff --git a/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor b/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor index 5f987aa0..0f244424 100644 --- a/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor +++ b/Lux.UI/Components/Compo/JobTask/JobTaskListMan.razor @@ -39,92 +39,86 @@
} -
-
- @Traduci("cicli_elencoCicliAtt") -
-
- @if (isLoading || ListRecords == null) - { - - } - else if (totalCount == 0) - { -
@Traduci("noRecord")
- } - else - { - - - - - @if (selRecord == null) - { - - - - - - - } - else - { - - } - - - - @foreach (var item in ListRecords) + +@if (isLoading || ListRecords == null) +{ + +} +else if (totalCount == 0) +{ +
@Traduci("noRecord")
+} +else +{ +
- - @Traduci("ord")@Traduci("descrizione")@Traduci("cicli_fasi")@Traduci("cicli_tags")@Traduci("cicli_drivers") - - @Traduci("descrizione")
+ + + + @if (selRecord == null) + { + + + + + + + } + else + { + + } + + + + @foreach (var item in ListRecords) + { + string cssBtnUp = editRecord == null && item.Index > 1 ? "btn-outline-primary" : "btn-outline-secondary opacity-50 disabled"; + string cssBtnDown = editRecord == null && item.Index < totalCount ? "btn-outline-primary" : "btn-outline-secondary opacity-50 disabled"; + + + + @if (selRecord == null) { - string cssBtnUp = editRecord == null && item.Index > 1 ? "btn-outline-primary" : "btn-outline-secondary opacity-50 disabled"; - string cssBtnDown = editRecord == null && item.Index < totalCount ? "btn-outline-primary" : "btn-outline-secondary opacity-50 disabled"; + - - @if (selRecord == null) + + @item.Index + + + + + + + - - - - - + } else { - + } - + } - -
+ + @Traduci("ord")@Traduci("descrizione")@Traduci("cicli_fasi")@Traduci("cicli_tags")@Traduci("cicli_drivers") + + @Traduci("descrizione")
+ + + -
- - - @item.Description@item.NumChild + + + + + @if (item.Lock || item.NumChild > 0) { - - - - @item.Index - - @item.Description@item.NumChild - - - - - @if (item.Lock || item.NumChild > 0) - { - - } - else - { - - } - @item.Description
- } -
-
+ else + { + @item.Description + } + + } + + +} \ No newline at end of file diff --git a/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor b/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor index 204ddd99..c5b53943 100644 --- a/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor +++ b/Lux.UI/Components/Compo/JobTask/ResourcesMan.razor @@ -15,7 +15,7 @@ else - @@ -30,7 +30,7 @@ else @foreach (var item in ListRecords) { - diff --git a/Lux.UI/Components/Compo/Stats/OfferStats.razor b/Lux.UI/Components/Compo/Stats/OfferStats.razor index e5196949..4b107ab8 100644 --- a/Lux.UI/Components/Compo/Stats/OfferStats.razor +++ b/Lux.UI/Components/Compo/Stats/OfferStats.razor @@ -1,5 +1,5 @@  -
+
@@ -24,7 +24,7 @@
-
+
diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor b/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor index 9300869f..5cf13fc2 100644 --- a/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor +++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderList.razor @@ -1,29 +1,23 @@ @inherits BaseComp -
-
-
-
- @Traduci("fabbisogno_fornitoreOrd") -
-
-
-
-
- - -
-
-
+
+
+
+ @Traduci("fabbisogno_fornitoreOrd") +
+
+
+ @Traduci("stato") +
-
+
@foreach (var item in ListRecords) { diff --git a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor index 4e55d215..850016e6 100644 --- a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor +++ b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor @@ -1,23 +1,23 @@ @inherits BaseComp
-
-
-
-
- @Traduci("fabbisogno_genOrd") -
+
+
+
+ @Traduci("fabbisogno_genOrd")
-
-
+
+
@foreach (var item in CurrSelDict) { if (item.Value.Any()) { - } } diff --git a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.css b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.css new file mode 100644 index 00000000..33057fc8 --- /dev/null +++ b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.css @@ -0,0 +1,21 @@ +/* Questo trasforma il bottone in un elemento di un menu */ +.btn-genOrd { + background: none; + border: none; + text-align: left; + padding: 10px 20px; + font-size: 1.1rem; + background-color: #82bbf5; + color: black !important; + border-radius: 8px; + transition: all 0.2s ease-in-out; + width: 100%; + transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out; +} +/* Effetto quando passi il mouse sopra */ +.btn-genOrd:hover { + background-color: #6baef2; + color: black !important; + /*transform: scale(1.02);*/ + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3); +} \ No newline at end of file diff --git a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.less b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.less new file mode 100644 index 00000000..910a784e --- /dev/null +++ b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.less @@ -0,0 +1,23 @@ +/* Questo trasforma il bottone in un elemento di un menu */ +.btn-genOrd { + background: none; + border: none; + text-align: left; + padding: 10px 20px; + font-size: 1.1rem; + background-color: #82bbf5; + color: black !important; + border-radius: 8px; + transition: all 0.2s ease-in-out; + width: 100%; + transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out; +} + +/* Effetto quando passi il mouse sopra */ +.btn-genOrd:hover { + background-color: #6baef2; + color: black !important; + /*transform: scale(1.02);*/ + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3); +} + diff --git a/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.min.css b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.min.css new file mode 100644 index 00000000..c2a6756f --- /dev/null +++ b/Lux.UI/Components/Compo/Warehouse/MatReq2BuyOrder.razor.min.css @@ -0,0 +1 @@ +.btn-genOrd{background:none;border:0;text-align:left;padding:10px 20px;font-size:1.1rem;background-color:#82bbf5;color:#000!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-genOrd:hover{background-color:#6baef2;color:#000!important;box-shadow:0 2px 8px rgba(0,0,0,.3);} \ No newline at end of file diff --git a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor index c8a74d9e..3cf856ac 100644 --- a/Lux.UI/Components/Compo/Warehouse/MatReqList.razor +++ b/Lux.UI/Components/Compo/Warehouse/MatReqList.razor @@ -1,37 +1,34 @@ @inherits BaseComp -
-
-
-
- @Traduci("fabbisogno_fabbisogni") +
+
+
+ @Traduci("fabbisogno_fabbisogni") +
+
+
+
+
+ Ord + +
-
-
-
-
- Ord - -
-
-
-
- - - -
-
+
+
+ + +
-
+
@foreach (var item in GroupDict) { diff --git a/Lux.UI/Components/Layout/MainLayout.razor b/Lux.UI/Components/Layout/MainLayout.razor index cf837f44..60fec5e4 100644 --- a/Lux.UI/Components/Layout/MainLayout.razor +++ b/Lux.UI/Components/Layout/MainLayout.razor @@ -10,7 +10,7 @@
-
+
@Body
diff --git a/Lux.UI/Components/Pages/Customer.razor b/Lux.UI/Components/Pages/Customer.razor index b83c4dbe..7a2aee1b 100644 --- a/Lux.UI/Components/Pages/Customer.razor +++ b/Lux.UI/Components/Pages/Customer.razor @@ -13,7 +13,7 @@
-
+
@if (isLoading) { diff --git a/Lux.UI/Components/Pages/Dealer.razor b/Lux.UI/Components/Pages/Dealer.razor index f8c2da80..b5de721d 100644 --- a/Lux.UI/Components/Pages/Dealer.razor +++ b/Lux.UI/Components/Pages/Dealer.razor @@ -12,7 +12,7 @@
-
+
@if (isLoading) { diff --git a/Lux.UI/Components/Pages/GenList.razor b/Lux.UI/Components/Pages/GenList.razor index 1b5473a8..c6e5e8b5 100644 --- a/Lux.UI/Components/Pages/GenList.razor +++ b/Lux.UI/Components/Pages/GenList.razor @@ -1,24 +1,17 @@ @page "/GenList" @inherits BaseComp -
-
-
-
- Anagrafiche Generiche -
-
-
-
- - - -
-
+
+
+
+
+ + +
-
+
@if (isLoading) { diff --git a/Lux.UI/Components/Pages/GenList.razor.cs b/Lux.UI/Components/Pages/GenList.razor.cs index 92f16432..b46016dc 100644 --- a/Lux.UI/Components/Pages/GenList.razor.cs +++ b/Lux.UI/Components/Pages/GenList.razor.cs @@ -39,6 +39,10 @@ namespace Lux.UI.Components.Pages isLoading = false; } } + private string btnResetCss + { + get => string.IsNullOrEmpty(CurrFilt.SearchVal) ? "btn-outline-secondary" : "btn-primary"; + } private string SelCodGroup { @@ -79,7 +83,7 @@ namespace Lux.UI.Components.Pages { SelCodGroup = codGroup; } - + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Pages/Items.razor b/Lux.UI/Components/Pages/Items.razor index 1e598151..13dd8dfb 100644 --- a/Lux.UI/Components/Pages/Items.razor +++ b/Lux.UI/Components/Pages/Items.razor @@ -5,7 +5,7 @@
-
+
@if (isLoading) { diff --git a/Lux.UI/Components/Pages/JobRoute.razor b/Lux.UI/Components/Pages/JobRoute.razor index d4ee938a..d46919b3 100644 --- a/Lux.UI/Components/Pages/JobRoute.razor +++ b/Lux.UI/Components/Pages/JobRoute.razor @@ -1,24 +1,17 @@ @page "/JobRoute" @inherits BaseComp -
-
-
-
- @Traduci("cicli_cicliLavoro") -
-
-
-
- - - -
-
+
+
+
+
+ + +
-
+
@if (isLoading) { @@ -27,6 +20,7 @@ else {
+
@Traduci("cicli_elencoCicliAtt")
@if (selRecord != null) diff --git a/Lux.UI/Components/Pages/JobRoute.razor.cs b/Lux.UI/Components/Pages/JobRoute.razor.cs index c0a3d64e..a61a5bbe 100644 --- a/Lux.UI/Components/Pages/JobRoute.razor.cs +++ b/Lux.UI/Components/Pages/JobRoute.razor.cs @@ -123,6 +123,23 @@ namespace Lux.UI.Components.Pages } } + private string SearchVal + { + get => searchVal; + set + { + if (searchVal != value) + { + searchVal = value; + } + } + } + + private string btnResetCss + { + get => string.IsNullOrEmpty(searchVal) ? "btn-outline-secondary" : "btn-primary"; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Pages/OffStats.razor b/Lux.UI/Components/Pages/OffStats.razor index 81ccc5a9..87f4a9aa 100644 --- a/Lux.UI/Components/Pages/OffStats.razor +++ b/Lux.UI/Components/Pages/OffStats.razor @@ -1,35 +1,37 @@ @page "/OffStats" +@inherits BaseComp -
- - Offerte - -
-
- Da: - +
+
+ + + @Traduci("navMan_offerte") + +
+
+ Da: + - A: - + A: + - + +
-
-
- +
+ +
diff --git a/Lux.UI/Components/Pages/Offers.razor b/Lux.UI/Components/Pages/Offers.razor index 4a8c651c..33bd04fa 100644 --- a/Lux.UI/Components/Pages/Offers.razor +++ b/Lux.UI/Components/Pages/Offers.razor @@ -100,7 +100,7 @@ else @Traduci("offerta_stats")
-
+
@@ -125,23 +125,23 @@ else
- @if (isLoading) - { -
- -
- } - else if (totalCount == 0) - { -
-
@Traduci("noRecord")
-
- } - else - { -
-
-
+
+ @if (isLoading) + { +
+ +
+ } + else if (totalCount == 0) + { +
+
@Traduci("noRecord")
+
+ } + else + { +
+
+ @Traduci("cod")
+ @item.CodResource
@@ -247,8 +247,8 @@ else @if (SelRecord == null) { - } @@ -268,16 +268,15 @@ else }
+ @if (SelRecord != null) + { +
+ +
+ } - @if (SelRecord != null) - { -
- -
- } - - } - + } + } diff --git a/Lux.UI/Components/Pages/Orders.razor b/Lux.UI/Components/Pages/Orders.razor index 24119067..46363757 100644 --- a/Lux.UI/Components/Pages/Orders.razor +++ b/Lux.UI/Components/Pages/Orders.razor @@ -154,9 +154,9 @@ else }
-
-
-
+
+
+
-
+
+
@Traduci("risorsa_configAttive")
diff --git a/Lux.UI/Components/Pages/SellItems.razor b/Lux.UI/Components/Pages/SellItems.razor index 9e9eff29..c258bace 100644 --- a/Lux.UI/Components/Pages/SellItems.razor +++ b/Lux.UI/Components/Pages/SellItems.razor @@ -5,7 +5,7 @@
-
+
@if (isLoading) { diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index a0c5124a..b344d429 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.2606.0917 + 1.1.2606.1010 diff --git a/Lux.UI/compilerconfig.json b/Lux.UI/compilerconfig.json index 1e49e7c3..75a928ee 100644 --- a/Lux.UI/compilerconfig.json +++ b/Lux.UI/compilerconfig.json @@ -22,5 +22,9 @@ { "outputFile": "Components/Pages/ConfListNew.razor.css", "inputFile": "Components/Pages/ConfListNew.razor.less" + }, + { + "outputFile": "Components/Compo/Warehouse/MatReq2BuyOrder.razor.css", + "inputFile": "Components/Compo/Warehouse/MatReq2BuyOrder.razor.less" } ] \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 2ed699bb..88d0ae36 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2606.0917

+

Versione: 1.1.2606.1010


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 9b1c616f..20f43f79 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2606.0917 +1.1.2606.1010 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index e3653014..bd39663b 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2606.0917 + 1.1.2606.1010 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false