From a4bb7e96ef989a6cf723bd8a0c26d9baa7347487 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 6 Nov 2023 18:34:51 +0100
Subject: [PATCH] Update pag fixODL

---
 MP-TAB-SERV/Components/FixOdl.razor    | 60 +++++++++++++++++++++++--
 MP-TAB-SERV/Components/FixOdl.razor.cs | 62 +++++++++++++++++++-------
 MP-TAB-SERV/Components/OdlMan.razor    |  2 +-
 MP-TAB-SERV/MP-TAB-SERV.csproj         |  2 +-
 MP-TAB-SERV/Resources/ChangeLog.html   |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt      |  2 +-
 MP-TAB-SERV/Resources/manifest.xml     |  2 +-
 MP.Data/Controllers/MpTabController.cs | 31 +++++++++++++
 MP.Data/Services/TabDataService.cs     | 39 ++++++++++++++++
 9 files changed, 177 insertions(+), 25 deletions(-)

diff --git a/MP-TAB-SERV/Components/FixOdl.razor b/MP-TAB-SERV/Components/FixOdl.razor
index 2b65f2eb..f16f5f60 100644
--- a/MP-TAB-SERV/Components/FixOdl.razor
+++ b/MP-TAB-SERV/Components/FixOdl.razor
@@ -8,14 +8,65 @@
         </div>
         <div class="col-12">
             <h4>Ultimi ODL lavorati:</h4>
-            ...tabella...
+            <table class="table table-dark table-sm table-striped">
+                <thead>
+                    <tr class="text-start1">
+                        <th>ODL / Articolo</th>
+                        <th class="text-end"># Pezzi</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var item in ListPaged)
+                    {
+                        <tr>
+                            <td>
+                                <div class="d-flex justify-content-between fw-bold">
+                                    <div class="px-1">
+                                        @item.IdxOdl
+                                    </div>
+                                    <div class="px-1">
+                                        @item.CodArticolo
+                                    </div>
+                                </div>
+                                <div class="d-flex justify-content-between small">
+                                    <div class="px-1">
+                                        @($"{item.DataInizio:yyyy.MM.dd HH:mm:ss}")
+                                    </div>
+                                    <div class="px-1">
+                                        <i class="fa-solid fa-arrow-right"></i>
+                                    </div>
+                                    <div class="px-1">
+                                        @($"{item.DataFine:yyyy.MM.dd HH:mm:ss}")
+                                    </div>
+                                </div>
+                                @if (!string.IsNullOrEmpty(item.Note))
+                                {
+                                    <div class="small text-secondary">
+                                        @item.Note
+                                    </div>
+                                }
+                            </td>
+                            <td class="text-end">
+                                <div>
+                                    @item.NumPezzi.ToString("N0")
+                                </div>
+                                <div class="small">
+                                    TC: @item.Tcassegnato.ToString("N2") | pz/pallet: @item.PzPallet
+                                </div>
+                            </td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+            <EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
+
         </div>
         <div class="col-8">
             <div class="input-group input-group-lg">
                 <input type="text" class="form-control w-25" placeholder="Cerca" aria-label="Cerca">
                 <select class="form-select w-50" @bind="IdxOdlSel">
                     @* <option disabled>Selezionare P.ODL</option> *@
-                    @foreach (var item in ListODL)
+                    @foreach (var item in ListSelODL)
                     {
                         <option value="@item.value">@item.label</option>
                     }
@@ -29,7 +80,10 @@
             </div>
         </div>
         <div class="col-4">
-            <button calss="btn btn-lg btn-warning"><i class="fa-solid fa-plus"></i> Imposta ODL</button>
+            @if (IdxOdlSel > 0)
+            {
+                <button class="btn btn-lg btn-warning w-100" @onclick="() => setupOdl()"><i class="fa-solid fa-plus"></i> Imposta ODL</button>
+            }
         </div>
     </div>
 }
diff --git a/MP-TAB-SERV/Components/FixOdl.razor.cs b/MP-TAB-SERV/Components/FixOdl.razor.cs
index a6830c20..76fb2c2d 100644
--- a/MP-TAB-SERV/Components/FixOdl.razor.cs
+++ b/MP-TAB-SERV/Components/FixOdl.razor.cs
@@ -9,13 +9,13 @@ namespace MP_TAB_SERV.Components
         #region Public Properties
 
         [Parameter]
-        public string IdxMaccPar { get; set; } = "";
+        public string IdxMaccCurr { get; set; } = "";
 
         #endregion Public Properties
 
         #region Protected Properties
 
-        protected List<vSelOdlModel> ListODL { get; set; } = new List<vSelOdlModel>();
+        private List<vSelOdlModel> ListSelODL { get; set; } = new List<vSelOdlModel>();
 
         protected bool ShowAll
         {
@@ -25,6 +25,7 @@ namespace MP_TAB_SERV.Components
                 if (showAll != value)
                 {
                     showAll = value;
+                    IdxOdlSel = 0;
                     var pUpd = Task.Run(async () =>
                     {
                         await ReloadData();
@@ -72,29 +73,56 @@ namespace MP_TAB_SERV.Components
 
         private async Task ReloadData()
         {
-            if (!string.IsNullOrEmpty(IdxMaccPar))
+            if (!string.IsNullOrEmpty(IdxMaccCurr))
             {
-                ListODL = await TabDServ.VSOdlGetUnused(IdxMaccPar, ShowAll, numDayOdl);
+                ListSelODL = await TabDServ.VSOdlGetUnused(IdxMaccCurr, ShowAll, numDayOdl);
+                DateTime dateTo = DateTime.Today.AddDays(1);
+                DateTime dateFrom = dateTo.AddMonths(-1);
+                ListComplete = await TabDServ.OdlListByMacc(IdxMaccCurr, dateFrom, dateTo);
+                TotalCount = ListComplete.Count;
+                // esegue paginazione
+                UpdateTable();
             }
         }
-        protected int IdxOdlSel
+        protected void UpdateTable()
         {
-            get => idxOdlSel;
-            set
+            // esegue paginazione
+            if (TotalCount > NumRecPage)
             {
-                if (idxOdlSel != value)
-                {
-                    idxOdlSel = value;
-                    //var pUpd = Task.Run(async () =>
-                    //{
-                    //    await ReloadData(true);
-                    //});
-                    //pUpd.Wait();
-                }
+                ListPaged = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList();
             }
+            else
+            {
+                ListPaged = ListComplete;
+            }
+        }
+        protected void SaveNumRec(int newNum)
+        {
+            NumRecPage = newNum;
+            UpdateTable();
         }
 
-        private int idxOdlSel { get; set; } = 0;
+        protected void SavePage(int newNum)
+        {
+            PageNum = newNum;
+            UpdateTable();
+        }
+
+        protected async Task setupOdl()
+        {
+            await Task.Delay(1);
+        }
+
+
+        protected List<ODLModel> ListComplete { get; set; } = new List<ODLModel>();
+
+        protected List<ODLModel> ListPaged { get; set; } = new List<ODLModel>();
+        protected int NumRecPage = 5;
+        protected int PageNum = 1;
+        protected int TotalCount = 0;
+
+
+        private int IdxOdlSel { get; set; } = 0;
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor
index c881e3eb..b78ef518 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor
+++ b/MP-TAB-SERV/Components/OdlMan.razor
@@ -12,7 +12,7 @@
         @if (!odlOk)
         {
             <div class="col-12">
-                <FixOdl IdxMaccPar="@IdxMaccParent"></FixOdl>
+                <FixOdl IdxMaccCurr="@IdxMaccParent"></FixOdl>
             </div>
         }
     }
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 26a117b6..896b981e 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2311.616</Version>
+      <Version>6.16.2311.618</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 8ded14a8..d17bc84c 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2311.616</h4>
+    <h4>Versione: 6.16.2311.618</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 846ec6ea..e3dc16f4 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2311.616
+6.16.2311.618
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 99e2e93d..ce1b8c7c 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2311.616</version>
+  <version>6.16.2311.618</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs
index 5ab28b2e..ee497037 100644
--- a/MP.Data/Controllers/MpTabController.cs
+++ b/MP.Data/Controllers/MpTabController.cs
@@ -737,6 +737,37 @@ namespace MP.Data.Controllers
             return fatto;
         }
 
+        /// <summary>
+        /// Elenco ODL data macchina e periodo
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        /// <returns></returns>
+        public List<ODLModel> OdlListByMacc(string idxMacchina, DateTime dtStart, DateTime dtEnd)
+        {
+            List<ODLModel> dbResult = new List<ODLModel>();
+            using (var dbCtx = new MoonProContext(_configuration))
+            {
+                try
+                {
+                    var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
+                    var DataFrom = new SqlParameter("@dataFrom", dtStart);
+                    var DataTo = new SqlParameter("@dataTo", dtEnd);
+                    dbResult = dbCtx
+                                .DbSetODL
+                                .FromSqlRaw("EXEC stp_ODL_getByMacchinaPeriodo @IdxMacchina, @dataFrom, @dataTo", IdxMacchina, DataFrom, DataTo)
+                                .AsNoTracking()
+                                .ToList();
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante ListOdlAll{Environment.NewLine}{exc}");
+                }
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Stato prod macchina
         /// </summary>
diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs
index 2328d68e..ee730a11 100644
--- a/MP.Data/Services/TabDataService.cs
+++ b/MP.Data/Services/TabDataService.cs
@@ -1990,6 +1990,45 @@ namespace MP.Data.Services
             return result;
         }
 
+        /// <summary>
+        /// Elenco ODL data macchina e periodo
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
+        /// <returns></returns>
+        public async Task<List<ODLModel>> OdlListByMacc(string idxMacchina, DateTime dtStart, DateTime dtEnd)
+        {
+            string source = "DB";
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
+            List<ODLModel>? result = new List<ODLModel>();
+            // cerco in redis...
+            string currKey = $"{redisBaseKey}:ODL:{idxMacchina}:{dtStart:yyyyMMdd-HHmmss}:{dtEnd:yyyyMMdd-HHmmss}";
+            RedisValue rawData = await redisDb.StringGetAsync(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<ODLModel>>($"{rawData}");
+                source = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbTabController.OdlListByMacc(idxMacchina, dtStart, dtEnd));
+                // riordino
+                result = result.OrderByDescending(x => x.DataInizio).ToList();
+                // serializzp e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
+            }
+            if (result == null)
+            {
+                result = new List<ODLModel>();
+            }
+            sw.Stop();
+            Log.Debug($"OdlListByMacc | {source} | {sw.Elapsed.TotalMilliseconds}ms");
+            return result;
+        }
+
         /// <summary>
         /// Elenco ultimi ODL x macchina
         /// </summary>