diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 69cc151d..6345f712 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2605.1109 + 1.1.2605.1111 diff --git a/Lux.UI/Components/Compo/Item/ItemMan.razor b/Lux.UI/Components/Compo/Item/ItemMan.razor index 6f5d3fe1..254fcc4f 100644 --- a/Lux.UI/Components/Compo/Item/ItemMan.razor +++ b/Lux.UI/Components/Compo/Item/ItemMan.razor @@ -36,7 +36,7 @@ else @* *@ - + @item.ItemID diff --git a/Lux.UI/Components/Compo/Item/ItemMan.razor.cs b/Lux.UI/Components/Compo/Item/ItemMan.razor.cs index db2b047c..ae0ece35 100644 --- a/Lux.UI/Components/Compo/Item/ItemMan.razor.cs +++ b/Lux.UI/Components/Compo/Item/ItemMan.razor.cs @@ -41,19 +41,17 @@ namespace Lux.UI.Components.Compo.Item private bool isLoading = false; private List ListRecords = new List(); + private string mMessage = ""; + private BootstrapModal.ModalMode mMode = BootstrapModal.ModalMode.ND; + private BootstrapModal Modal = new(); + private Dictionary modalOpt = new Dictionary(); + private string mTitle = ""; private int numRecord = 10; private ItemModel? selRecord = null; private int totalCount = 0; - private BootstrapModal Modal = new(); - private string mTitle = ""; - private string mMessage = ""; - private BootstrapModal.ModalMode mMode = BootstrapModal.ModalMode.ND; - - private Dictionary modalOpt = new Dictionary(); - #endregion Private Fields #region Private Properties @@ -71,11 +69,16 @@ namespace Lux.UI.Components.Compo.Item #region Private Methods + private string cloneBtnCss(ItemModel item) + { + return item.ItemType == Enums.ItemClassType.Bom ? "btn-warning" : "btn-success"; + } + /// /// Clona articolo /// /// - private void DoClone(ItemModel curRec) + private Task DoClone(ItemModel curRec) { editRecord = new ItemModel() { @@ -93,11 +96,8 @@ namespace Lux.UI.Components.Compo.Item QtyMax = curRec.QtyMax, UM = curRec.UM }; - } - private string doCloneCss(ItemModel item) - { - return item.ItemType == Enums.ItemClassType.Bom ? "btn-warning" : "btn-success"; + return EC_EditReq.InvokeAsync(editRecord); } /// @@ -108,7 +108,7 @@ namespace Lux.UI.Components.Compo.Item { mTitle = "Attenzione"; mMessage = "Sicuro di voler eliminare il record?\n" + - $"Dettagli: { selRec.ItemID} | { selRec.CodGroup} | { selRec.ItemType} | { selRec.ExtItemCode}"; + $"Dettagli: {selRec.ItemID} | {selRec.CodGroup} | {selRec.ItemType} | {selRec.ExtItemCode}"; mMode = BootstrapModal.ModalMode.Confirm; modalOpt = new(); modalOpt.Add(true, "Si"); @@ -144,16 +144,6 @@ namespace Lux.UI.Components.Compo.Item return EC_EditReq.InvokeAsync(editRecord); } -#if false - private async Task DoSave(ItemModel currRec) - { - // salvo - await DLService.ItemUpsertAsync(currRec); - await ResetEdit(); - UpdateTable(); - } -#endif - /// /// Selezione articolo x display info /// diff --git a/Lux.UI/Components/Compo/Templates/TemplateList.razor b/Lux.UI/Components/Compo/Templates/TemplateList.razor index afdb48ec..2979a643 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateList.razor +++ b/Lux.UI/Components/Compo/Templates/TemplateList.razor @@ -66,7 +66,14 @@ else @item.NumItems } - + @if (item.TemplateRowNav.Any()) + { + + } + else + { + + } } diff --git a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs index b9bba254..d8be3abd 100644 --- a/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs +++ b/Lux.UI/Components/Compo/Templates/TemplateRowList.razor.cs @@ -74,7 +74,7 @@ namespace Lux.UI.Components.Compo.Templates { ConfInit(); prevJwd = ""; - + await ReloadBaseList(); DLService.PipeUpdate.EA_NewMessage += PipeUpdate_EA_NewMessage; DLService.PipePng.EA_NewMessage += PipePng_EA_NewMessage; @@ -553,7 +553,7 @@ namespace Lux.UI.Components.Compo.Templates private async Task DoDelete(TemplateRowModel curRec) { mTitle = "Attenzione"; - mMessage = $"Confermi di voler eliminare il template selezionato?\n" + + mMessage = $"Confermi di voler eliminare il template selezionato?\n" + $"Env: {curRec.Envir} | {curRec.Name}"; mMode = BootstrapModal.ModalMode.Confirm; modalOpt = new(); @@ -561,6 +561,7 @@ namespace Lux.UI.Components.Compo.Templates modalOpt.Add(false, "No"); if (!await Modal!.ShowAsync()) return; + await TRService.DeleteAsync(curRec); // elimino cache img await ICService.DeleteSvgAsync(curRec.TemplateRowUID, curRec.Envir); diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index ac4dab92..8c408490 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.1109 + 1.1.2605.1111 diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index a46ce24d..7f5252cd 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2605.1109

+

Versione: 1.1.2605.1111


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 8bebe55a..27a60131 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2605.1109 +1.1.2605.1111 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index d2d32fc2..93b045e7 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2605.1109 + 1.1.2605.1111 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false