From 27522184e359d216fefc721450f3a8babca611b0 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 19 Jan 2024 16:43:43 +0100 Subject: [PATCH 01/12] Conponente selCustomer estratto --- MagMan.Core/MagMan.Core.csproj | 2 +- MagMan.Core/Services/MessageService.cs | 17 ++++ MagMan.Data.Admin/MagMan.Data.Admin.csproj | 2 +- MagMan.Data.Tenant/DbModels/MaterialModel.cs | 8 +- MagMan.Data.Tenant/MagMan.Data.Tenant.csproj | 2 +- MagMan.UI/Components/CmpSelCliente.razor | 15 +++ MagMan.UI/Components/CmpSelCliente.razor.cs | 68 +++++++++++++ MagMan.UI/Components/MaterialMan.razor | 26 +++-- MagMan.UI/MagMan.UI.csproj | 2 +- MagMan.UI/Pages/AdminArea.razor | 14 +-- MagMan.UI/Pages/AdminArea.razor.cs | 19 ++-- MagMan.UI/Pages/WareHouse.razor | 14 +-- MagMan.UI/Pages/WareHouse.razor.cs | 102 ++++++++++++------- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 16 files changed, 202 insertions(+), 95 deletions(-) create mode 100644 MagMan.UI/Components/CmpSelCliente.razor create mode 100644 MagMan.UI/Components/CmpSelCliente.razor.cs diff --git a/MagMan.Core/MagMan.Core.csproj b/MagMan.Core/MagMan.Core.csproj index 3636131..934f236 100644 --- a/MagMan.Core/MagMan.Core.csproj +++ b/MagMan.Core/MagMan.Core.csproj @@ -7,7 +7,7 @@ - + diff --git a/MagMan.Core/Services/MessageService.cs b/MagMan.Core/Services/MessageService.cs index f7278a0..a3dc8dc 100644 --- a/MagMan.Core/Services/MessageService.cs +++ b/MagMan.Core/Services/MessageService.cs @@ -131,6 +131,23 @@ namespace MagMan.Core.Services } } + /// + /// Cliente selezionato (da browser data cache) + /// + public async Task ClientIdGet() + { + var answ = await localStore.GetItemAsync("ClientID"); + return answ; + } + + /// + /// Imposta Cliente selezionato (browser data cache) + /// + public async Task ClientIdSet(int machSel) + { + await localStore.SetItemAsync("ClientID", machSel); + } + #endregion Public Properties #region Public Methods diff --git a/MagMan.Data.Admin/MagMan.Data.Admin.csproj b/MagMan.Data.Admin/MagMan.Data.Admin.csproj index 2406b07..b222b78 100644 --- a/MagMan.Data.Admin/MagMan.Data.Admin.csproj +++ b/MagMan.Data.Admin/MagMan.Data.Admin.csproj @@ -15,7 +15,7 @@ - + diff --git a/MagMan.Data.Tenant/DbModels/MaterialModel.cs b/MagMan.Data.Tenant/DbModels/MaterialModel.cs index a0da42a..164a51b 100644 --- a/MagMan.Data.Tenant/DbModels/MaterialModel.cs +++ b/MagMan.Data.Tenant/DbModels/MaterialModel.cs @@ -93,16 +93,16 @@ namespace MagMan.Data.Tenant.DbModels [NotMapped] public bool IsBeam { - get => LMm == 0; + get => (LMm == 0 && (HMm > 0 && WMm > 0)); } - + /// - /// Verifica che sia Wall, quando W/H == 0 + /// Verifica che sia Wall, quando W/L == 0 /// [NotMapped] public bool IsWall { - get => (HMm == 0 && WMm==0); + get => (HMm > 0 && (LMm == 0 && WMm == 0)); } public virtual ICollection? RawItemList { get; set; } diff --git a/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj b/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj index 1986e8e..b27104d 100644 --- a/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj +++ b/MagMan.Data.Tenant/MagMan.Data.Tenant.csproj @@ -17,7 +17,7 @@ - + diff --git a/MagMan.UI/Components/CmpSelCliente.razor b/MagMan.UI/Components/CmpSelCliente.razor new file mode 100644 index 0000000..c236799 --- /dev/null +++ b/MagMan.UI/Components/CmpSelCliente.razor @@ -0,0 +1,15 @@ +
+ + +
+ + diff --git a/MagMan.UI/Components/CmpSelCliente.razor.cs b/MagMan.UI/Components/CmpSelCliente.razor.cs new file mode 100644 index 0000000..75240e1 --- /dev/null +++ b/MagMan.UI/Components/CmpSelCliente.razor.cs @@ -0,0 +1,68 @@ +using MagMan.Core.Services; +using MagMan.Data.Admin.DbModels; +using MagMan.Data.Admin.Services; +using Microsoft.AspNetCore.Components; + +namespace MagMan.UI.Components +{ + public partial class CmpSelCliente + { + #region Public Properties + + [Parameter] + public EventCallback E_CustSelected { get; set; } + + #endregion Public Properties + + #region Protected Properties + + [Inject] + protected MessageService AppMService { get; set; } = null!; + + protected int CustomerID + { + get => customerID; + set + { + if (customerID != value) + { + customerID = value; + E_CustSelected.InvokeAsync(value); + InvokeAsync(() => AppMService.ClientIdSet(value)); + } + } + } + + [Inject] + protected MTAdminService MTService { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + CustomerID = await AppMService.ClientIdGet(); + } + + protected override async Task OnInitializedAsync() + { + await ReloadData(); + } + + protected async Task ReloadData() + { + CustomersList = await MTService.CustomerGetAll(); + } + + #endregion Protected Methods + + #region Private Fields + + private int customerID = 0; + + private List? CustomersList = null; + + #endregion Private Fields + } +} \ No newline at end of file diff --git a/MagMan.UI/Components/MaterialMan.razor b/MagMan.UI/Components/MaterialMan.razor index 87b767f..b5e2fbb 100644 --- a/MagMan.UI/Components/MaterialMan.razor +++ b/MagMan.UI/Components/MaterialMan.razor @@ -55,9 +55,9 @@ ID Mat.Code Descr. - W (mm) - H (mm) - L (mm) + W (mm) + H (mm) + L (mm) @* *@ @@ -69,7 +69,19 @@ - @item.MatId + @if (item.IsBeam) + { + + + + } + else if (@item.IsWall) + { + + + + } +  @item.MatId  @item.MatCode @@ -77,13 +89,13 @@ @item.MatDesc - + @($"{item.WMm:N2}") - + @($"{item.HMm:N2}") - + @($"{item.LMm:N2}") @* diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj index 963cf73..c1b084e 100644 --- a/MagMan.UI/MagMan.UI.csproj +++ b/MagMan.UI/MagMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 1.0.2401.1911 + 1.0.2401.1916 enable enable true diff --git a/MagMan.UI/Pages/AdminArea.razor b/MagMan.UI/Pages/AdminArea.razor index c15ffb1..d925cba 100644 --- a/MagMan.UI/Pages/AdminArea.razor +++ b/MagMan.UI/Pages/AdminArea.razor @@ -22,19 +22,7 @@
@if (currMode != CtMode.Company) { -
- - -
+ }
diff --git a/MagMan.UI/Pages/AdminArea.razor.cs b/MagMan.UI/Pages/AdminArea.razor.cs index 1e2e4e1..c035dc3 100644 --- a/MagMan.UI/Pages/AdminArea.razor.cs +++ b/MagMan.UI/Pages/AdminArea.razor.cs @@ -31,12 +31,16 @@ namespace MagMan.UI.Pages #region Protected Methods - protected override async Task OnInitializedAsync() + protected override void OnInitialized() { AppMService.ShowSearch = false; AppMService.PageName = "Admin Area"; AppMService.PageIcon = "fa-solid fa-house pr-2"; - await ReloadData(); + } + + protected void SaveCust(int newCustId) + { + CustomerID = newCustId; } #endregion Protected Methods @@ -44,14 +48,12 @@ namespace MagMan.UI.Pages #region Private Fields private CtMode currMode = CtMode.Company; - private int CustomerID = 0; - private List? CustomersList = null; #endregion Private Fields #region Private Properties - private bool isLoading { get; set; } = false; + private int CustomerID { get; set; } = 0; [Inject] private NavigationManager NavMan { get; set; } = null!; @@ -66,13 +68,6 @@ namespace MagMan.UI.Pages return answ; } - private async Task ReloadData() - { - isLoading = true; - CustomersList = await MTService.CustomerGetAll(); - isLoading = false; - } - private void SetMode(CtMode newMode) { currMode = newMode; diff --git a/MagMan.UI/Pages/WareHouse.razor b/MagMan.UI/Pages/WareHouse.razor index 9990900..b8f0fe7 100644 --- a/MagMan.UI/Pages/WareHouse.razor +++ b/MagMan.UI/Pages/WareHouse.razor @@ -14,19 +14,7 @@
-
- - -
+
@if (CustomerID == 0) diff --git a/MagMan.UI/Pages/WareHouse.razor.cs b/MagMan.UI/Pages/WareHouse.razor.cs index 864137c..611f8a5 100644 --- a/MagMan.UI/Pages/WareHouse.razor.cs +++ b/MagMan.UI/Pages/WareHouse.razor.cs @@ -2,53 +2,19 @@ using MagMan.Core.Services; using MagMan.Data.Admin.DbModels; using MagMan.Data.Admin.Services; using Microsoft.AspNetCore.Components; +using YamlDotNet.Core.Tokens; namespace MagMan.UI.Pages { public partial class WareHouse { - [Inject] - protected MessageService AppMService { get; set; } = null!; - - [Inject] - protected MTAdminService MTService { get; set; } = null!; - protected override async Task OnInitializedAsync() - { - AppMService.ShowSearch = false; - AppMService.PageName = "Warehouse Area"; - AppMService.PageIcon = "fa-solid fa-warehouse pr-2"; - await ReloadData(); - } - - private async Task ReloadData() - { - isLoading = true; - CustomersList = await MTService.CustomerGetAll(); - nKey = await MTService.MainKeyByCustomer(CustomerID); - isLoading = false; - } + #region Protected Fields protected int nKey = 0; - private bool isLoading { get; set; } = false; - private CtMode currMode = CtMode.Materials; - protected int CustomerID - { - get => customerID; - set - { - if (customerID != value) - { - customerID = value; - // update keys - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); - } - } - } - private int customerID = 0; - private int KeyNum = 0; - private List? CustomersList = null; + #endregion Protected Fields + + #region Protected Enums protected enum CtMode { @@ -58,15 +24,73 @@ namespace MagMan.UI.Pages //Pickup } + #endregion Protected Enums + + #region Protected Properties + + [Inject] + protected MessageService AppMService { get; set; } = null!; + + protected int CustomerID { get; set; } = 0; + + [Inject] + protected MTAdminService MTService { get; set; } = null!; + + #endregion Protected Properties + + #region Protected Methods + + protected override async Task OnInitializedAsync() + { + AppMService.ShowSearch = false; + AppMService.PageName = "Warehouse Area"; + AppMService.PageIcon = "fa-solid fa-warehouse pr-2"; + // rileggo dati + await ReloadData(); + } + + protected async Task SaveCust(int newCustId) + { + CustomerID = newCustId; + await ReloadData(); + } + + #endregion Protected Methods + + #region Private Fields + + private CtMode currMode = CtMode.Materials; + + private int KeyNum = 0; + + #endregion Private Fields + + #region Private Properties + + private bool isLoading { get; set; } = false; + + #endregion Private Properties + + #region Private Methods + private string IsActive(CtMode modeReq) { string answ = currMode == modeReq ? "active" : ""; return answ; } + private async Task ReloadData() + { + isLoading = true; + nKey = await MTService.MainKeyByCustomer(CustomerID); + isLoading = false; + } + private void SetMode(CtMode newMode) { currMode = newMode; } + + #endregion Private Methods } } \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 5205fbd..7f7dd06 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MagMan - Wood Warehouse Management System -

Versione: 1.0.2401.1911

+

Versione: 1.0.2401.1916


Note di rilascio: