diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj index 84ebbf6d..cf161881 100644 --- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj +++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj @@ -21,7 +21,7 @@ - + diff --git a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj index 566d3fca..74a1610f 100644 --- a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj +++ b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj @@ -27,7 +27,7 @@ - + diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index c107a028..17c6e625 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2510.1612 + 0.9.2510.1712 diff --git a/Lux.UI.Client/Lux.UI.Client.csproj b/Lux.UI.Client/Lux.UI.Client.csproj index 8a860940..5a9cb290 100644 --- a/Lux.UI.Client/Lux.UI.Client.csproj +++ b/Lux.UI.Client/Lux.UI.Client.csproj @@ -9,7 +9,7 @@ - + diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor index d57b3b82..ce2be7ca 100644 --- a/Lux.UI/Components/Compo/OfferRowMan.razor +++ b/Lux.UI/Components/Compo/OfferRowMan.razor @@ -1,8 +1,5 @@ @if (EditRecord != null) { -

EDITING

-

@EditRecord.OfferRowUID

-
Dettaglio Offerta
+
+ +
diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor.cs b/Lux.UI/Components/Compo/OfferRowMan.razor.cs index 188cfd6e..57e538c3 100644 --- a/Lux.UI/Components/Compo/OfferRowMan.razor.cs +++ b/Lux.UI/Components/Compo/OfferRowMan.razor.cs @@ -12,6 +12,8 @@ using Microsoft.AspNetCore.Components.Forms; using Microsoft.EntityFrameworkCore.Storage.Json; using Microsoft.JSInterop; using NLog.LayoutRenderers; +using System.Text; +using WebWindowComplex; using WebWindowComplex.DTO; using static EgwCoreLib.Lux.Core.Enums; @@ -28,7 +30,15 @@ namespace Lux.UI.Components.Compo public EventCallback EC_Updated { get; set; } [Parameter] - public int OfferID { get; set; } = 0; + public OfferModel CurrRecord { get; set; } = null!; + + /// + /// ID Offerta corrente + /// + protected int OfferID + { + get => CurrRecord.OfferID; + } #endregion Public Properties @@ -287,6 +297,49 @@ namespace Lux.UI.Components.Compo #endif } + /// + /// Forza parametri general selezionati nell'offerta + /// + /// + protected async Task OfferForceParameters() + { + if (!await JSRuntime.InvokeAsync("confirm", $"Confermi di voler impostare i parametri selezionati per l'offerta?")) + return; + // recupero obj dizionario x i parametri compresi... + ParamDict CurrSel = new ParamDict(CurrRecord.DictPresel); + // metto a waiting tutte le righe con bom... + var listCalc = SorListCalc(); + foreach (var item in listCalc) + { + await DLService.OffertUpdateAwaitState(item.OfferRowID, true, true); + // poiché non è gestito evento ritorno update window interno si "scassa" --> try catch/ if FALSE + try + { + string rColor = CurrSel.GetVal("Color"); + string rGlass = CurrSel.GetVal("Glass"); + string rProfile = CurrSel.GetVal("Profile"); + string rWood = CurrSel.GetVal("Wood"); + var newSerStruct = SerialMan.MassUpdate((string)item.SerStruct, null, null, rColor, rWood, rGlass, rProfile); + await DLService.OffertRowUpdateSerStruct(item.OfferRowID, newSerStruct); + } + catch + { } + } + await InvokeAsync(StateHasChanged); + + // verifica preliminare UID + await DLService.OffertRowFixUid(OfferID); + + + // ricalcolo di tutte le BOM e relativi prezzi... + foreach (var item in listCalc) + { + // chiedo BOM e immagine + await reqBomUpdate(item); + } + + //await DoRecalcOffer(); + } /// /// Verifica e ricalcolo dei prezzi degli items nell'offerta diff --git a/Lux.UI/Components/Pages/Offers.razor b/Lux.UI/Components/Pages/Offers.razor index 52d19dcf..7ad30811 100644 --- a/Lux.UI/Components/Pages/Offers.razor +++ b/Lux.UI/Components/Pages/Offers.razor @@ -63,7 +63,7 @@ } else if (currStep == CompileStep.Rows) { - + } else if (currStep == CompileStep.Delivery) { diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index a0df7a0c..97f4a464 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 - 0.9.2510.1612 + 0.9.2510.1712 @@ -17,7 +17,7 @@ - + diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index c748bd21..b22cc44c 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 0.9.2510.1612

+

Versione: 0.9.2510.1712


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 8d42ab10..6df805fa 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2510.1612 +0.9.2510.1712 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 468ec299..c0288296 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2510.1612 + 0.9.2510.1712 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false