From ef7e3552cd7ad2040f9a3d8358e808f559705a04 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Tue, 9 Jun 2026 09:41:47 +0200 Subject: [PATCH] Modificata interfaccia pagina offerta --- Lux.API/Lux.API.csproj | 2 +- .../Compo/Offer/OfferCommonPar.razor | 10 +- .../Compo/Offer/OfferDelivery.razor | 14 +- Lux.UI/Components/Compo/Offer/OfferMan.razor | 13 +- Lux.UI/Components/Pages/Customer.razor | 4 +- Lux.UI/Components/Pages/Offers.razor | 436 +++++++++--------- Lux.UI/Components/Pages/Offers.razor.cs | 26 +- .../Components/Pages/WorkLoadBalance.razor.cs | 15 +- Lux.UI/Lux.UI.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 12 files changed, 274 insertions(+), 254 deletions(-) diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index bf2f55de..4c18dc19 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2606.0818 + 1.1.2606.0909 diff --git a/Lux.UI/Components/Compo/Offer/OfferCommonPar.razor b/Lux.UI/Components/Compo/Offer/OfferCommonPar.razor index ab47f2c2..4faf4576 100644 --- a/Lux.UI/Components/Compo/Offer/OfferCommonPar.razor +++ b/Lux.UI/Components/Compo/Offer/OfferCommonPar.razor @@ -85,13 +85,13 @@ @if (HasChanged() || ForceMode) { -
+
-
- +
+
-
- +
+
} } diff --git a/Lux.UI/Components/Compo/Offer/OfferDelivery.razor b/Lux.UI/Components/Compo/Offer/OfferDelivery.razor index 4a62c03b..dd9f2171 100644 --- a/Lux.UI/Components/Compo/Offer/OfferDelivery.razor +++ b/Lux.UI/Components/Compo/Offer/OfferDelivery.razor @@ -1,4 +1,6 @@ -
+@inherits BaseComp + +
@if (isLoading) { @@ -24,13 +26,13 @@
@if (HasChanged()) { -
+
-
- +
+
-
- +
+
} } diff --git a/Lux.UI/Components/Compo/Offer/OfferMan.razor b/Lux.UI/Components/Compo/Offer/OfferMan.razor index fbdb3685..9d4c6953 100644 --- a/Lux.UI/Components/Compo/Offer/OfferMan.razor +++ b/Lux.UI/Components/Compo/Offer/OfferMan.razor @@ -1,5 +1,4 @@ -@using EgwCoreLib.Lux.Core -@inherits BaseComp +@inherits BaseComp
@@ -63,13 +62,13 @@
@if (HasChanged() && IsValid()) { -
+
-
- +
+
-
- +
+
}
\ No newline at end of file diff --git a/Lux.UI/Components/Pages/Customer.razor b/Lux.UI/Components/Pages/Customer.razor index fef5467f..62206176 100644 --- a/Lux.UI/Components/Pages/Customer.razor +++ b/Lux.UI/Components/Pages/Customer.razor @@ -4,10 +4,10 @@
- -
+
diff --git a/Lux.UI/Components/Pages/Offers.razor b/Lux.UI/Components/Pages/Offers.razor index 208a1be5..f16dab8f 100644 --- a/Lux.UI/Components/Pages/Offers.razor +++ b/Lux.UI/Components/Pages/Offers.razor @@ -3,53 +3,43 @@ @if (EditRecord != null) { -
-
-
-
-
- @EditRecord.OfferCode -
-
-
-
-
- - - -
-
- - - -
-
- - - -
-
- - - -
- @*
- - - -
*@ - -
-
-
-
- -
-
+
+
+
+ @EditRecord.OfferCode
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ @*
+ + + +
*@ +
+
-
+ +
@if (currStep == Enums.CompileStep.Header) { @@ -99,192 +89,188 @@ else
} -
-
-
-
- @Traduci("navMan_offerte") - - - - @Traduci("offerta_stats") - -
-
-
-
-
- - - - - -
-
-
- -
-
-
+
+
+
+ + + + @Traduci("offerta_stats") +
-
-
- @if (isLoading) - { - - } - else if (totalCount == 0) - { -
@Traduci("noRecord")
- } - else - { -
-
- - - - - @if (SelRecord == null) - { - - } - - @if (SelRecord == null) - { - - } - - - - @if (SelRecord == null) - { - - - - - } - - @if (SelRecord == null) - { - - } - - - - - @foreach (var item in ListRecords) - { - - - @if (SelRecord == null) - { - - } - - @if (SelRecord == null) - { - - } - - - - @if (SelRecord == null) - { - - - - - } - @if (SelRecord == null) - { - - } - - - } - - @if (totalCount > numRecord) - { - - - - - - } -
- - @Traduci("id")@Traduci("data")@Traduci("stato")@Traduci("codice")@Traduci("venditore")@Traduci("cliente")@Traduci("descrizione")@Traduci("importo")@Traduci("margine")
- - - - @item.OfferID -
@($"{item.Inserted:yyyy-MM-dd}")
-
@($"{item.ValidUntil:yyyy-MM-dd}")
- 		- - - @item.OfferCode -
@item.Envir
- 		- @if (item.DealerNav != null) - { -
@item.DealerNav.FirstName @item.DealerNav.LastName
-
@item.DealerNav.VAT
- } - 		- @if (item.CustomerNav != null) - { -
@item.CustomerNav.FirstName @item.CustomerNav.LastName
-
@item.CustomerNav.VAT
- } - 		@item.Description - @item.NumRows - - @item.NumItems - - @item.NumProdItems - -
@item.TotalPrice.ToString("C2")
-
(@item.TotalCost.ToString("C2"))
- 		- @item.MaxDiscount.ToString("P2") - -
- - - - @if (SelRecord == null) - { - - } -
-
- -
- -
- @if (SelRecord != null) +
+
+ + +
+
+ + + +
+
+
+ @if (isLoading) + { + + } + else if (totalCount == 0) + { +
@Traduci("noRecord")
+ } + else + { +
+
+ + + + + @if (SelRecord == null) + { + + } + + @if (SelRecord == null) + { + + } + + + + @if (SelRecord == null) + { + + + + + } + + @if (SelRecord == null) + { + + } + + + + + @foreach (var item in ListRecords) + { + + + @if (SelRecord == null) + { + + } + + @if (SelRecord == null) + { + + } + + + + @if (SelRecord == null) + { + + + + + } + @if (SelRecord == null) + { + + } + + + } + + @if (totalCount > numRecord) + { + + + + + + } +
+ + @Traduci("id")@Traduci("data")@Traduci("stato")@Traduci("codice")@Traduci("venditore")@Traduci("cliente")@Traduci("descrizione")@Traduci("importo")@Traduci("margine")
+ + + + @item.OfferID +
@($"{item.Inserted:yyyy-MM-dd}")
+
@($"{item.ValidUntil:yyyy-MM-dd}")
+ 		+ + + @item.OfferCode +
@item.Envir
+ 		+ @if (item.DealerNav != null) + { +
@item.DealerNav.FirstName @item.DealerNav.LastName
+
@item.DealerNav.VAT
+ } + 		+ @if (item.CustomerNav != null) + { +
@item.CustomerNav.FirstName @item.CustomerNav.LastName
+
@item.CustomerNav.VAT
+ } + 		@item.Description + @item.NumRows + + @item.NumItems + + @item.NumProdItems + +
@item.TotalPrice.ToString("C2")
+
(@item.TotalCost.ToString("C2"))
+ 		+ @item.MaxDiscount.ToString("P2") + +
+ + + + @if (SelRecord == null) + { + + } +
+
+ +
+ +
+ @if (SelRecord != null) + { +
+ +
+ } +
+ } +
+
} + @if (selectOptPrint) { diff --git a/Lux.UI/Components/Pages/Offers.razor.cs b/Lux.UI/Components/Pages/Offers.razor.cs index e1761c61..e2a4bcd4 100644 --- a/Lux.UI/Components/Pages/Offers.razor.cs +++ b/Lux.UI/Components/Pages/Offers.razor.cs @@ -91,7 +91,7 @@ namespace Lux.UI.Components.Pages private List ListRecords = new List(); - private List ListtChanges = new(); + private List ListChanges = new(); private int numRecord = 10; /// @@ -632,6 +632,30 @@ namespace Lux.UI.Components.Pages return ans; } + private string btnResetCss + { + get => string.IsNullOrEmpty(searchVal) ? "btn-outline-secondary" : "btn-primary"; + } + + private void ResetSearch() + { + SearchVal = ""; + } + + private string SearchVal + { + get => searchVal; + set + { + if (searchVal != value) + { + searchVal = value; + DoFilter(); + UpdateTable(); + } + } + } + #endregion Private Methods } } \ No newline at end of file diff --git a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs index ca801209..dec2b34e 100644 --- a/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs +++ b/Lux.UI/Components/Pages/WorkLoadBalance.razor.cs @@ -607,9 +607,18 @@ namespace Lux.UI.Components.Pages private void DoFilter() { - ListEstimRecords = ListEstimRecordsAll.Where(x => FiltEnvir == null || x.Envir == FiltEnvir).ToList(); - ListBalancedRecords = ListBalancedRecordsAll.Where(x => FiltEnvir == null || x.OrderRowNav.Envir == FiltEnvir).ToList(); - ListOdl = ListOdlAll.Where(x => FiltEnvir == null || x.Envir == FiltEnvir).ToList(); + if (ListEstimRecordsAll != null && ListEstimRecordsAll.Count > 0) + { + ListEstimRecords = ListEstimRecordsAll.Where(x => FiltEnvir == null || x.Envir == FiltEnvir).ToList(); + } + if (ListBalancedRecordsAll != null && ListBalancedRecordsAll.Count > 0) + { + ListBalancedRecords = ListBalancedRecordsAll.Where(x => FiltEnvir == null || x.OrderRowNav.Envir == FiltEnvir).ToList(); + } + if (ListOdlAll != null && ListOdlAll.Count > 0) + { + ListOdl = ListOdlAll.Where(x => FiltEnvir == null || x.Envir == FiltEnvir).ToList(); + } // if (ListEstimRecordsAll != null && ListEstimRecordsAll.Count > 0) // { diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 6fa920c8..b5534f82 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.0818 + 1.1.2606.0909 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 93ffcd54..c72ce715 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2606.0818

+

Versione: 1.1.2606.0909


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 254a0c86..7e5c6a81 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2606.0818 +1.1.2606.0909 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index d552c47c..302dc6d9 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2606.0818 + 1.1.2606.0909 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false