From cc879c073df02c93778f79d1718221a9689bc765 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 25 Jan 2024 17:10:23 +0100
Subject: [PATCH 1/5] Aggiunta display varianti

---
 MagMan.Core/DTO/MaterialDTO.cs                |  38 +++
 .../Controllers/TenantController.cs           | 258 +++++++++++-------
 MagMan.Data.Tenant/DbModels/MovMagModel.cs    |   9 +-
 MagMan.Data.Tenant/Services/TenantService.cs  |  81 +++++-
 MagMan.UI/Components/MaterialMan.razor        |  26 +-
 MagMan.UI/Components/MaterialMan.razor.cs     |  26 +-
 MagMan.UI/MagMan.UI.csproj                    |   2 +-
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 10 files changed, 310 insertions(+), 136 deletions(-)

diff --git a/MagMan.Core/DTO/MaterialDTO.cs b/MagMan.Core/DTO/MaterialDTO.cs
index 5ab8283..170e807 100644
--- a/MagMan.Core/DTO/MaterialDTO.cs
+++ b/MagMan.Core/DTO/MaterialDTO.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -35,5 +36,42 @@ namespace MagMan.Core.DTO
         /// Thikness/Spessore in mm
         /// </summary>
         public decimal HMm { get; set; } = 0;
+
+        /// <summary>
+        /// Varianti dimensionali disponibili
+        /// </summary>
+        public int SizeNum { get; set; } = 0;
+
+        /// <summary>
+        /// Quantità totale in giacenza
+        /// </summary>
+        public int QtyTot { get; set; } = 0;
+
+        /// <summary>
+        /// Codice materiale x QR/Datamatrix
+        /// </summary>
+        [NotMapped]
+        public string MatDtmx
+        {
+            get => $"MT{MatId:00000000}";
+        }
+
+        /// <summary>
+        /// Verifica che sia Beam, quando L == 0
+        /// </summary>
+        [NotMapped]
+        public bool IsBeam
+        {
+            get => (LMm == 0 && (HMm > 0 && WMm > 0));
+        }
+
+        /// <summary>
+        /// Verifica che sia Wall, quando W/L == 0
+        /// </summary>
+        [NotMapped]
+        public bool IsWall
+        {
+            get => (HMm > 0 && (LMm == 0 && WMm == 0));
+        }
     }
 }
diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs
index 2ada339..47a11df 100644
--- a/MagMan.Data.Tenant/Controllers/TenantController.cs
+++ b/MagMan.Data.Tenant/Controllers/TenantController.cs
@@ -277,12 +277,71 @@ namespace MagMan.Data.Tenant.Controllers
                 }
             }
             return dbResult;
-        } /// <summary>
+        }
 
-          /// Elenco Materiali gestiti a magazzino </summary> <param name="connString">Stringa
-          /// connessione (variabile x cliente)</param> <param name="projDbId">Materiale richiesto, 0
-          /// = tutti</param> <param name="withChild">Se true allora include record child
-          /// (Items)</param> <returns></returns>
+        /// <summary>
+        /// Elenco Materiali gestiti a magazzino formato DTO
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
+        /// <returns></returns>
+        public List<MaterialDTO> MaterialDtoGetAll(string connString, bool withChild)
+        {
+            List<MaterialDTO> dbResult = new List<MaterialDTO>();
+            using (MagManContext dbCtx = new MagManContext(connString))
+            {
+                if (withChild)
+                {
+                    dbResult = dbCtx
+                                .DbSetMaterials
+                                .Select(x => new MaterialDTO()
+                                {
+                                    MatId = x.MatId,
+                                    MatCode = x.MatCode,
+                                    MatDesc = x.MatDesc,
+                                    HMm = x.HMm,
+                                    LMm = x.LMm,
+                                    WMm = x.WMm,
+                                    SizeNum = x.RawItemList == null ? 0 : x.RawItemList.Count,
+                                    QtyTot = x.RawItemList == null ? 0 : x.RawItemList.Sum(r => r.QtyAvail)
+                                })
+                                .OrderBy(x => x.MatDesc)
+                                .ThenBy(x => x.WMm)
+                                .ThenBy(x => x.HMm)
+                                .ThenBy(x => x.LMm)
+                                .ToList();
+                }
+                else
+                {
+                    dbResult = dbCtx
+                                .DbSetMaterials
+                                .Select(x => new MaterialDTO()
+                                {
+                                    MatId = x.MatId,
+                                    MatCode = x.MatCode,
+                                    MatDesc = x.MatDesc,
+                                    HMm = x.HMm,
+                                    LMm = x.LMm,
+                                    WMm = x.WMm,
+                                    SizeNum = x.RawItemList == null ? 0 : x.RawItemList.Count,
+                                    QtyTot = x.RawItemList == null ? 0 : x.RawItemList.Sum(r => r.QtyAvail)
+                                })
+                                .OrderBy(x => x.MatDesc)
+                                .ThenBy(x => x.WMm)
+                                .ThenBy(x => x.HMm)
+                                .ThenBy(x => x.LMm)
+                                .ToList();
+                }
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco Materiali gestiti a magazzino
+        /// </summary> 
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param> 
+        /// <param name="projDbId">Materiale richiesto, 0 = tutti</param>
+        /// <param name="withChild">Se true allora include record child (Items)</param> 
+        /// <returns></returns>
         public List<MaterialModel> MaterialGetFilt(string connString, int matID, bool withChild)
         {
             List<MaterialModel> dbResult = new List<MaterialModel>();
@@ -525,99 +584,6 @@ namespace MagMan.Data.Tenant.Controllers
             return done;
         }
 
-        /// <summary>
-        /// Elenco risorse dato progetto e stato
-        /// </summary>
-        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
-        /// <param name="projDbId">ID progetto</param>
-        /// <param name="isEstim">true = ultima stima attiva / false = consumi effettivi</param>
-        /// <returns></returns>
-        public List<ResourceModel> ResourcesGetByProject(string connString, int projDbId, bool isEstim, bool showAll)
-        {
-            List<ResourceModel> dbResult = new List<ResourceModel>();
-            using (MagManContext dbCtx = new MagManContext(connString))
-            {
-                if (isEstim)
-                {
-                    dbResult = dbCtx
-                                .DbSetResources
-                                .Where(x => x.RequestNav.ProjDbId == projDbId && (x.RequestNav.IsActive || showAll) && x.RequestNav.ReqState > Enums.ProjResState.ND)
-                                .OrderBy(x => x.ResourceId)
-                                .ToList();
-                }
-                else
-                {
-                    dbResult = dbCtx
-                                .DbSetResources
-                                .Where(x => x.RequestNav.ProjDbId == projDbId && x.RequestNav.IsActive && x.RequestNav.ReqState == Enums.ProjResState.Consumed)
-                                .OrderBy(x => x.ResourceId)
-                                .ToList();
-                }
-            }
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Elenco risorse dato progetto e stato
-        /// </summary>
-        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
-        /// <param name="projDbId">ID progetto</param>
-        /// <param name="isEstim">true = ultima stima attiva / false = consumi effettivi</param>
-        /// <returns></returns>
-        public List<ResourceExpDTO> ResourcesExpGetByProject(string connString, int projDbId, bool isEstim, bool showAll)
-        {
-            List<ResourceExpDTO> dbResult = new List<ResourceExpDTO>();
-            List<ResourceModel> rawData = new List<ResourceModel>();
-            using (MagManContext dbCtx = new MagManContext(connString))
-            {
-                if (isEstim)
-                {
-                    rawData = dbCtx
-                                .DbSetResources
-                                .Include(p => p.RequestNav)
-                                .Include(i => i.ItemNav)
-                                .Where(x => x.RequestNav.ProjDbId == projDbId && (x.RequestNav.IsActive || showAll) && x.RequestNav.ReqState > Enums.ProjResState.ND)
-                                .ToList();
-                }
-                else
-                {
-                    rawData = dbCtx
-                                .DbSetResources
-                                .Include(p => p.RequestNav)
-                                .Include(i => i.ItemNav)
-                                .Where(x => x.RequestNav.ProjDbId == projDbId && x.RequestNav.IsActive && x.RequestNav.ReqState == Enums.ProjResState.Consumed)
-                                .OrderBy(x => x.ResourceId)
-                                .ToList();
-                }
-                try
-                {
-                    dbResult = rawData.Select(x => new ResourceExpDTO()
-                    {
-                        ResourceId = x.ResourceId,
-                        RawItemId = x.RawItemId,
-                        Qty = x.Qty,
-                        Note = x.ItemNav.Note,
-                        DtRequest = x.RequestNav.DtRequest,
-                        HMm = x.ItemNav.HMm,
-                        LMm = x.ItemNav.LMm,
-                        WMm = x.ItemNav.WMm,
-                        IsActive = x.RequestNav.IsActive,
-                        IsRemn = x.ItemNav.IsRemn,
-                        MatId = x.ItemNav.MatId,
-                        RequestId = x.RequestId
-                    })
-                    .OrderByDescending(x => x.DtRequest)
-                    .ThenByDescending(x => x.ResourceId)
-                    .ToList();
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"Eccezione ResourcesExpGetByProject{Environment.NewLine}{exc}");
-                }
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Aggiunge/Modifica un record ReqPlan
         /// </summary>
@@ -682,11 +648,105 @@ namespace MagMan.Data.Tenant.Controllers
             return newId;
         }
 
+        /// <summary>
+        /// Elenco risorse dato progetto e stato
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
+        /// <param name="projDbId">ID progetto</param>
+        /// <param name="isEstim">true = ultima stima attiva / false = consumi effettivi</param>
+        /// <returns></returns>
+        public List<ResourceExpDTO> ResourcesExpGetByProject(string connString, int projDbId, bool isEstim, bool showAll)
+        {
+            List<ResourceExpDTO> dbResult = new List<ResourceExpDTO>();
+            List<ResourceModel> rawData = new List<ResourceModel>();
+            using (MagManContext dbCtx = new MagManContext(connString))
+            {
+                if (isEstim)
+                {
+                    rawData = dbCtx
+                                .DbSetResources
+                                .Include(p => p.RequestNav)
+                                .Include(i => i.ItemNav)
+                                .Where(x => x.RequestNav.ProjDbId == projDbId && (x.RequestNav.IsActive || showAll) && x.RequestNav.ReqState > Enums.ProjResState.ND)
+                                .ToList();
+                }
+                else
+                {
+                    rawData = dbCtx
+                                .DbSetResources
+                                .Include(p => p.RequestNav)
+                                .Include(i => i.ItemNav)
+                                .Where(x => x.RequestNav.ProjDbId == projDbId && x.RequestNav.IsActive && x.RequestNav.ReqState == Enums.ProjResState.Consumed)
+                                .OrderBy(x => x.ResourceId)
+                                .ToList();
+                }
+                try
+                {
+                    dbResult = rawData.Select(x => new ResourceExpDTO()
+                    {
+                        ResourceId = x.ResourceId,
+                        RawItemId = x.RawItemId,
+                        Qty = x.Qty,
+                        Note = x.ItemNav.Note,
+                        DtRequest = x.RequestNav.DtRequest,
+                        HMm = x.ItemNav.HMm,
+                        LMm = x.ItemNav.LMm,
+                        WMm = x.ItemNav.WMm,
+                        IsActive = x.RequestNav.IsActive,
+                        IsRemn = x.ItemNav.IsRemn,
+                        MatId = x.ItemNav.MatId,
+                        RequestId = x.RequestId
+                    })
+                    .OrderByDescending(x => x.DtRequest)
+                    .ThenByDescending(x => x.ResourceId)
+                    .ToList();
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione ResourcesExpGetByProject{Environment.NewLine}{exc}");
+                }
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco risorse dato progetto e stato
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
+        /// <param name="projDbId">ID progetto</param>
+        /// <param name="isEstim">true = ultima stima attiva / false = consumi effettivi</param>
+        /// <returns></returns>
+        public List<ResourceModel> ResourcesGetByProject(string connString, int projDbId, bool isEstim, bool showAll)
+        {
+            List<ResourceModel> dbResult = new List<ResourceModel>();
+            using (MagManContext dbCtx = new MagManContext(connString))
+            {
+                if (isEstim)
+                {
+                    dbResult = dbCtx
+                                .DbSetResources
+                                .Where(x => x.RequestNav.ProjDbId == projDbId && (x.RequestNav.IsActive || showAll) && x.RequestNav.ReqState > Enums.ProjResState.ND)
+                                .OrderBy(x => x.ResourceId)
+                                .ToList();
+                }
+                else
+                {
+                    dbResult = dbCtx
+                                .DbSetResources
+                                .Where(x => x.RequestNav.ProjDbId == projDbId && x.RequestNav.IsActive && x.RequestNav.ReqState == Enums.ProjResState.Consumed)
+                                .OrderBy(x => x.ResourceId)
+                                .ToList();
+                }
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Aggiunge/Modifica un elenco di Resource (+ eventuali update giacenze)
         /// </summary>
         /// <param name="connString">Stringa connessione (variabile x cliente)</param>
-        /// <param name="recList">Elenco record da aggiungere/aggiornare</param>>
+        /// <param name="recList">Elenco record da aggiungere/aggiornare</param>
+        /// &gt;
         /// <param name="resState">Tipo di aggiornamento da registratre</param>
         /// <returns></returns>
         public int ResourceUpdate(string connString, List<ResourceModel> recList, Enums.ProjResState resState)
diff --git a/MagMan.Data.Tenant/DbModels/MovMagModel.cs b/MagMan.Data.Tenant/DbModels/MovMagModel.cs
index 6cdd62e..9033c3a 100644
--- a/MagMan.Data.Tenant/DbModels/MovMagModel.cs
+++ b/MagMan.Data.Tenant/DbModels/MovMagModel.cs
@@ -29,7 +29,7 @@ namespace MagMan.Data.Tenant.DbModels
         /// <summary>
         /// Ext ref for Items
         /// </summary>
-        public int ItemID { get; set; }
+        public int RawItemId { get; set; }
 
         /// <summary>
         /// Qty recorded (delta +/-)
@@ -41,11 +41,16 @@ namespace MagMan.Data.Tenant.DbModels
         /// </summary>
         public string UserId { get; set; } = "";
 
+        /// <summary>
+        /// Note opzionali
+        /// </summary>
+        public string Note { get; set; } = "";
+
         /// <summary>
         /// Navigation property to Items
         /// </summary>
         [ForeignKey("RawItemId")]
-        public virtual RawItemModel? ITemNav { get; set; }
+        public virtual RawItemModel? ItemNav { get; set; }
 
     }
 }
diff --git a/MagMan.Data.Tenant/Services/TenantService.cs b/MagMan.Data.Tenant/Services/TenantService.cs
index 944ecb4..d37a19b 100644
--- a/MagMan.Data.Tenant/Services/TenantService.cs
+++ b/MagMan.Data.Tenant/Services/TenantService.cs
@@ -281,18 +281,21 @@ namespace MagMan.Data.Tenant.Services
         /// </summary>
         /// <param name="origItem"></param>
         /// <returns></returns>
-        public MaterialModel MaterialFromDto(MaterialDTO origItem)
+        public MaterialModel? MaterialFromDto(MaterialDTO? origItem)
         {
-            MaterialModel answ = new MaterialModel()
+            MaterialModel? answ = null;
+            if (origItem != null)
             {
-                MatId = origItem.MatId,
-                MatCode = origItem.MatCode,
-                MatDesc = origItem.MatDesc,
-                LMm = origItem.LMm,
-                WMm = origItem.WMm,
-                HMm = origItem.HMm
-            };
-
+                answ = new MaterialModel()
+                {
+                    MatId = origItem.MatId,
+                    MatCode = origItem.MatCode,
+                    MatDesc = origItem.MatDesc,
+                    LMm = origItem.LMm,
+                    WMm = origItem.WMm,
+                    HMm = origItem.HMm
+                };
+            }
             return answ;
         }
 
@@ -354,6 +357,64 @@ namespace MagMan.Data.Tenant.Services
             return dbResult;
         }
 
+        /// <summary>
+        /// Lista Materiali gestiti a magazzino in formato DTO
+        /// </summary>
+        /// <param name="nKey">Key di riferimento</param>
+        /// <param name="withChild">Se true allora include record child (Items)</param>
+        /// <returns></returns>
+        public async Task<List<MaterialDTO>> MaterialDtoGetAll(int nKey, bool withChild)
+        {
+            string source = "DB";
+            string cString = ConnString(nKey);
+            List<MaterialDTO>? dbResult = new List<MaterialDTO>();
+            try
+            {
+                string dType = withChild ? "MaterialsDtoFull" : "MaterialsDto";
+                string currKey = $"{Const.rKeyConfig}:{dType}:{nKey}";
+                Stopwatch stopWatch = new Stopwatch();
+                stopWatch.Start();
+                string? rawData = await redisDb.StringGetAsync(currKey);
+                if (!string.IsNullOrEmpty(rawData))
+                {
+                    source = "REDIS";
+                    var tempResult = JsonConvert.DeserializeObject<List<MaterialDTO>>(rawData);
+                    if (tempResult == null)
+                    {
+                        dbResult = new List<MaterialDTO>();
+                    }
+                    else
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                else
+                {
+                    dbResult = dbController.MaterialDtoGetAll(cString, withChild);
+                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
+                    await redisDb.StringSetAsync(currKey, rawData, LongCache);
+                    // per evitare loopback uso deserialize...
+                    var tempResult = JsonConvert.DeserializeObject<List<MaterialDTO>>(rawData);
+                    if (tempResult != null)
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                if (dbResult == null)
+                {
+                    dbResult = new List<MaterialDTO>();
+                }
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"MaterialDtoGetAll | {source} in: {ts.TotalMilliseconds} ms");
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Error during MaterialDtoGetAll:{Environment.NewLine}{exc}");
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Lista Materiali gestiti a magazzino
         /// </summary>
diff --git a/MagMan.UI/Components/MaterialMan.razor b/MagMan.UI/Components/MaterialMan.razor
index 4130b17..1cbe42c 100644
--- a/MagMan.UI/Components/MaterialMan.razor
+++ b/MagMan.UI/Components/MaterialMan.razor
@@ -55,10 +55,13 @@
                         <th>ID <Sorter ParamName="MatId" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                         <th>Mat.Code <Sorter ParamName="MatCode" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                         <th>Descr. <Sorter ParamName="MatDesc" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
-                        <th class="text-end">W (mm) <Sorter ParamName="W" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
-                        <th class="text-end">H (mm) <Sorter ParamName="H" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
-                        @* <th class="text-end">L (mm) <Sorter ParamName="L" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th> *@
-                        @* <th class="text-end"></th> *@
+                        <th class="text-end"><Sorter ParamName="W" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> W (mm)</th>
+                        <th class="text-end"><Sorter ParamName="H" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> H (mm)</th>
+                       @if(MaterialId==0)
+                        {   
+                        <th class="text-end"><Sorter ParamName="SizeNum" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Var.</th>
+                        <th class="text-end"><Sorter ParamName="QtyTot" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Qty</th>
+                        }
                     </tr>
                 </thead>
                 <tbody>
@@ -103,12 +106,15 @@
                             <td class="text-end">
                                 @($"{item.HMm:N2}")
                             </td>
-                            @*  <td class="text-end">
-                    @($"{item.LMm:N2}")
-                    </td> *@
-                            @* <td class="text-end">
-                    <button class="btn btn-sm btn-danger" @onclick="() => DeleteRecord(item)"><i class="fa-solid fa-trash-can"></i></button>
-                    </td> *@
+                            @if (MaterialId == 0)
+                            {
+                                <td class="text-end">
+                                    @item.SizeNum
+                                </td>
+                                <td class="text-end">
+                                    @item.QtyTot
+                                </td>
+                            }
                         </tr>
                     }
                 </tbody>
diff --git a/MagMan.UI/Components/MaterialMan.razor.cs b/MagMan.UI/Components/MaterialMan.razor.cs
index fbb97ec..fcd5a6c 100644
--- a/MagMan.UI/Components/MaterialMan.razor.cs
+++ b/MagMan.UI/Components/MaterialMan.razor.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this
 // file to you under the MIT license.
 using EgwCoreLib.Razor;
+using MagMan.Core.DTO;
 using MagMan.Core.Services;
 using MagMan.Data.Admin.DbModels;
 using MagMan.Data.Admin.Services;
@@ -47,7 +48,7 @@ namespace MagMan.UI.Components
 
         #region Protected Methods
 
-        protected string CheckSel(MaterialModel curItem)
+        protected string CheckSel(MaterialDTO curItem)
         {
             string answ = "";
             if (CurrItem != null)
@@ -71,23 +72,26 @@ namespace MagMan.UI.Components
             await InvokeAsync(StateHasChanged);
         }
 
-        protected async Task DeleteRecord(MaterialModel selItem)
+        protected async Task DeleteRecord(MaterialDTO selItem)
         {
             if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sicuro di voler eliminare il record?"))
                 return;
-            await TService.MaterialDelete(KeyNum, selItem);
+            await TService.MaterialDelete(KeyNum, TService.MaterialFromDto(selItem));
             await ReloadData();
         }
 
-        protected void DoEdit(MaterialModel? selItem)
+        protected void DoEdit(MaterialDTO? selItem)
         {
-            CurrItem = selItem;
             if (selItem == null)
             {
                 DoSelect(null);
             }
+            else
+            {
+                CurrItem = TService.MaterialFromDto(selItem);
+            }
         }
-        protected void DoSelect(MaterialModel? selItem)
+        protected void DoSelect(MaterialDTO? selItem)
         {
             if (selItem != null)
             {
@@ -97,7 +101,7 @@ namespace MagMan.UI.Components
             {
                 MaterialId = 0;
             }
-            E_MaterialSel.InvokeAsync(selItem);
+            E_MaterialSel.InvokeAsync(TService.MaterialFromDto(selItem));
         }
 
         protected async Task ForceReload(bool force)
@@ -147,9 +151,9 @@ namespace MagMan.UI.Components
 
         private string currSearch = "";
         private int filtType = 0;
-        private List<MaterialModel>? ListRecords = null;
+        private List<MaterialDTO>? ListRecords = null;
 
-        private List<MaterialModel>? SearchRecords = null;
+        private List<MaterialDTO>? SearchRecords = null;
 
         private bool sortAsc = true;
 
@@ -194,7 +198,7 @@ namespace MagMan.UI.Components
             isLoading = true;
             await InvokeAsync(StateHasChanged);
             ListRecords = null;
-            SearchRecords = await TService.MaterialGetAll(KeyNum, false);
+            SearchRecords = await TService.MaterialDtoGetAll(KeyNum, false);
             // verifico se filtrare x beam/wall
             if (FiltType > 0)
             {
@@ -299,7 +303,7 @@ namespace MagMan.UI.Components
             }
             else
             {
-                ListRecords = new List<MaterialModel>();
+                ListRecords = new List<MaterialDTO>();
             }
         }
 
diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj
index 363261a..9e87ddf 100644
--- a/MagMan.UI/MagMan.UI.csproj
+++ b/MagMan.UI/MagMan.UI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-        <Version>1.0.2401.2516</Version>
+        <Version>1.0.2401.2517</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 15cca26..13834b2 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MagMan - Wood Warehouse Management System</i>
-    <h4>Versione: 1.0.2401.2516</h4>
+    <h4>Versione: 1.0.2401.2517</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 1c602b0..da03102 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2401.2516
+1.0.2401.2517
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index c24074a..64fd818 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2401.2516</version>
+  <version>1.0.2401.2517</version>
   <url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 7e5605aa7b2bda54e924dad9502cdaa66973f97d Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 25 Jan 2024 18:41:39 +0100
Subject: [PATCH 2/5] Aggiunta modello dati MovMag

---
 .../Controllers/TenantController.cs           | 100 +++---
 MagMan.Data.Tenant/MagManContext.cs           |   2 +-
 MagMan.Data.Tenant/Services/TenantService.cs  |  64 +++-
 MagMan.UI/Components/ItemMan.razor            |   2 +-
 MagMan.UI/Components/ItemMan.razor.cs         |   2 +-
 MagMan.UI/Components/MaterialMan.razor        |   8 +-
 MagMan.UI/Components/MaterialMan.razor.cs     |   2 +-
 MagMan.UI/Components/MovMag.razor             |  87 +++++
 MagMan.UI/Components/MovMag.razor.cs          | 302 ++++++++++++++++++
 MagMan.UI/MagMan.UI.csproj                    |   2 +-
 MagMan.UI/Pages/WareHouse.razor               |   8 +-
 MagMan.UI/Pages/WareHouse.razor.cs            |   7 +
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 15 files changed, 536 insertions(+), 56 deletions(-)
 create mode 100644 MagMan.UI/Components/MovMag.razor
 create mode 100644 MagMan.UI/Components/MovMag.razor.cs

diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs
index 47a11df..8503907 100644
--- a/MagMan.Data.Tenant/Controllers/TenantController.cs
+++ b/MagMan.Data.Tenant/Controllers/TenantController.cs
@@ -23,6 +23,30 @@ namespace MagMan.Data.Tenant.Controllers
 
         #endregion Public Constructors
 
+
+        /// <summary>
+        /// Elenco MovMag dato Item
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
+        /// <param name="rawItemID">ID dell'item x cui filtrare, 0 = tutti</param>
+        /// <param name="maxRec">numMax record da leggere, default 1000</param>
+        /// <returns></returns>
+        public List<MovMagModel> MovMagGetFilt(string connString, int rawItemID, int maxRec = 1000)
+        {
+            List<MovMagModel> dbResult = new List<MovMagModel>();
+            using (MagManContext dbCtx = new MagManContext(connString))
+            {
+                dbResult = dbCtx
+                            .DbSetMovMag
+                            .Where(x => rawItemID == 0 || x.RawItemId == rawItemID)
+                            //.Include(c => c.ItemNav)
+                            .OrderByDescending(x => x.DtRec)
+                            .Take(maxRec)
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         #region Public Methods
 
         public async Task<bool> DatabaseMigrate(string connString)
@@ -244,41 +268,6 @@ namespace MagMan.Data.Tenant.Controllers
             return done;
         }
 
-        /// <summary>
-        /// Elenco Materiali gestiti a magazzino
-        /// </summary>
-        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
-        /// <returns></returns>
-        public List<MaterialModel> MaterialGetAll(string connString, bool withChild)
-        {
-            List<MaterialModel> dbResult = new List<MaterialModel>();
-            using (MagManContext dbCtx = new MagManContext(connString))
-            {
-                if (withChild)
-                {
-                    dbResult = dbCtx
-                                .DbSetMaterials
-                                .Include(x => x.RawItemList)
-                                .OrderBy(x => x.MatDesc)
-                                .ThenBy(x => x.WMm)
-                                .ThenBy(x => x.HMm)
-                                .ThenBy(x => x.LMm)
-                                .ToList();
-                }
-                else
-                {
-                    dbResult = dbCtx
-                                .DbSetMaterials
-                                .OrderBy(x => x.MatDesc)
-                                .ThenBy(x => x.WMm)
-                                .ThenBy(x => x.HMm)
-                                .ThenBy(x => x.LMm)
-                                .ToList();
-                }
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Elenco Materiali gestiti a magazzino formato DTO
         /// </summary>
@@ -337,10 +326,45 @@ namespace MagMan.Data.Tenant.Controllers
 
         /// <summary>
         /// Elenco Materiali gestiti a magazzino
-        /// </summary> 
-        /// <param name="connString">Stringa connessione (variabile x cliente)</param> 
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
+        /// <returns></returns>
+        public List<MaterialModel> MaterialGetAll(string connString, bool withChild)
+        {
+            List<MaterialModel> dbResult = new List<MaterialModel>();
+            using (MagManContext dbCtx = new MagManContext(connString))
+            {
+                if (withChild)
+                {
+                    dbResult = dbCtx
+                                .DbSetMaterials
+                                .Include(x => x.RawItemList)
+                                .OrderBy(x => x.MatDesc)
+                                .ThenBy(x => x.WMm)
+                                .ThenBy(x => x.HMm)
+                                .ThenBy(x => x.LMm)
+                                .ToList();
+                }
+                else
+                {
+                    dbResult = dbCtx
+                                .DbSetMaterials
+                                .OrderBy(x => x.MatDesc)
+                                .ThenBy(x => x.WMm)
+                                .ThenBy(x => x.HMm)
+                                .ThenBy(x => x.LMm)
+                                .ToList();
+                }
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco Materiali gestiti a magazzino
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
         /// <param name="projDbId">Materiale richiesto, 0 = tutti</param>
-        /// <param name="withChild">Se true allora include record child (Items)</param> 
+        /// <param name="withChild">Se true allora include record child (Items)</param>
         /// <returns></returns>
         public List<MaterialModel> MaterialGetFilt(string connString, int matID, bool withChild)
         {
diff --git a/MagMan.Data.Tenant/MagManContext.cs b/MagMan.Data.Tenant/MagManContext.cs
index 0be9330..0819f70 100644
--- a/MagMan.Data.Tenant/MagManContext.cs
+++ b/MagMan.Data.Tenant/MagManContext.cs
@@ -46,10 +46,10 @@ namespace MagMan.Data.Tenant
         public virtual DbSet<ProjModel> DbSetProjects { get; set; } = null!;
         public virtual DbSet<RequestPlanModel> DbSetReqPlan { get; set; } = null!;
         public virtual DbSet<ResourceModel> DbSetResources { get; set; } = null!;
+        public virtual DbSet<MovMagModel> DbSetMovMag { get; set; } = null!;
 
 
 #if false
-        public virtual DbSet<MovMagModel> DbSetMovMag { get; set; } = null!;
         public virtual DbSet<PrintJobQueueModel> DbSetPrintJob { get; set; } = null!; 
 #endif
 
diff --git a/MagMan.Data.Tenant/Services/TenantService.cs b/MagMan.Data.Tenant/Services/TenantService.cs
index d37a19b..a911361 100644
--- a/MagMan.Data.Tenant/Services/TenantService.cs
+++ b/MagMan.Data.Tenant/Services/TenantService.cs
@@ -13,6 +13,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Runtime;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace MagMan.Data.Tenant.Services
@@ -204,10 +205,65 @@ namespace MagMan.Data.Tenant.Services
             return dbResult;
         }
 
-        /// <summary> Update record Item + refresh cache </summary> <param name="nKey">Key di
-        /// riferimento</param> <param name="currItem">Item interesato</param> <param
-        /// name="deltaQty">quantità da aggiornare (se <0 è consumo)</param> <returns></returns>
-        public async Task<bool> ItemModQty(int nKey, RawItemModel currItem, int deltaQty)
+        /// <summary>
+        /// Elenco MovMag dato Item
+        /// </summary>
+        /// <param name="nKey">Key di riferimento</param>
+        /// <param name="rawItemID">ID dell'item x cui filtrare, 0 = tutti</param>
+        /// <param name="maxRec">numMax record da leggere, default 1000</param>
+        /// <returns></returns>
+        public async Task<List<MovMagModel>> MovMagGetFilt(int nKey, int rawItemID, int maxRec = 1000)
+        {
+            string source = "DB";
+            string cString = ConnString(nKey);
+            List<MovMagModel>? dbResult = new List<MovMagModel>();
+            try
+            {
+                // in cache tengo dati estratti ogni minuto...
+                string dtKey = DateTime.Now.ToString("yyMMdd:HHmm");
+                string currKey = $"{Const.rKeyConfig}:{nKey}:MovMag:{rawItemID}:{dtKey}";
+                Stopwatch stopWatch = new Stopwatch();
+                stopWatch.Start();
+                string? rawData = await redisDb.StringGetAsync(currKey);
+                if (!string.IsNullOrEmpty(rawData))
+                {
+                    source = "REDIS";
+                    var tempResult = JsonConvert.DeserializeObject<List<MovMagModel>>(rawData);
+                    if (tempResult == null)
+                    {
+                        dbResult = new List<MovMagModel>();
+                    }
+                    else
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                else
+                {
+                    dbResult = dbController.MovMagGetFilt(cString, rawItemID, maxRec);
+                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
+                    await redisDb.StringSetAsync(currKey, rawData, LongCache);
+                }
+                if (dbResult == null)
+                {
+                    dbResult = new List<MovMagModel>();
+                }
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"MovMagGetFilt | {source} in: {ts.TotalMilliseconds} ms");
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Error during MovMagGetFilt:{Environment.NewLine}{exc}");
+            }
+            return dbResult;
+        }
+
+
+            /// <summary> Update record Item + refresh cache </summary> <param name="nKey">Key di
+            /// riferimento</param> <param name="currItem">Item interesato</param> <param
+            /// name="deltaQty">quantità da aggiornare (se <0 è consumo)</param> <returns></returns>
+            public async Task<bool> ItemModQty(int nKey, RawItemModel currItem, int deltaQty)
         {
             bool fatto = false;
             string cString = ConnString(nKey);
diff --git a/MagMan.UI/Components/ItemMan.razor b/MagMan.UI/Components/ItemMan.razor
index e2fa44f..d5e11cd 100644
--- a/MagMan.UI/Components/ItemMan.razor
+++ b/MagMan.UI/Components/ItemMan.razor
@@ -60,7 +60,7 @@
                     {
                         <tr class="align-middle @CheckSel(item)">
                             <td>
-                                @* <button class="btn btn-info btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button> *@
+                                <button class="btn btn-info btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
                                 <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(item)"><i class="fa-solid fa-edit"></i></button>
                             </td>
                             <td class="text-end fs-5">
diff --git a/MagMan.UI/Components/ItemMan.razor.cs b/MagMan.UI/Components/ItemMan.razor.cs
index 5604f4f..7fab80e 100644
--- a/MagMan.UI/Components/ItemMan.razor.cs
+++ b/MagMan.UI/Components/ItemMan.razor.cs
@@ -220,7 +220,7 @@ namespace MagMan.UI.Components
                 {
                     switch (sortField)
                     {
-                        case "RawItemId":
+                        case "MovId":
                             if (sortAsc)
                             {
                                 SearchRecords = SearchRecords.OrderBy(x => x.RawItemId).ThenBy(x => x.Note).ToList();
diff --git a/MagMan.UI/Components/MaterialMan.razor b/MagMan.UI/Components/MaterialMan.razor
index 1cbe42c..8171358 100644
--- a/MagMan.UI/Components/MaterialMan.razor
+++ b/MagMan.UI/Components/MaterialMan.razor
@@ -57,10 +57,10 @@
                         <th>Descr. <Sorter ParamName="MatDesc" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                         <th class="text-end"><Sorter ParamName="W" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> W (mm)</th>
                         <th class="text-end"><Sorter ParamName="H" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> H (mm)</th>
-                       @if(MaterialId==0)
-                        {   
-                        <th class="text-end"><Sorter ParamName="SizeNum" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Var.</th>
-                        <th class="text-end"><Sorter ParamName="QtyTot" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Qty</th>
+                        @if (MaterialId == 0)
+                        {
+                            <th class="text-end"><Sorter ParamName="SizeNum" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Var.</th>
+                            <th class="text-end"><Sorter ParamName="QtyTot" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Qty</th>
                         }
                     </tr>
                 </thead>
diff --git a/MagMan.UI/Components/MaterialMan.razor.cs b/MagMan.UI/Components/MaterialMan.razor.cs
index fcd5a6c..691912d 100644
--- a/MagMan.UI/Components/MaterialMan.razor.cs
+++ b/MagMan.UI/Components/MaterialMan.razor.cs
@@ -224,7 +224,7 @@ namespace MagMan.UI.Components
                 {
                     switch (sortField)
                     {
-                        case "RawItemId":
+                        case "MovId":
                             if (sortAsc)
                             {
                                 SearchRecords = SearchRecords.OrderBy(x => x.MatId).ThenBy(x => x.MatCode).ToList();
diff --git a/MagMan.UI/Components/MovMag.razor b/MagMan.UI/Components/MovMag.razor
new file mode 100644
index 0000000..1b93ee6
--- /dev/null
+++ b/MagMan.UI/Components/MovMag.razor
@@ -0,0 +1,87 @@
+<div class="card">
+    <div class="card-header">
+        <div class="d-flex justify-content-between">
+            <div class="px-2">
+                <h3>Movimenti Magazzino</h3>
+            </div>
+           @*  <div class="px-2">
+                <div class="d-flex">
+                    <div class="px-2">
+                        @if (CurrItem == null)
+                        {
+                            <button class="btn btn-success" @onclick="()=>CreateNew()"><i class="fa-solid fa-square-plus"></i> Add New</button>
+                        }
+                        else
+                        {
+                            <button class="btn btn-warning" @onclick="()=> DoEdit(null)"><i class="fa-solid fa-ban"></i> Cancel</button>
+                        }
+                    </div>
+                </div>
+            </div> *@
+        </div>
+        @* @if (CurrItem != null)
+        {
+            <hr />
+            <ItemEdit CurrRecord="CurrItem" EC_update="ForceReload"></ItemEdit>
+        } *@
+    </div>
+    <div class="card-body p-1">
+        @if (ListRecords == null || isLoading)
+        {
+            <EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
+        }
+        else if (totalCount == 0)
+        {
+            <div class="alert alert-info">Nessun record trovato</div>
+        }
+        else
+        {
+            <table class="table table-striped table-sm text-start">
+                <thead>
+                    <tr class="">
+                        @* <th>
+                            <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(null)"><i class="fa-solid fa-rotate"></i></button>
+                        </th> *@
+                        <th>Id <Sorter ParamName="RawItemId" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
+                        <th>Data <Sorter ParamName="Location" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
+                        <th class="text-end"><Sorter ParamName="QtyRec" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Qty</th>
+                        <th>Note <Sorter ParamName="Note" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
+                        <th class="text-end"><Sorter ParamName="L" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> User</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var item in ListRecords)
+                    {
+                        <tr class="align-middle @CheckSel(item)">
+                           @*  <td>
+                                <button class="btn btn-info btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
+                                <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(item)"><i class="fa-solid fa-edit"></i></button>
+                            </td> *@
+                            <td class="text-end fs-5">
+                                <b>@item.MovID</b>
+                            </td>
+                            <td>
+                                @item.DtRec.ToString("yyyy-MM-dd HH:mm:ss")
+                            </td>
+                            <td>
+                                <b>@item.QtyRec</b>
+                            </td>
+                            <td>
+                                @item.Note
+                            </td>
+                            <td class="text-end">
+                                @item.UserId
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+        }
+
+    </div>
+    <div class="card-footer">
+        <EgwCoreLib.Razor.DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="SetNumRec" numPageChanged="SetPage" totalCount="@totalCount" showLoading="@isLoading"></EgwCoreLib.Razor.DataPager>
+    </div>
+</div>
+
+
diff --git a/MagMan.UI/Components/MovMag.razor.cs b/MagMan.UI/Components/MovMag.razor.cs
new file mode 100644
index 0000000..54ab5e3
--- /dev/null
+++ b/MagMan.UI/Components/MovMag.razor.cs
@@ -0,0 +1,302 @@
+using EgwCoreLib.Razor;
+using MagMan.Core.Services;
+using MagMan.Data.Tenant.DbModels;
+using MagMan.Data.Tenant.Services;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+
+namespace MagMan.UI.Components
+{
+    public partial class MovMag
+    {
+
+        #region Public Properties
+
+        [Parameter]
+        public int CustomerId { get; set; } = 0;
+
+
+        [Parameter]
+        public int KeyNum { get; set; } = 0;
+
+        [Parameter]
+        public int RawItemIdSel { get; set; } = 0;
+
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected MessageService AppMService { get; set; } = null!;
+
+        [Inject]
+        protected IConfiguration Configuration { get; set; } = null!;
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; } = null!;
+
+        protected int totalCount { get; set; } = 0;
+
+        [Inject]
+        protected TenantService TService { get; set; } = null!;
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected string CheckSel(MovMagModel curItem)
+        {
+            string answ = "";
+            if (CurrItem != null)
+            {
+                answ = curItem.MovID == CurrItem.MovID ? "table-info" : "";
+            }
+            else
+            {
+                answ = curItem.MovID == MovId ? "table-info" : "";
+            }
+            return answ;
+        }
+
+
+#if false
+        protected async Task CreateNew()
+        {
+            CurrItem = new RawItemModel()
+            {
+                MatId = MaterialSel.MatId,
+                Location = "nd",
+                Note = "...",
+                QtyAvail = 0,
+                IsActive = true,
+                IsRemn = false,
+                HMm = MaterialSel.HMm,
+                LMm = MaterialSel.LMm,
+                WMm = MaterialSel.WMm
+            };
+            await InvokeAsync(StateHasChanged);
+        }
+
+        protected async Task DeleteRecord(RawItemModel selItem)
+        {
+            if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sicuro di voler eliminare il record?"))
+                return;
+            await TService.ItemDelete(KeyNum, selItem);
+            await ReloadData();
+        }
+
+        protected void DoEdit(RawItemModel? selItem)
+        {
+            CurrItem = selItem;
+            if (selItem == null)
+            {
+                DoSelect(null);
+            }
+        }
+
+        protected void DoSelect(RawItemModel? selItem)
+        {
+            if (selItem != null)
+            {
+                RawItemId = selItem.MatId;
+            }
+            else
+            {
+                RawItemId = 0;
+            }
+            E_RawItemSel.InvokeAsync(RawItemId);
+        } 
+#endif
+
+        protected async Task ForceReload(bool force)
+        {
+            CurrItem = null;
+            await ReloadData();
+        }
+
+        protected override void OnInitialized()
+        {
+            currSearch = "";
+            AppMService.EA_SearchUpdated += AppMService_EA_SearchUpdated;
+        }
+
+        protected override async Task OnParametersSetAsync()
+        {
+            CurrItem = null;
+            await ReloadData();
+        }
+
+        protected void SetNumRec(int newNum)
+        {
+            numRecord = newNum;
+            currPage = 1;
+            InvokeAsync(ReloadData);
+        }
+
+        protected void SetPage(int newNum)
+        {
+            currPage = newNum;
+            InvokeAsync(ReloadData);
+        }
+
+        protected async Task SortRequested(Sorter.SortCallBack e)
+        {
+            sortField = e.ParamName;
+            sortAsc = e.IsAscending;
+            await ReloadData();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private MovMagModel? CurrItem = null;
+        private string currSearch = "";
+        private int filtType = 0;
+        private List<MovMagModel>? ListRecords = null;
+        private int MovId = 0;
+        private List<MovMagModel>? SearchRecords = null;
+
+        private bool sortAsc = true;
+
+        private string sortField = "";
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private int currPage { get; set; } = 1;
+
+        private int FiltType
+        {
+            get => filtType;
+            set
+            {
+                if (filtType != value)
+                {
+                    filtType = value;
+                    InvokeAsync(ReloadData);
+                    InvokeAsync(StateHasChanged);
+                }
+            }
+        }
+
+        private bool isLoading { get; set; } = false;
+
+        private int numRecord { get; set; } = 10;
+
+        #endregion Private Properties
+
+        #region Private Methods
+
+        private async void AppMService_EA_SearchUpdated()
+        {
+            currSearch = AppMService.SearchVal;
+            await ReloadData();
+        }
+
+        private async Task ReloadData()
+        {
+            isLoading = true;
+            await InvokeAsync(StateHasChanged);
+            ListRecords = null;
+            SearchRecords = await TService.MovMagGetFilt(KeyNum, RawItemIdSel, 1000);
+            // verifico filtro per ricerca
+            if (!string.IsNullOrEmpty(currSearch))
+            {
+                SearchRecords = SearchRecords.Where(x => x.Note.Contains(currSearch, StringComparison.InvariantCultureIgnoreCase)).ToList();
+            }
+            totalCount = SearchRecords.Count;
+            SortTable();
+            isLoading = false;
+            await InvokeAsync(StateHasChanged);
+        }
+
+        private void SortTable()
+        {
+            if (SearchRecords != null)
+            {
+                // se ho ordinamento riordino...
+                if (!string.IsNullOrEmpty(sortField))
+                {
+                    switch (sortField)
+                    {
+                        case "MovId":
+                            if (sortAsc)
+                            {
+                                SearchRecords = SearchRecords.OrderBy(x => x.RawItemId).ThenBy(x => x.Note).ToList();
+                            }
+                            else
+                            {
+                                SearchRecords = SearchRecords.OrderByDescending(x => x.RawItemId).ThenByDescending(x => x.Note).ToList();
+                            }
+                            break;
+
+                        case "DtRec":
+                            if (sortAsc)
+                            {
+                                SearchRecords = SearchRecords.OrderBy(x => x.DtRec).ToList();
+                            }
+                            else
+                            {
+                                SearchRecords = SearchRecords.OrderByDescending(x => x.DtRec).ToList();
+                            }
+                            break;
+
+                        case "QtyRec":
+                            if (sortAsc)
+                            {
+                                SearchRecords = SearchRecords.OrderBy(x => x.QtyRec).ToList();
+                            }
+                            else
+                            {
+                                SearchRecords = SearchRecords.OrderByDescending(x => x.QtyRec).ToList();
+                            }
+                            break;
+
+                        case "Note":
+                            if (sortAsc)
+                            {
+                                SearchRecords = SearchRecords.OrderBy(x => x.Note).ToList();
+                            }
+                            else
+                            {
+                                SearchRecords = SearchRecords.OrderByDescending(x => x.Note).ToList();
+                            }
+                            break;
+                        case "UserId":
+                            if (sortAsc)
+                            {
+                                SearchRecords = SearchRecords.OrderBy(x => x.UserId).ToList();
+                            }
+                            else
+                            {
+                                SearchRecords = SearchRecords.OrderByDescending(x => x.UserId).ToList();
+                            }
+                            break;
+
+                        default:
+                            break;
+                    }
+                }
+
+                // filtro x display
+                ListRecords = SearchRecords
+                                    .Skip(numRecord * (currPage - 1))
+                                    .Take(numRecord)
+                                    .ToList();
+            }
+            else
+            {
+                ListRecords = new List<MovMagModel>();
+            }
+        }
+
+        private string textCss(bool isActive)
+        {
+            return isActive ? "text-dark" : "text-secondary text-decoration-line-through";
+        }
+
+        #endregion Private Methods
+    }
+}
\ No newline at end of file
diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj
index 9e87ddf..8b8ef5f 100644
--- a/MagMan.UI/MagMan.UI.csproj
+++ b/MagMan.UI/MagMan.UI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-        <Version>1.0.2401.2517</Version>
+        <Version>1.0.2401.2518</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
diff --git a/MagMan.UI/Pages/WareHouse.razor b/MagMan.UI/Pages/WareHouse.razor
index a7760c0..8000cb4 100644
--- a/MagMan.UI/Pages/WareHouse.razor
+++ b/MagMan.UI/Pages/WareHouse.razor
@@ -8,7 +8,7 @@
 }
 else if (CustomerID == 0)
 {
-   <CmpCustomerUndef></CmpCustomerUndef>
+    <CmpCustomerUndef></CmpCustomerUndef>
 }
 else
 {
@@ -19,7 +19,11 @@ else
         @if (MaterialSel != null)
         {
             <div class="col-6">
-                <ItemMan CustomerId="@CustomerID" KeyNum="@nKey" MaterialSel="@MaterialSel"></ItemMan>
+                <ItemMan CustomerId="@CustomerID" KeyNum="@nKey" MaterialSel="@MaterialSel" E_RawItemSel="SaveItem"></ItemMan>
+                @if (RawItemId > 0)
+                {
+                    <MovMag CustomerId="@CustomerID" KeyNum="@nKey" RawItemIdSel="@RawItemId"></MovMag>
+                }
             </div>
         }
     </div>
diff --git a/MagMan.UI/Pages/WareHouse.razor.cs b/MagMan.UI/Pages/WareHouse.razor.cs
index e7d7e0d..c1e7fee 100644
--- a/MagMan.UI/Pages/WareHouse.razor.cs
+++ b/MagMan.UI/Pages/WareHouse.razor.cs
@@ -48,12 +48,19 @@ namespace MagMan.UI.Pages
             MaterialSel = newMat;
         }
 
+        protected void SaveItem(int selRawItemId)
+        {
+            RawItemId = selRawItemId;
+        }
+
+
         #endregion Protected Methods
 
         #region Private Fields
 
         private int KeyNum = 0;
         private MaterialModel? MaterialSel = null;
+        private int RawItemId = 0;
 
         #endregion Private Fields
 
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 13834b2..e764482 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MagMan - Wood Warehouse Management System</i>
-    <h4>Versione: 1.0.2401.2517</h4>
+    <h4>Versione: 1.0.2401.2518</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index da03102..d0f3e55 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2401.2517
+1.0.2401.2518
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 64fd818..212efb1 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2401.2517</version>
+  <version>1.0.2401.2518</version>
   <url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

From 729727610e530495c6d8431f5e6d95b0cb8ba0c3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 25 Jan 2024 18:41:45 +0100
Subject: [PATCH 3/5] Aggiunta migrationx MovMag

---
 .../20240125174127_AddMovMag.Designer.cs      | 348 ++++++++++++++++++
 .../Migrations/20240125174127_AddMovMag.cs    | 130 +++++++
 .../Migrations/MagManContextModelSnapshot.cs  |  57 ++-
 3 files changed, 532 insertions(+), 3 deletions(-)
 create mode 100644 MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs
 create mode 100644 MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs

diff --git a/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs b/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs
new file mode 100644
index 0000000..6087aa3
--- /dev/null
+++ b/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs
@@ -0,0 +1,348 @@
+// <auto-generated />
+using System;
+using MagMan.Data.Tenant;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace MagMan.Data.Tenant.Migrations
+{
+    [DbContext(typeof(MagManContext))]
+    [Migration("20240125174127_AddMovMag")]
+    partial class AddMovMag
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.25")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
+                {
+                    b.Property<string>("Family")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ValueOriginal")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ValueAlias")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Family", "ValueOriginal");
+
+                    b.ToTable("AliasList");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
+                {
+                    b.Property<string>("KeyName")
+                        .HasMaxLength(50)
+                        .HasColumnType("varchar(50)")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("varchar(250)")
+                        .HasColumnOrder(3);
+
+                    b.Property<string>("Val")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("varchar(50)")
+                        .HasColumnOrder(1);
+
+                    b.Property<string>("ValStd")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("varchar(50)")
+                        .HasColumnOrder(2)
+                        .HasComment("Valore di default/riferimento per la variabile");
+
+                    b.HasKey("KeyName");
+
+                    b.ToTable("Config");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
+                {
+                    b.Property<int>("MatId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("HMm")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.Property<decimal>("LMm")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.Property<string>("MatCode")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MatDesc")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<decimal>("WMm")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.HasKey("MatId");
+
+                    b.ToTable("MaterialsList");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
+                {
+                    b.Property<int>("MovID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DtRec")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("QtyRec")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RawItemId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("MovID");
+
+                    b.HasIndex("RawItemId");
+
+                    b.ToTable("MovMag");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
+                {
+                    b.Property<int>("ProjDbId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("BTLFileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("DtCreated")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("DtLastAction")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("DtSchedule")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("DtStartProd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("KeyNum")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ListName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Machine")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("MachineID")
+                        .HasColumnType("int");
+
+                    b.Property<int>("PType")
+                        .HasColumnType("int");
+
+                    b.Property<double>("ProcTimeEst")
+                        .HasColumnType("double");
+
+                    b.Property<double>("ProcTimeReal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("ProjDescription")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ProjExtDbId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ProjExtId")
+                        .HasColumnType("int");
+
+                    b.HasKey("ProjDbId");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("IsArchived");
+
+                    b.HasIndex("KeyNum");
+
+                    b.HasIndex("MachineID");
+
+                    b.HasIndex("ProjExtDbId");
+
+                    b.ToTable("ProjList");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
+                {
+                    b.Property<int>("RawItemId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("HMm")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsRemn")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<decimal>("LMm")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.Property<string>("Location")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("MatId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("QtyAvail")
+                        .HasColumnType("int");
+
+                    b.Property<decimal>("WMm")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.HasKey("RawItemId");
+
+                    b.HasIndex("MatId");
+
+                    b.ToTable("RawItemList");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
+                {
+                    b.Property<int>("RequestId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DtRequest")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("ProjDbId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ReqState")
+                        .HasColumnType("int");
+
+                    b.HasKey("RequestId");
+
+                    b.ToTable("RequestPlan");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
+                {
+                    b.Property<int>("ResourceId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("Qty")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RawItemId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("int");
+
+                    b.HasKey("ResourceId");
+
+                    b.HasIndex("RawItemId");
+
+                    b.HasIndex("RequestId");
+
+                    b.ToTable("ResourceList");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
+                {
+                    b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
+                        .WithMany()
+                        .HasForeignKey("RawItemId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("ItemNav");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
+                {
+                    b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
+                        .WithMany("RawItemList")
+                        .HasForeignKey("MatId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("MaterialNav");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
+                {
+                    b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
+                        .WithMany()
+                        .HasForeignKey("RawItemId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
+                        .WithMany("ResourcesList")
+                        .HasForeignKey("RequestId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("ItemNav");
+
+                    b.Navigation("RequestNav");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
+                {
+                    b.Navigation("RawItemList");
+                });
+
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
+                {
+                    b.Navigation("ResourcesList");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs b/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs
new file mode 100644
index 0000000..e146473
--- /dev/null
+++ b/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs
@@ -0,0 +1,130 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MagMan.Data.Tenant.Migrations
+{
+    public partial class AddMovMag : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_ProjList",
+                table: "ProjList");
+
+            migrationBuilder.RenameColumn(
+                name: "ProjExtDbId",
+                table: "RequestPlan",
+                newName: "ProjDbId");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ProjExtDbId",
+                table: "ProjList",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ProjDbId",
+                table: "ProjList",
+                type: "int",
+                nullable: false,
+                defaultValue: 0)
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_ProjList",
+                table: "ProjList",
+                column: "ProjDbId");
+
+            migrationBuilder.CreateTable(
+                name: "MovMag",
+                columns: table => new
+                {
+                    MovID = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    DtRec = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    RawItemId = table.Column<int>(type: "int", nullable: false),
+                    QtyRec = table.Column<int>(type: "int", nullable: false),
+                    UserId = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Note = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MovMag", x => x.MovID);
+                    table.ForeignKey(
+                        name: "FK_MovMag_RawItemList_RawItemId",
+                        column: x => x.RawItemId,
+                        principalTable: "RawItemList",
+                        principalColumn: "RawItemId",
+                        onDelete: ReferentialAction.Restrict);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ResourceList_RawItemId",
+                table: "ResourceList",
+                column: "RawItemId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MovMag_RawItemId",
+                table: "MovMag",
+                column: "RawItemId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ResourceList_RawItemList_RawItemId",
+                table: "ResourceList",
+                column: "RawItemId",
+                principalTable: "RawItemList",
+                principalColumn: "RawItemId",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ResourceList_RawItemList_RawItemId",
+                table: "ResourceList");
+
+            migrationBuilder.DropTable(
+                name: "MovMag");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ResourceList_RawItemId",
+                table: "ResourceList");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_ProjList",
+                table: "ProjList");
+
+            migrationBuilder.DropColumn(
+                name: "ProjDbId",
+                table: "ProjList");
+
+            migrationBuilder.RenameColumn(
+                name: "ProjDbId",
+                table: "RequestPlan",
+                newName: "ProjExtDbId");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "ProjExtDbId",
+                table: "ProjList",
+                type: "int",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "int")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_ProjList",
+                table: "ProjList",
+                column: "ProjExtDbId");
+        }
+    }
+}
diff --git a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
index ba9d351..4c449bc 100644
--- a/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
+++ b/MagMan.Data.Tenant/Migrations/MagManContextModelSnapshot.cs
@@ -95,9 +95,39 @@ namespace MagMan.Data.Tenant.Migrations
                     b.ToTable("MaterialsList");
                 });
 
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
+                {
+                    b.Property<int>("MovID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DtRec")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("QtyRec")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RawItemId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("MovID");
+
+                    b.HasIndex("RawItemId");
+
+                    b.ToTable("MovMag");
+                });
+
             modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
                 {
-                    b.Property<int>("ProjExtDbId")
+                    b.Property<int>("ProjDbId")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
@@ -156,7 +186,7 @@ namespace MagMan.Data.Tenant.Migrations
                     b.Property<int>("ProjExtId")
                         .HasColumnType("int");
 
-                    b.HasKey("ProjExtDbId");
+                    b.HasKey("ProjDbId");
 
                     b.HasIndex("IsActive");
 
@@ -225,7 +255,7 @@ namespace MagMan.Data.Tenant.Migrations
                     b.Property<bool>("IsActive")
                         .HasColumnType("tinyint(1)");
 
-                    b.Property<int>("ProjExtDbId")
+                    b.Property<int>("ProjDbId")
                         .HasColumnType("int");
 
                     b.Property<int>("ReqState")
@@ -253,11 +283,24 @@ namespace MagMan.Data.Tenant.Migrations
 
                     b.HasKey("ResourceId");
 
+                    b.HasIndex("RawItemId");
+
                     b.HasIndex("RequestId");
 
                     b.ToTable("ResourceList");
                 });
 
+            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
+                {
+                    b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
+                        .WithMany()
+                        .HasForeignKey("RawItemId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("ItemNav");
+                });
+
             modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
                 {
                     b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
@@ -271,12 +314,20 @@ namespace MagMan.Data.Tenant.Migrations
 
             modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
                 {
+                    b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
+                        .WithMany()
+                        .HasForeignKey("RawItemId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
                         .WithMany("ResourcesList")
                         .HasForeignKey("RequestId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.Navigation("ItemNav");
+
                     b.Navigation("RequestNav");
                 });
 

From f4f2c9bfecb7ca4a097e164e32ffb8809dc98662 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 25 Jan 2024 19:44:20 +0100
Subject: [PATCH 4/5] Fix migrazioni

---
 .../20240122174314_InitDb.Designer.cs         | 297 ------------------
 .../Migrations/20240125174127_AddMovMag.cs    | 130 --------
 ...r.cs => 20240125174457_InitDb.Designer.cs} |   4 +-
 ...314_InitDb.cs => 20240125174457_InitDb.cs} |  51 ++-
 4 files changed, 50 insertions(+), 432 deletions(-)
 delete mode 100644 MagMan.Data.Tenant/Migrations/20240122174314_InitDb.Designer.cs
 delete mode 100644 MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs
 rename MagMan.Data.Tenant/Migrations/{20240125174127_AddMovMag.Designer.cs => 20240125174457_InitDb.Designer.cs} (99%)
 rename MagMan.Data.Tenant/Migrations/{20240122174314_InitDb.cs => 20240125174457_InitDb.cs} (84%)

diff --git a/MagMan.Data.Tenant/Migrations/20240122174314_InitDb.Designer.cs b/MagMan.Data.Tenant/Migrations/20240122174314_InitDb.Designer.cs
deleted file mode 100644
index 5a5a6dc..0000000
--- a/MagMan.Data.Tenant/Migrations/20240122174314_InitDb.Designer.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-// <auto-generated />
-using System;
-using MagMan.Data.Tenant;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
-    [DbContext(typeof(MagManContext))]
-    [Migration("20240122174314_InitDb")]
-    partial class InitDb
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.25")
-                .HasAnnotation("Relational:MaxIdentifierLength", 64);
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
-                {
-                    b.Property<string>("Family")
-                        .HasColumnType("varchar(255)");
-
-                    b.Property<string>("ValueOriginal")
-                        .HasColumnType("varchar(255)");
-
-                    b.Property<string>("ValueAlias")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.HasKey("Family", "ValueOriginal");
-
-                    b.ToTable("AliasList");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
-                {
-                    b.Property<string>("KeyName")
-                        .HasMaxLength(50)
-                        .HasColumnType("varchar(50)")
-                        .HasColumnOrder(0);
-
-                    b.Property<string>("Note")
-                        .IsRequired()
-                        .HasMaxLength(250)
-                        .HasColumnType("varchar(250)")
-                        .HasColumnOrder(3);
-
-                    b.Property<string>("Val")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("varchar(50)")
-                        .HasColumnOrder(1);
-
-                    b.Property<string>("ValStd")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("varchar(50)")
-                        .HasColumnOrder(2)
-                        .HasComment("Valore di default/riferimento per la variabile");
-
-                    b.HasKey("KeyName");
-
-                    b.ToTable("Config");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
-                {
-                    b.Property<int>("MatId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<decimal>("HMm")
-                        .HasColumnType("decimal(65,30)");
-
-                    b.Property<decimal>("LMm")
-                        .HasColumnType("decimal(65,30)");
-
-                    b.Property<string>("MatCode")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<string>("MatDesc")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<decimal>("WMm")
-                        .HasColumnType("decimal(65,30)");
-
-                    b.HasKey("MatId");
-
-                    b.ToTable("MaterialsList");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
-                {
-                    b.Property<int>("ProjExtDbId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<string>("BTLFileName")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<DateTime>("DtCreated")
-                        .HasColumnType("datetime(6)");
-
-                    b.Property<DateTime>("DtLastAction")
-                        .HasColumnType("datetime(6)");
-
-                    b.Property<DateTime>("DtSchedule")
-                        .HasColumnType("datetime(6)");
-
-                    b.Property<DateTime>("DtStartProd")
-                        .HasColumnType("datetime(6)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("tinyint(1)");
-
-                    b.Property<bool>("IsArchived")
-                        .HasColumnType("tinyint(1)");
-
-                    b.Property<int>("KeyNum")
-                        .HasColumnType("int");
-
-                    b.Property<string>("ListName")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<string>("Machine")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<int>("MachineID")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PType")
-                        .HasColumnType("int");
-
-                    b.Property<double>("ProcTimeEst")
-                        .HasColumnType("double");
-
-                    b.Property<double>("ProcTimeReal")
-                        .HasColumnType("double");
-
-                    b.Property<string>("ProjDescription")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<int>("ProjExtDbId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ProjExtId")
-                        .HasColumnType("int");
-
-                    b.HasKey("ProjExtDbId");
-
-                    b.HasIndex("IsActive");
-
-                    b.HasIndex("IsArchived");
-
-                    b.HasIndex("KeyNum");
-
-                    b.HasIndex("MachineID");
-
-                    b.HasIndex("ProjExtDbId");
-
-                    b.ToTable("ProjList");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
-                {
-                    b.Property<int>("RawItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<decimal>("HMm")
-                        .HasColumnType("decimal(65,30)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("tinyint(1)");
-
-                    b.Property<bool>("IsRemn")
-                        .HasColumnType("tinyint(1)");
-
-                    b.Property<decimal>("LMm")
-                        .HasColumnType("decimal(65,30)");
-
-                    b.Property<string>("Location")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<int>("MatId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Note")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<int>("QtyAvail")
-                        .HasColumnType("int");
-
-                    b.Property<decimal>("WMm")
-                        .HasColumnType("decimal(65,30)");
-
-                    b.HasKey("RawItemId");
-
-                    b.HasIndex("MatId");
-
-                    b.ToTable("RawItemList");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
-                {
-                    b.Property<int>("RequestId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DtRequest")
-                        .HasColumnType("datetime(6)");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("tinyint(1)");
-
-                    b.Property<int>("ProjExtDbId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ReqState")
-                        .HasColumnType("int");
-
-                    b.HasKey("RequestId");
-
-                    b.ToTable("RequestPlan");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
-                {
-                    b.Property<int>("ResourceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<int>("Qty")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RawItemId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("RequestId")
-                        .HasColumnType("int");
-
-                    b.HasKey("ResourceId");
-
-                    b.HasIndex("RequestId");
-
-                    b.ToTable("ResourceList");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
-                {
-                    b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
-                        .WithMany("RawItemList")
-                        .HasForeignKey("MatId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("MaterialNav");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
-                {
-                    b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
-                        .WithMany("ResourcesList")
-                        .HasForeignKey("RequestId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("RequestNav");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
-                {
-                    b.Navigation("RawItemList");
-                });
-
-            modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
-                {
-                    b.Navigation("ResourcesList");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs b/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs
deleted file mode 100644
index e146473..0000000
--- a/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace MagMan.Data.Tenant.Migrations
-{
-    public partial class AddMovMag : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_ProjList",
-                table: "ProjList");
-
-            migrationBuilder.RenameColumn(
-                name: "ProjExtDbId",
-                table: "RequestPlan",
-                newName: "ProjDbId");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ProjExtDbId",
-                table: "ProjList",
-                type: "int",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "int")
-                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
-
-            migrationBuilder.AddColumn<int>(
-                name: "ProjDbId",
-                table: "ProjList",
-                type: "int",
-                nullable: false,
-                defaultValue: 0)
-                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
-
-            migrationBuilder.AddPrimaryKey(
-                name: "PK_ProjList",
-                table: "ProjList",
-                column: "ProjDbId");
-
-            migrationBuilder.CreateTable(
-                name: "MovMag",
-                columns: table => new
-                {
-                    MovID = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    DtRec = table.Column<DateTime>(type: "datetime(6)", nullable: false),
-                    RawItemId = table.Column<int>(type: "int", nullable: false),
-                    QtyRec = table.Column<int>(type: "int", nullable: false),
-                    UserId = table.Column<string>(type: "longtext", nullable: false)
-                        .Annotation("MySql:CharSet", "utf8mb4"),
-                    Note = table.Column<string>(type: "longtext", nullable: false)
-                        .Annotation("MySql:CharSet", "utf8mb4")
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MovMag", x => x.MovID);
-                    table.ForeignKey(
-                        name: "FK_MovMag_RawItemList_RawItemId",
-                        column: x => x.RawItemId,
-                        principalTable: "RawItemList",
-                        principalColumn: "RawItemId",
-                        onDelete: ReferentialAction.Restrict);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ResourceList_RawItemId",
-                table: "ResourceList",
-                column: "RawItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MovMag_RawItemId",
-                table: "MovMag",
-                column: "RawItemId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_ResourceList_RawItemList_RawItemId",
-                table: "ResourceList",
-                column: "RawItemId",
-                principalTable: "RawItemList",
-                principalColumn: "RawItemId",
-                onDelete: ReferentialAction.Restrict);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_ResourceList_RawItemList_RawItemId",
-                table: "ResourceList");
-
-            migrationBuilder.DropTable(
-                name: "MovMag");
-
-            migrationBuilder.DropIndex(
-                name: "IX_ResourceList_RawItemId",
-                table: "ResourceList");
-
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_ProjList",
-                table: "ProjList");
-
-            migrationBuilder.DropColumn(
-                name: "ProjDbId",
-                table: "ProjList");
-
-            migrationBuilder.RenameColumn(
-                name: "ProjDbId",
-                table: "RequestPlan",
-                newName: "ProjExtDbId");
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ProjExtDbId",
-                table: "ProjList",
-                type: "int",
-                nullable: false,
-                oldClrType: typeof(int),
-                oldType: "int")
-                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
-
-            migrationBuilder.AddPrimaryKey(
-                name: "PK_ProjList",
-                table: "ProjList",
-                column: "ProjExtDbId");
-        }
-    }
-}
diff --git a/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs b/MagMan.Data.Tenant/Migrations/20240125174457_InitDb.Designer.cs
similarity index 99%
rename from MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs
rename to MagMan.Data.Tenant/Migrations/20240125174457_InitDb.Designer.cs
index 6087aa3..13dbc34 100644
--- a/MagMan.Data.Tenant/Migrations/20240125174127_AddMovMag.Designer.cs
+++ b/MagMan.Data.Tenant/Migrations/20240125174457_InitDb.Designer.cs
@@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace MagMan.Data.Tenant.Migrations
 {
     [DbContext(typeof(MagManContext))]
-    [Migration("20240125174127_AddMovMag")]
-    partial class AddMovMag
+    [Migration("20240125174457_InitDb")]
+    partial class InitDb
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
diff --git a/MagMan.Data.Tenant/Migrations/20240122174314_InitDb.cs b/MagMan.Data.Tenant/Migrations/20240125174457_InitDb.cs
similarity index 84%
rename from MagMan.Data.Tenant/Migrations/20240122174314_InitDb.cs
rename to MagMan.Data.Tenant/Migrations/20240125174457_InitDb.cs
index 57b8471..f5d00c4 100644
--- a/MagMan.Data.Tenant/Migrations/20240122174314_InitDb.cs
+++ b/MagMan.Data.Tenant/Migrations/20240125174457_InitDb.cs
@@ -150,6 +150,32 @@ namespace MagMan.Data.Tenant.Migrations
                 })
                 .Annotation("MySql:CharSet", "utf8mb4");
 
+            migrationBuilder.CreateTable(
+                name: "MovMag",
+                columns: table => new
+                {
+                    MovID = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    DtRec = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    RawItemId = table.Column<int>(type: "int", nullable: false),
+                    QtyRec = table.Column<int>(type: "int", nullable: false),
+                    UserId = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Note = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MovMag", x => x.MovID);
+                    table.ForeignKey(
+                        name: "FK_MovMag_RawItemList_RawItemId",
+                        column: x => x.RawItemId,
+                        principalTable: "RawItemList",
+                        principalColumn: "RawItemId",
+                        onDelete: ReferentialAction.Restrict);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
             migrationBuilder.CreateTable(
                 name: "ResourceList",
                 columns: table => new
@@ -163,6 +189,12 @@ namespace MagMan.Data.Tenant.Migrations
                 constraints: table =>
                 {
                     table.PrimaryKey("PK_ResourceList", x => x.ResourceId);
+                    table.ForeignKey(
+                        name: "FK_ResourceList_RawItemList_RawItemId",
+                        column: x => x.RawItemId,
+                        principalTable: "RawItemList",
+                        principalColumn: "RawItemId",
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_ResourceList_RequestPlan_RequestId",
                         column: x => x.RequestId,
@@ -172,6 +204,11 @@ namespace MagMan.Data.Tenant.Migrations
                 })
                 .Annotation("MySql:CharSet", "utf8mb4");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_MovMag_RawItemId",
+                table: "MovMag",
+                column: "RawItemId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_ProjList_IsActive",
                 table: "ProjList",
@@ -202,6 +239,11 @@ namespace MagMan.Data.Tenant.Migrations
                 table: "RawItemList",
                 column: "MatId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_ResourceList_RawItemId",
+                table: "ResourceList",
+                column: "RawItemId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_ResourceList_RequestId",
                 table: "ResourceList",
@@ -217,19 +259,22 @@ namespace MagMan.Data.Tenant.Migrations
                 name: "Config");
 
             migrationBuilder.DropTable(
-                name: "ProjList");
+                name: "MovMag");
 
             migrationBuilder.DropTable(
-                name: "RawItemList");
+                name: "ProjList");
 
             migrationBuilder.DropTable(
                 name: "ResourceList");
 
             migrationBuilder.DropTable(
-                name: "MaterialsList");
+                name: "RawItemList");
 
             migrationBuilder.DropTable(
                 name: "RequestPlan");
+
+            migrationBuilder.DropTable(
+                name: "MaterialsList");
         }
     }
 }

From 32999677ea7bb7529809a45a5ccc0ea5c09e56fd Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 25 Jan 2024 19:44:28 +0100
Subject: [PATCH 5/5] Aggiunta registrazione tipii comvimento in mag

---
 MagMan.Core/Services/MessageService.cs        |   4 +-
 .../Controllers/TenantController.cs           | 139 +++++--
 MagMan.Data.Tenant/Services/TenantService.cs  | 354 +++++++++---------
 MagMan.UI/Components/ItemEdit.razor.cs        |  30 +-
 MagMan.UI/Components/ItemMan.razor.cs         |   2 +-
 MagMan.UI/Components/LoginDisplay.razor.cs    |  23 +-
 MagMan.UI/Components/MovMag.razor             |  61 ++-
 MagMan.UI/Controllers/InventoryController.cs  |   2 +-
 MagMan.UI/Controllers/ResourcesController.cs  |  16 +-
 MagMan.UI/MagMan.UI.csproj                    |   2 +-
 MagMan.UI/Pages/WareHouse.razor               |   1 +
 Resources/ChangeLog.html                      |   2 +-
 Resources/VersNum.txt                         |   2 +-
 Resources/manifest.xml                        |   2 +-
 14 files changed, 379 insertions(+), 261 deletions(-)

diff --git a/MagMan.Core/Services/MessageService.cs b/MagMan.Core/Services/MessageService.cs
index 53e12ad..8ce9bbc 100644
--- a/MagMan.Core/Services/MessageService.cs
+++ b/MagMan.Core/Services/MessageService.cs
@@ -30,7 +30,7 @@ namespace MagMan.Core.Services
         public event Action EA_PageUpdated = null!;
         public event Action EA_SearchUpdated = null!;
         public event Action EA_ShowSearch = null!;
-        public event Action EA_CustomerSel = null!; 
+        public event Action EA_CustomerSel = null!;
 
         #endregion Public Events
 
@@ -57,6 +57,8 @@ namespace MagMan.Core.Services
 
         #region Public Properties
 
+        public string UserName { get; set; } = "NA";
+
         public string PageIcon
         {
             get => _pageIcon;
diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs
index 8503907..873a760 100644
--- a/MagMan.Data.Tenant/Controllers/TenantController.cs
+++ b/MagMan.Data.Tenant/Controllers/TenantController.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace MagMan.Data.Tenant.Controllers
 {
@@ -23,30 +24,6 @@ namespace MagMan.Data.Tenant.Controllers
 
         #endregion Public Constructors
 
-
-        /// <summary>
-        /// Elenco MovMag dato Item
-        /// </summary>
-        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
-        /// <param name="rawItemID">ID dell'item x cui filtrare, 0 = tutti</param>
-        /// <param name="maxRec">numMax record da leggere, default 1000</param>
-        /// <returns></returns>
-        public List<MovMagModel> MovMagGetFilt(string connString, int rawItemID, int maxRec = 1000)
-        {
-            List<MovMagModel> dbResult = new List<MovMagModel>();
-            using (MagManContext dbCtx = new MagManContext(connString))
-            {
-                dbResult = dbCtx
-                            .DbSetMovMag
-                            .Where(x => rawItemID == 0 || x.RawItemId == rawItemID)
-                            //.Include(c => c.ItemNav)
-                            .OrderByDescending(x => x.DtRec)
-                            .Take(maxRec)
-                            .ToList();
-            }
-            return dbResult;
-        }
-
         #region Public Methods
 
         public async Task<bool> DatabaseMigrate(string connString)
@@ -144,11 +121,15 @@ namespace MagMan.Data.Tenant.Controllers
             return dbResult;
         }
 
-        /// <summary> Aggiunge/Modifica un item in magazzino </summary> <param
-        /// name="connString">Stringa connessione (variabile x cliente)</param> <param
-        /// name="rec2upd">Record da aggiornare</param> <param name="deltaQty">quantità da
-        /// aggiornare (se <0 è consumo)</param> <returns></returns>
-        public bool ItemModQty(string connString, RawItemModel rec2upd, int deltaQty)
+        /// <summary> 
+        /// Aggiunge/Modifica un item in magazzino 
+        /// </summary> 
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param> 
+        /// <param name="rec2upd">Record da aggiornare</param> 
+        /// <param name="deltaQty">quantità da aggiornare (se <0 è consumo)</param>
+        /// <param name="userId">User corrente (SE applicabile)</param>
+        /// <returns></returns>
+        public bool ItemModQty(string connString, RawItemModel rec2upd, int deltaQty, string userId)
         {
             bool done = false;
             using (MagManContext dbCtx = new MagManContext(connString))
@@ -167,6 +148,16 @@ namespace MagMan.Data.Tenant.Controllers
                         .FirstOrDefault();
                     if (currData != null)
                     {
+                        MovMagModel recMovMag = new MovMagModel()
+                        {
+                            DtRec = DateTime.Now,
+                            RawItemId = rec2upd.RawItemId,
+                            QtyRec = deltaQty,
+                            UserId = userId,
+                            Note = deltaQty > 0 ? "M01+: Rettifica Inventariale" : "M01-: Rettifica Inventariale"
+                        };
+                        dbCtx.DbSetMovMag.Add(recMovMag);
+
                         currData.QtyAvail += deltaQty;
                         dbCtx.Entry(currData).State = EntityState.Modified;
                     }
@@ -186,8 +177,9 @@ namespace MagMan.Data.Tenant.Controllers
         /// </summary>
         /// <param name="connString">Stringa connessione (variabile x cliente)</param>
         /// <param name="rec2upd">Record da aggiungere/aggiornare</param>
+        /// <param name="userId">User corrente (SE applicabile)</param>
         /// <returns></returns>
-        public bool ItemUpdate(string connString, RawItemModel rec2upd)
+        public bool ItemUpdate(string connString, RawItemModel rec2upd, string userId)
         {
             bool done = false;
             using (MagManContext dbCtx = new MagManContext(connString))
@@ -206,6 +198,22 @@ namespace MagMan.Data.Tenant.Controllers
                         .FirstOrDefault();
                     if (currData != null)
                     {
+                        // aggiungo record variazione quantità...
+                        int delta = rec2upd.QtyAvail - currData.QtyAvail;
+                        if (delta != 0)
+                        {
+                            MovMagModel recMovMag = new MovMagModel()
+                            {
+                                DtRec = DateTime.Now,
+                                RawItemId = rec2upd.RawItemId,
+                                QtyRec = delta,
+                                UserId = userId,
+                                Note = delta > 0 ? "M02+: Rettifica Inventariale" : "M02-: Rettifica Inventariale"
+                            };
+                            dbCtx.DbSetMovMag.Add(recMovMag);
+                        }
+
+                        // sistemo record...
                         currData.MatId = rec2upd.MatId;
                         currData.QtyAvail = rec2upd.QtyAvail;
                         currData.IsActive = rec2upd.IsActive;
@@ -222,6 +230,17 @@ namespace MagMan.Data.Tenant.Controllers
                         dbCtx
                             .DbSetItems
                             .Add(rec2upd);
+                        dbCtx.SaveChanges();
+
+                        // aggiungo record variazione quantità...
+                        MovMagModel recMovMag = new MovMagModel()
+                        {
+                            DtRec = DateTime.Now,
+                            RawItemId = rec2upd.RawItemId,
+                            QtyRec = rec2upd.QtyAvail,
+                            Note = rec2upd.QtyAvail > 0 ? "M03+: Aggiunta Record" : "M03+: Aggiunta Record"
+                        };
+                        dbCtx.DbSetMovMag.Add(recMovMag);
                     }
                     dbCtx.SaveChanges();
                     done = true;
@@ -449,6 +468,29 @@ namespace MagMan.Data.Tenant.Controllers
             return done;
         }
 
+        /// <summary>
+        /// Elenco MovMag dato Item
+        /// </summary>
+        /// <param name="connString">Stringa connessione (variabile x cliente)</param>
+        /// <param name="rawItemID">ID dell'item x cui filtrare, 0 = tutti</param>
+        /// <param name="maxRec">numMax record da leggere, default 1000</param>
+        /// <returns></returns>
+        public List<MovMagModel> MovMagGetFilt(string connString, int rawItemID, int maxRec = 1000)
+        {
+            List<MovMagModel> dbResult = new List<MovMagModel>();
+            using (MagManContext dbCtx = new MagManContext(connString))
+            {
+                dbResult = dbCtx
+                            .DbSetMovMag
+                            .Where(x => rawItemID == 0 || x.RawItemId == rawItemID)
+                            //.Include(c => c.ItemNav)
+                            .OrderByDescending(x => x.DtRec)
+                            .Take(maxRec)
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elimina record Project
         /// </summary>
@@ -770,10 +812,10 @@ namespace MagMan.Data.Tenant.Controllers
         /// </summary>
         /// <param name="connString">Stringa connessione (variabile x cliente)</param>
         /// <param name="recList">Elenco record da aggiungere/aggiornare</param>
-        /// &gt;
         /// <param name="resState">Tipo di aggiornamento da registratre</param>
+        /// <param name="userId">User corrente (SE applicabile)</param>
         /// <returns></returns>
-        public int ResourceUpdate(string connString, List<ResourceModel> recList, Enums.ProjResState resState)
+        public int ResourceUpdate(string connString, List<ResourceModel> recList, Enums.ProjResState resState, string userId)
         {
             int numMod = 0;
             using (MagManContext dbCtx = new MagManContext(connString))
@@ -793,12 +835,45 @@ namespace MagMan.Data.Tenant.Controllers
                         // aggiorno
                         if (currData != null)
                         {
+                            if (resState == Enums.ProjResState.Consumed)
+                            {
+                                // aggiungo record variazione quantità...
+                                int delta = rec2upd.Qty - currData.Qty;
+                                if (delta != 0)
+                                {
+                                    MovMagModel recMovMag = new MovMagModel()
+                                    {
+                                        DtRec = DateTime.Now,
+                                        RawItemId = rec2upd.RawItemId,
+                                        QtyRec = delta,
+                                        UserId = userId,
+                                        Note = delta > 0 ? "M04+: Aggiunta Risorsa" : "M04-: Consumo Risorsa"
+                                    };
+                                    dbCtx.DbSetMovMag.Add(recMovMag);
+                                }
+                            }
+
+                            // aggiorno le risorse
                             currData.Qty = rec2upd.Qty;
                             currData.RawItemId = rec2upd.RawItemId;
                             dbCtx.Entry(currData).State = EntityState.Modified;
                         }
                         else
                         {
+                            if (resState == Enums.ProjResState.Consumed)
+                            {
+                                // aggiungo record variazione quantità...
+                                MovMagModel recMovMag = new MovMagModel()
+                                {
+                                    DtRec = DateTime.Now,
+                                    RawItemId = rec2upd.RawItemId,
+                                    QtyRec = rec2upd.Qty,
+                                    UserId = userId,
+                                    Note = rec2upd.Qty > 0 ? "M05+: Aggiunta Risorsa" : "M05-: Consumo Risorsa"
+                                };
+                                dbCtx.DbSetMovMag.Add(recMovMag);
+                            }
+
                             // aggiungo record
                             dbCtx
                                 .DbSetResources
diff --git a/MagMan.Data.Tenant/Services/TenantService.cs b/MagMan.Data.Tenant/Services/TenantService.cs
index a911361..52d4510 100644
--- a/MagMan.Data.Tenant/Services/TenantService.cs
+++ b/MagMan.Data.Tenant/Services/TenantService.cs
@@ -206,70 +206,19 @@ namespace MagMan.Data.Tenant.Services
         }
 
         /// <summary>
-        /// Elenco MovMag dato Item
+        /// Update record Item per quantità + refresh cache
         /// </summary>
         /// <param name="nKey">Key di riferimento</param>
-        /// <param name="rawItemID">ID dell'item x cui filtrare, 0 = tutti</param>
-        /// <param name="maxRec">numMax record da leggere, default 1000</param>
+        /// <param name="currItem">Item interesato</param>
+        /// <param name="userId">User corrente (SE applicabile)</param>
         /// <returns></returns>
-        public async Task<List<MovMagModel>> MovMagGetFilt(int nKey, int rawItemID, int maxRec = 1000)
-        {
-            string source = "DB";
-            string cString = ConnString(nKey);
-            List<MovMagModel>? dbResult = new List<MovMagModel>();
-            try
-            {
-                // in cache tengo dati estratti ogni minuto...
-                string dtKey = DateTime.Now.ToString("yyMMdd:HHmm");
-                string currKey = $"{Const.rKeyConfig}:{nKey}:MovMag:{rawItemID}:{dtKey}";
-                Stopwatch stopWatch = new Stopwatch();
-                stopWatch.Start();
-                string? rawData = await redisDb.StringGetAsync(currKey);
-                if (!string.IsNullOrEmpty(rawData))
-                {
-                    source = "REDIS";
-                    var tempResult = JsonConvert.DeserializeObject<List<MovMagModel>>(rawData);
-                    if (tempResult == null)
-                    {
-                        dbResult = new List<MovMagModel>();
-                    }
-                    else
-                    {
-                        dbResult = tempResult;
-                    }
-                }
-                else
-                {
-                    dbResult = dbController.MovMagGetFilt(cString, rawItemID, maxRec);
-                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
-                    await redisDb.StringSetAsync(currKey, rawData, LongCache);
-                }
-                if (dbResult == null)
-                {
-                    dbResult = new List<MovMagModel>();
-                }
-                stopWatch.Stop();
-                TimeSpan ts = stopWatch.Elapsed;
-                Log.Debug($"MovMagGetFilt | {source} in: {ts.TotalMilliseconds} ms");
-            }
-            catch (Exception exc)
-            {
-                Log.Error($"Error during MovMagGetFilt:{Environment.NewLine}{exc}");
-            }
-            return dbResult;
-        }
-
-
-            /// <summary> Update record Item + refresh cache </summary> <param name="nKey">Key di
-            /// riferimento</param> <param name="currItem">Item interesato</param> <param
-            /// name="deltaQty">quantità da aggiornare (se <0 è consumo)</param> <returns></returns>
-            public async Task<bool> ItemModQty(int nKey, RawItemModel currItem, int deltaQty)
+        public async Task<bool> ItemModQty(int nKey, RawItemModel currItem, int deltaQty, string userId)
         {
             bool fatto = false;
             string cString = ConnString(nKey);
             try
             {
-                fatto = dbController.ItemModQty(cString, currItem, deltaQty);
+                fatto = dbController.ItemModQty(cString, currItem, deltaQty, userId);
                 if (fatto)
                 {
                     await FlushRedisCache();
@@ -287,14 +236,15 @@ namespace MagMan.Data.Tenant.Services
         /// </summary>
         /// <param name="nKey">Key di riferimento</param>
         /// <param name="currItem">Item interesato</param>
+        /// <param name="userId">User corrente (SE applicabile)</param>
         /// <returns></returns>
-        public async Task<bool> ItemUpdate(int nKey, RawItemModel currItem)
+        public async Task<bool> ItemUpdate(int nKey, RawItemModel currItem, string userId)
         {
             bool fatto = false;
             string cString = ConnString(nKey);
             try
             {
-                fatto = dbController.ItemUpdate(cString, currItem);
+                fatto = dbController.ItemUpdate(cString, currItem, userId);
                 if (fatto)
                 {
                     await FlushRedisCache();
@@ -332,6 +282,64 @@ namespace MagMan.Data.Tenant.Services
             return fatto;
         }
 
+        /// <summary>
+        /// Lista Materiali gestiti a magazzino in formato DTO
+        /// </summary>
+        /// <param name="nKey">Key di riferimento</param>
+        /// <param name="withChild">Se true allora include record child (Items)</param>
+        /// <returns></returns>
+        public async Task<List<MaterialDTO>> MaterialDtoGetAll(int nKey, bool withChild)
+        {
+            string source = "DB";
+            string cString = ConnString(nKey);
+            List<MaterialDTO>? dbResult = new List<MaterialDTO>();
+            try
+            {
+                string dType = withChild ? "MaterialsDtoFull" : "MaterialsDto";
+                string currKey = $"{Const.rKeyConfig}:{dType}:{nKey}";
+                Stopwatch stopWatch = new Stopwatch();
+                stopWatch.Start();
+                string? rawData = await redisDb.StringGetAsync(currKey);
+                if (!string.IsNullOrEmpty(rawData))
+                {
+                    source = "REDIS";
+                    var tempResult = JsonConvert.DeserializeObject<List<MaterialDTO>>(rawData);
+                    if (tempResult == null)
+                    {
+                        dbResult = new List<MaterialDTO>();
+                    }
+                    else
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                else
+                {
+                    dbResult = dbController.MaterialDtoGetAll(cString, withChild);
+                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
+                    await redisDb.StringSetAsync(currKey, rawData, LongCache);
+                    // per evitare loopback uso deserialize...
+                    var tempResult = JsonConvert.DeserializeObject<List<MaterialDTO>>(rawData);
+                    if (tempResult != null)
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                if (dbResult == null)
+                {
+                    dbResult = new List<MaterialDTO>();
+                }
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"MaterialDtoGetAll | {source} in: {ts.TotalMilliseconds} ms");
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Error during MaterialDtoGetAll:{Environment.NewLine}{exc}");
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Converte il DTO in MaterialModel
         /// </summary>
@@ -413,64 +421,6 @@ namespace MagMan.Data.Tenant.Services
             return dbResult;
         }
 
-        /// <summary>
-        /// Lista Materiali gestiti a magazzino in formato DTO
-        /// </summary>
-        /// <param name="nKey">Key di riferimento</param>
-        /// <param name="withChild">Se true allora include record child (Items)</param>
-        /// <returns></returns>
-        public async Task<List<MaterialDTO>> MaterialDtoGetAll(int nKey, bool withChild)
-        {
-            string source = "DB";
-            string cString = ConnString(nKey);
-            List<MaterialDTO>? dbResult = new List<MaterialDTO>();
-            try
-            {
-                string dType = withChild ? "MaterialsDtoFull" : "MaterialsDto";
-                string currKey = $"{Const.rKeyConfig}:{dType}:{nKey}";
-                Stopwatch stopWatch = new Stopwatch();
-                stopWatch.Start();
-                string? rawData = await redisDb.StringGetAsync(currKey);
-                if (!string.IsNullOrEmpty(rawData))
-                {
-                    source = "REDIS";
-                    var tempResult = JsonConvert.DeserializeObject<List<MaterialDTO>>(rawData);
-                    if (tempResult == null)
-                    {
-                        dbResult = new List<MaterialDTO>();
-                    }
-                    else
-                    {
-                        dbResult = tempResult;
-                    }
-                }
-                else
-                {
-                    dbResult = dbController.MaterialDtoGetAll(cString, withChild);
-                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
-                    await redisDb.StringSetAsync(currKey, rawData, LongCache);
-                    // per evitare loopback uso deserialize...
-                    var tempResult = JsonConvert.DeserializeObject<List<MaterialDTO>>(rawData);
-                    if (tempResult != null)
-                    {
-                        dbResult = tempResult;
-                    }
-                }
-                if (dbResult == null)
-                {
-                    dbResult = new List<MaterialDTO>();
-                }
-                stopWatch.Stop();
-                TimeSpan ts = stopWatch.Elapsed;
-                Log.Debug($"MaterialDtoGetAll | {source} in: {ts.TotalMilliseconds} ms");
-            }
-            catch (Exception exc)
-            {
-                Log.Error($"Error during MaterialDtoGetAll:{Environment.NewLine}{exc}");
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Lista Materiali gestiti a magazzino
         /// </summary>
@@ -555,6 +505,60 @@ namespace MagMan.Data.Tenant.Services
             return fatto;
         }
 
+        /// <summary>
+        /// Elenco MovMag dato Item
+        /// </summary>
+        /// <param name="nKey">Key di riferimento</param>
+        /// <param name="rawItemID">ID dell'item x cui filtrare, 0 = tutti</param>
+        /// <param name="maxRec">numMax record da leggere, default 1000</param>
+        /// <returns></returns>
+        public async Task<List<MovMagModel>> MovMagGetFilt(int nKey, int rawItemID, int maxRec = 1000)
+        {
+            string source = "DB";
+            string cString = ConnString(nKey);
+            List<MovMagModel>? dbResult = new List<MovMagModel>();
+            try
+            {
+                // in cache tengo dati estratti ogni minuto...
+                string dtKey = DateTime.Now.ToString("yyMMdd:HHmm");
+                string currKey = $"{Const.rKeyConfig}:{nKey}:MovMag:{rawItemID}:{dtKey}";
+                Stopwatch stopWatch = new Stopwatch();
+                stopWatch.Start();
+                string? rawData = await redisDb.StringGetAsync(currKey);
+                if (!string.IsNullOrEmpty(rawData))
+                {
+                    source = "REDIS";
+                    var tempResult = JsonConvert.DeserializeObject<List<MovMagModel>>(rawData);
+                    if (tempResult == null)
+                    {
+                        dbResult = new List<MovMagModel>();
+                    }
+                    else
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                else
+                {
+                    dbResult = dbController.MovMagGetFilt(cString, rawItemID, maxRec);
+                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
+                    await redisDb.StringSetAsync(currKey, rawData, LongCache);
+                }
+                if (dbResult == null)
+                {
+                    dbResult = new List<MovMagModel>();
+                }
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"MovMagGetFilt | {source} in: {ts.TotalMilliseconds} ms");
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Error during MovMagGetFilt:{Environment.NewLine}{exc}");
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elimina record Project + refresh cache
         /// </summary>
@@ -780,61 +784,6 @@ namespace MagMan.Data.Tenant.Services
             return answ;
         }
 
-        /// <summary>
-        /// Elenco risorse dato progetto e stato
-        /// </summary>
-        /// <param name="nKey">Key di riferimento</param>
-        /// <param name="projDbId">ID progetto</param>
-        /// <param name="isEstim">true = ultima stima attiva / false = consumi effettivi</param>
-        /// <param name="showAll">true= mostra ANCHE archiviate, false = solo attive</param>
-        /// <returns></returns>
-        public async Task<List<ResourceModel>> ResourcesGetByProject(int nKey, int projDbId, bool isEstim, bool showAll)
-        {
-            string source = "DB";
-            string cString = ConnString(nKey);
-            List<ResourceModel>? dbResult = new List<ResourceModel>();
-            try
-            {
-                string tagEst = isEstim ? "EST" : "CON";
-                string tagAct = showAll ? "ALL" : "ACT";
-                string currKey = $"{Const.rKeyConfig}:{nKey}:ResList:{projDbId}:{tagEst}:{tagAct}";
-                Stopwatch stopWatch = new Stopwatch();
-                stopWatch.Start();
-                string? rawData = await redisDb.StringGetAsync(currKey);
-                if (!string.IsNullOrEmpty(rawData))
-                {
-                    source = "REDIS";
-                    var tempResult = JsonConvert.DeserializeObject<List<ResourceModel>>(rawData);
-                    if (tempResult == null)
-                    {
-                        dbResult = new List<ResourceModel>();
-                    }
-                    else
-                    {
-                        dbResult = tempResult;
-                    }
-                }
-                else
-                {
-                    dbResult = dbController.ResourcesGetByProject(cString, projDbId, isEstim, showAll);
-                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
-                    await redisDb.StringSetAsync(currKey, rawData, FastCache);
-                }
-                if (dbResult == null)
-                {
-                    dbResult = new List<ResourceModel>();
-                }
-                stopWatch.Stop();
-                TimeSpan ts = stopWatch.Elapsed;
-                Log.Debug($"ResourcesGetByProject | {source} in: {ts.TotalMilliseconds} ms");
-            }
-            catch (Exception exc)
-            {
-                Log.Error($"Error during ResourcesGetByProject:{Environment.NewLine}{exc}");
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Elenco risorse dato progetto e stato
         /// </summary>
@@ -890,20 +839,77 @@ namespace MagMan.Data.Tenant.Services
             return dbResult;
         }
 
+        /// <summary>
+        /// Elenco risorse dato progetto e stato
+        /// </summary>
+        /// <param name="nKey">Key di riferimento</param>
+        /// <param name="projDbId">ID progetto</param>
+        /// <param name="isEstim">true = ultima stima attiva / false = consumi effettivi</param>
+        /// <param name="showAll">true= mostra ANCHE archiviate, false = solo attive</param>
+        /// <returns></returns>
+        public async Task<List<ResourceModel>> ResourcesGetByProject(int nKey, int projDbId, bool isEstim, bool showAll)
+        {
+            string source = "DB";
+            string cString = ConnString(nKey);
+            List<ResourceModel>? dbResult = new List<ResourceModel>();
+            try
+            {
+                string tagEst = isEstim ? "EST" : "CON";
+                string tagAct = showAll ? "ALL" : "ACT";
+                string currKey = $"{Const.rKeyConfig}:{nKey}:ResList:{projDbId}:{tagEst}:{tagAct}";
+                Stopwatch stopWatch = new Stopwatch();
+                stopWatch.Start();
+                string? rawData = await redisDb.StringGetAsync(currKey);
+                if (!string.IsNullOrEmpty(rawData))
+                {
+                    source = "REDIS";
+                    var tempResult = JsonConvert.DeserializeObject<List<ResourceModel>>(rawData);
+                    if (tempResult == null)
+                    {
+                        dbResult = new List<ResourceModel>();
+                    }
+                    else
+                    {
+                        dbResult = tempResult;
+                    }
+                }
+                else
+                {
+                    dbResult = dbController.ResourcesGetByProject(cString, projDbId, isEstim, showAll);
+                    rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
+                    await redisDb.StringSetAsync(currKey, rawData, FastCache);
+                }
+                if (dbResult == null)
+                {
+                    dbResult = new List<ResourceModel>();
+                }
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Debug($"ResourcesGetByProject | {source} in: {ts.TotalMilliseconds} ms");
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Error during ResourcesGetByProject:{Environment.NewLine}{exc}");
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Aggiunge/Modifica un record Resource
         /// </summary>
         /// <param name="nKey">Key di riferimento</param>
-        /// <param name="recList">Elenco record da aggiungere/aggiornare</param>>
+        /// <param name="recList">Elenco record da aggiungere/aggiornare</param>
+        /// &gt;
         /// <param name="resState">Tipo di aggiornamento da registratre</param>
+        /// <param name="userId">User corrente (SE applicabile)</param>
         /// <returns></returns>
-        public async Task<int> ResourceUpdate(int nKey, List<ResourceModel> recList, Enums.ProjResState resState)
+        public async Task<int> ResourceUpdate(int nKey, List<ResourceModel> recList, Enums.ProjResState resState, string userId)
         {
             int newId = 0;
             string cString = ConnString(nKey);
             try
             {
-                newId = dbController.ResourceUpdate(cString, recList, resState);
+                newId = dbController.ResourceUpdate(cString, recList, resState, userId);
                 if (newId > 0)
                 {
                     await FlushRedisCache();
diff --git a/MagMan.UI/Components/ItemEdit.razor.cs b/MagMan.UI/Components/ItemEdit.razor.cs
index 451b3ec..f227cdb 100644
--- a/MagMan.UI/Components/ItemEdit.razor.cs
+++ b/MagMan.UI/Components/ItemEdit.razor.cs
@@ -1,3 +1,4 @@
+using MagMan.Core.Services;
 using MagMan.Data.Tenant.DbModels;
 using MagMan.Data.Tenant.Services;
 using Microsoft.AspNetCore.Components;
@@ -11,15 +12,19 @@ namespace MagMan.UI.Components
         [Parameter]
         public RawItemModel? CurrRecord { get; set; } = null;
 
-        [Parameter]
-        public int KeyNum { get; set; } = 0;
         [Parameter]
         public EventCallback<bool> EC_update { get; set; }
 
+        [Parameter]
+        public int KeyNum { get; set; } = 0;
+
         #endregion Public Properties
 
         #region Protected Properties
 
+        [Inject]
+        protected MessageService AppMService { get; set; } = null!;
+
         [Inject]
         protected TenantService TService { get; set; } = null!;
 
@@ -27,24 +32,35 @@ namespace MagMan.UI.Components
 
         #region Protected Methods
 
+        protected async Task DoCancel()
+        {
+            await EC_update.InvokeAsync(true);
+        }
+
         protected async Task DoSave()
         {
             bool fatto = false;
             await Task.Delay(1);
             if (CurrRecord != null)
             {
-                fatto = await TService.ItemUpdate(KeyNum, CurrRecord);
+                fatto = await TService.ItemUpdate(KeyNum, CurrRecord, userName);
             }
             if (fatto)
             {
                 await EC_update.InvokeAsync(true);
             }
         }
-        protected async Task DoCancel()
-        {
-            await EC_update.InvokeAsync(true);
-        }
 
         #endregion Protected Methods
+
+        #region Private Properties
+
+        private string userName
+        {
+            get => AppMService.UserName;
+            set => AppMService.UserName = value;
+        }
+
+        #endregion Private Properties
     }
 }
\ No newline at end of file
diff --git a/MagMan.UI/Components/ItemMan.razor.cs b/MagMan.UI/Components/ItemMan.razor.cs
index 7fab80e..1e6236f 100644
--- a/MagMan.UI/Components/ItemMan.razor.cs
+++ b/MagMan.UI/Components/ItemMan.razor.cs
@@ -98,7 +98,7 @@ namespace MagMan.UI.Components
         {
             if (selItem != null)
             {
-                RawItemId = selItem.MatId;
+                RawItemId = selItem.RawItemId;
             }
             else
             {
diff --git a/MagMan.UI/Components/LoginDisplay.razor.cs b/MagMan.UI/Components/LoginDisplay.razor.cs
index 688b909..3e7fb6b 100644
--- a/MagMan.UI/Components/LoginDisplay.razor.cs
+++ b/MagMan.UI/Components/LoginDisplay.razor.cs
@@ -1,16 +1,19 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
+// Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this
+// file to you under the MIT license.
+using MagMan.Core.Services;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 
 namespace MagMan.UI.Components
 {
     public partial class LoginDisplay
     {
-        #region Private Fields
+        #region Protected Properties
 
-        private string userName = "";
+        [Inject]
+        protected MessageService AppMService { get; set; } = null!;
 
-        #endregion Private Fields
+        #endregion Protected Properties
 
         #region Protected Methods
 
@@ -26,6 +29,16 @@ namespace MagMan.UI.Components
 
         #endregion Protected Methods
 
+        #region Private Properties
+
+        private string userName
+        {
+            get => AppMService.UserName;
+            set => AppMService.UserName = value;
+        }
+
+        #endregion Private Properties
+
         #region Private Methods
 
         private async Task forceReload()
diff --git a/MagMan.UI/Components/MovMag.razor b/MagMan.UI/Components/MovMag.razor
index 1b93ee6..03497ee 100644
--- a/MagMan.UI/Components/MovMag.razor
+++ b/MagMan.UI/Components/MovMag.razor
@@ -2,27 +2,27 @@
     <div class="card-header">
         <div class="d-flex justify-content-between">
             <div class="px-2">
-                <h3>Movimenti Magazzino</h3>
+                <h5>Movimenti Magazzino</h5>
+            </div>
+            @*  <div class="px-2">
+            <div class="d-flex">
+            <div class="px-2">
+            @if (CurrItem == null)
+            {
+            <button class="btn btn-success" @onclick="()=>CreateNew()"><i class="fa-solid fa-square-plus"></i> Add New</button>
+            }
+            else
+            {
+            <button class="btn btn-warning" @onclick="()=> DoEdit(null)"><i class="fa-solid fa-ban"></i> Cancel</button>
+            }
+            </div>
             </div>
-           @*  <div class="px-2">
-                <div class="d-flex">
-                    <div class="px-2">
-                        @if (CurrItem == null)
-                        {
-                            <button class="btn btn-success" @onclick="()=>CreateNew()"><i class="fa-solid fa-square-plus"></i> Add New</button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-warning" @onclick="()=> DoEdit(null)"><i class="fa-solid fa-ban"></i> Cancel</button>
-                        }
-                    </div>
-                </div>
             </div> *@
         </div>
         @* @if (CurrItem != null)
         {
-            <hr />
-            <ItemEdit CurrRecord="CurrItem" EC_update="ForceReload"></ItemEdit>
+        <hr />
+        <ItemEdit CurrRecord="CurrItem" EC_update="ForceReload"></ItemEdit>
         } *@
     </div>
     <div class="card-body p-1">
@@ -40,37 +40,36 @@
                 <thead>
                     <tr class="">
                         @* <th>
-                            <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(null)"><i class="fa-solid fa-rotate"></i></button>
-                        </th> *@
+                    <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(null)"><i class="fa-solid fa-rotate"></i></button>
+                    </th> *@
                         <th>Id <Sorter ParamName="RawItemId" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                         <th>Data <Sorter ParamName="Location" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                         <th class="text-end"><Sorter ParamName="QtyRec" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Qty</th>
-                        <th>Note <Sorter ParamName="Note" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
-                        <th class="text-end"><Sorter ParamName="L" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> User</th>
+                        <th class="text-end"><Sorter ParamName="Note" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter> Note</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach (var item in ListRecords)
                     {
                         <tr class="align-middle @CheckSel(item)">
-                           @*  <td>
-                                <button class="btn btn-info btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
-                                <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(item)"><i class="fa-solid fa-edit"></i></button>
-                            </td> *@
-                            <td class="text-end fs-5">
-                                <b>@item.MovID</b>
+                            @*  <td>
+                    <button class="btn btn-info btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
+                    <button class="btn btn-primary btn-sm" @onclick="() => DoEdit(item)"><i class="fa-solid fa-edit"></i></button>
+                    </td> *@
+                            <td>
+                                <small>@item.MovID</small>
                             </td>
                             <td>
                                 @item.DtRec.ToString("yyyy-MM-dd HH:mm:ss")
                             </td>
-                            <td>
+                            <td class="text-end fs-5">
                                 <b>@item.QtyRec</b>
                             </td>
-                            <td>
-                                @item.Note
-                            </td>
                             <td class="text-end">
-                                @item.UserId
+                                @item.Note
+                                <div class="small">
+                                    @item.UserId
+                                </div>
                             </td>
                         </tr>
                     }
diff --git a/MagMan.UI/Controllers/InventoryController.cs b/MagMan.UI/Controllers/InventoryController.cs
index f71323c..54c3f99 100644
--- a/MagMan.UI/Controllers/InventoryController.cs
+++ b/MagMan.UI/Controllers/InventoryController.cs
@@ -101,7 +101,7 @@ namespace MagMan.UI.Controllers
                     {
                         try
                         {
-                            await TService.ItemUpdate(nKey, item);
+                            await TService.ItemUpdate(nKey, item, $"Key: {nKey}");
                             fatto = true;
                         }
                         catch (Exception exc)
diff --git a/MagMan.UI/Controllers/ResourcesController.cs b/MagMan.UI/Controllers/ResourcesController.cs
index 534d3d8..1452fd7 100644
--- a/MagMan.UI/Controllers/ResourcesController.cs
+++ b/MagMan.UI/Controllers/ResourcesController.cs
@@ -99,13 +99,14 @@ namespace MagMan.UI.Controllers
                 {
                     // recupero ID interno da id esterno...
                     int ProjDbId = 0;
+                    ProjModel? projRec = null;
                     var allProj = await TService.ProjectGetByMachine(nKey, 0);
                     if (allProj != null)
                     {
-                        var pRec = allProj.Find(x => x.ProjExtDbId == projectData.ProjExtDbId);
-                        if (pRec != null)
+                        projRec = allProj.Find(x => x.ProjExtDbId == projectData.ProjExtDbId);
+                        if (projRec != null)
                         {
-                            ProjDbId = pRec.ProjDbId;
+                            ProjDbId = projRec.ProjDbId;
                         }
                     }
                     if (ProjDbId > 0)
@@ -127,8 +128,13 @@ namespace MagMan.UI.Controllers
                             listRes = projectData.ResourceList.Select(x => TService.ResourceFromDto(x, reqId)).ToList();
                             try
                             {
-                                await TService.ResourceUpdate(nKey, listRes, projectData.ReqState);
-
+                                string kDesc = $"K{nKey}";
+                                string prDesc = kDesc;
+                                if (projRec != null)
+                                {
+                                    prDesc = $"P: {projRec.ProjExtId}.{projRec.ProjExtDbId} | {projRec.ProjDescription} ({projRec.Machine})";
+                                }
+                                await TService.ResourceUpdate(nKey, listRes, projectData.ReqState, $"{prDesc} | {kDesc}");
                                 fatto = true;
                             }
                             catch (Exception exc)
diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj
index 8b8ef5f..744bae2 100644
--- a/MagMan.UI/MagMan.UI.csproj
+++ b/MagMan.UI/MagMan.UI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-        <Version>1.0.2401.2518</Version>
+        <Version>1.0.2401.2519</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
diff --git a/MagMan.UI/Pages/WareHouse.razor b/MagMan.UI/Pages/WareHouse.razor
index 8000cb4..ff316c1 100644
--- a/MagMan.UI/Pages/WareHouse.razor
+++ b/MagMan.UI/Pages/WareHouse.razor
@@ -22,6 +22,7 @@ else
                 <ItemMan CustomerId="@CustomerID" KeyNum="@nKey" MaterialSel="@MaterialSel" E_RawItemSel="SaveItem"></ItemMan>
                 @if (RawItemId > 0)
                 {
+                    <br />
                     <MovMag CustomerId="@CustomerID" KeyNum="@nKey" RawItemIdSel="@RawItemId"></MovMag>
                 }
             </div>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index e764482..60c9739 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MagMan - Wood Warehouse Management System</i>
-    <h4>Versione: 1.0.2401.2518</h4>
+    <h4>Versione: 1.0.2401.2519</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index d0f3e55..932a95a 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2401.2518
+1.0.2401.2519
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 212efb1..be04690 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2401.2518</version>
+  <version>1.0.2401.2519</version>
   <url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>