From 52c263090b7af11d07b44091dbbe886f328ae7df Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 08:04:48 +0200
Subject: [PATCH 1/7] link pagina OEE

---
 MP.Stats/Pages/Index.razor    |  3 +--
 MP.Stats/Shared/NavMenu.razor | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor
index 014e7f34..f2d91a2f 100644
--- a/MP.Stats/Pages/Index.razor
+++ b/MP.Stats/Pages/Index.razor
@@ -26,13 +26,12 @@
             <div class="card">
                 <div class="card-header table-primary h1">Main Topics</div>
                 <div class="card-body py-0">
+                    <HomeButton NavLink="oee" Icon="oi oi-monitor" Descript="TRS/OEE %" />
                     <HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="Report ODL" />
                     <HomeButton NavLink="produzione" Icon="oi oi-clipboard" Descript="Diario Produzione" />
                     <HomeButton NavLink="userlog" Icon="oi oi-document" Descript="User ActionLog" />
                     <HomeButton NavLink="controlli" Icon="oi oi-beaker" Descript="Controlli" />
                     <HomeButton NavLink="scarti" Icon="oi oi-warning" Descript="Scarti" />
-                    @*<HomeButton NavLink="resources" Icon="oi oi-puzzle-piece" Descript="Risorse" />*@
-                    @*<HomeButton NavLink="utility" Icon="oi oi-wrench" Descript="Utility" />*@
                 </div>
             </div>
         </div>
diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor
index 2ebff8ca..810eb676 100644
--- a/MP.Stats/Shared/NavMenu.razor
+++ b/MP.Stats/Shared/NavMenu.razor
@@ -7,6 +7,11 @@
 
 <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
     <ul class="nav flex-column">
+        <li class="nav-item px-3">
+                <NavLink class="nav-link" href="oee">
+                    <span class="oi oi-monitor" aria-hidden="true"></span> TRS/OEE %
+                </NavLink>
+        </li>
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
                 <span class="oi oi-home" aria-hidden="true"></span> Home
@@ -37,11 +42,7 @@
                 <span class="oi oi-warning" aria-hidden="true" title="Registro Scarti"></span> Registro Scarti
             </NavLink>
         </li>
-        @*<li class="nav-item px-3">
-                <NavLink class="nav-link" href="counter">
-                    <span class="oi oi-plus" aria-hidden="true"></span> Counter
-                </NavLink>
-            </li>
+        @*
             <li class="nav-item px-3">
                 <NavLink class="nav-link" href="fetchdata">
                     <span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data

From 7f3d789f2ab9e8169f0b604fdacaa589e83168e7 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 11:27:06 +0200
Subject: [PATCH 2/7] Aggiunta classi x nuove estrazioni

---
 MP.Data/DatabaseModels/TurniOee.cs       |  28 ++++++
 MP.Data/DatabaseModels/TurniPareto.cs    |  26 ++++++
 MP.Data/DatabaseModels/TurniParetoOdl.cs |  28 ++++++
 MP.Data/MP.Data.csproj                   |   3 -
 MP.Data/MoonPro_STATSContext.cs          | 105 +++++++++++++++++++++++
 5 files changed, 187 insertions(+), 3 deletions(-)
 create mode 100644 MP.Data/DatabaseModels/TurniOee.cs
 create mode 100644 MP.Data/DatabaseModels/TurniPareto.cs
 create mode 100644 MP.Data/DatabaseModels/TurniParetoOdl.cs

diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs
new file mode 100644
index 00000000..ec0a36c1
--- /dev/null
+++ b/MP.Data/DatabaseModels/TurniOee.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    public partial class TurniOee
+    {
+        #region Public Properties
+
+        public string ClasseTempo { get; set; }
+        public string CodArticolo { get; set; }
+        public string CodMacchina { get; set; }
+        public DateTime DataRif { get; set; }
+        public string DescArticolo { get; set; }
+        public string Descrizione { get; set; }
+        public string IdxMacchina { get; set; }
+        public int? IdxOdl { get; set; }
+        public int IdxStato { get; set; }
+        public string KeyRichiesta { get; set; }
+        public double? TotPeriodo { get; set; }
+        public int? TotPz { get; set; }
+        public string Turno { get; set; }
+
+        #endregion Public Properties
+    }
+}
\ No newline at end of file
diff --git a/MP.Data/DatabaseModels/TurniPareto.cs b/MP.Data/DatabaseModels/TurniPareto.cs
new file mode 100644
index 00000000..73c9d689
--- /dev/null
+++ b/MP.Data/DatabaseModels/TurniPareto.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    public partial class TurniPareto
+    {
+        #region Public Properties
+
+        public string ClasseTempo { get; set; }
+        public string CodArticolo { get; set; }
+        public string CodMacchina { get; set; }
+        public DateTime DataRif { get; set; }
+        public string DescArticolo { get; set; }
+        public string Descrizione { get; set; }
+        public string IdxMacchina { get; set; }
+        public int IdxStato { get; set; }
+        public double? TotPeriodo { get; set; }
+        public int? TotPz { get; set; }
+        public string Turno { get; set; }
+
+        #endregion Public Properties
+    }
+}
\ No newline at end of file
diff --git a/MP.Data/DatabaseModels/TurniParetoOdl.cs b/MP.Data/DatabaseModels/TurniParetoOdl.cs
new file mode 100644
index 00000000..7a15b270
--- /dev/null
+++ b/MP.Data/DatabaseModels/TurniParetoOdl.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace MP.Data.DatabaseModels
+{
+    public partial class TurniParetoOdl
+    {
+        #region Public Properties
+
+        public string ClasseTempo { get; set; }
+        public string CodArticolo { get; set; }
+        public string CodMacchina { get; set; }
+        public DateTime DataRif { get; set; }
+        public string DescArticolo { get; set; }
+        public string Descrizione { get; set; }
+        public string IdxMacchina { get; set; }
+        public int? IdxOdl { get; set; }
+        public int IdxStato { get; set; }
+        public string KeyRichiesta { get; set; }
+        public double? TotPeriodo { get; set; }
+        public int? TotPz { get; set; }
+        public string Turno { get; set; }
+
+        #endregion Public Properties
+    }
+}
\ No newline at end of file
diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj
index 658bbfa1..0c89b33d 100644
--- a/MP.Data/MP.Data.csproj
+++ b/MP.Data/MP.Data.csproj
@@ -6,9 +6,6 @@
         <RootNamespace>MP.Data</RootNamespace>
     </PropertyGroup>
 
-    <ItemGroup>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.6" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.6" />
diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs
index 6a821592..ffb3bcc6 100644
--- a/MP.Data/MoonPro_STATSContext.cs
+++ b/MP.Data/MoonPro_STATSContext.cs
@@ -42,6 +42,9 @@ namespace MP.Data
         public virtual DbSet<Macchine> DbSetMacchine { get; set; }
         public virtual DbSet<ODL> DbSetODL { get; set; }
         public virtual DbSet<ResScarti> DbSetScarti { get; set; }
+        public virtual DbSet<TurniOee> DbSetTurniOee { get; set; }
+        public virtual DbSet<TurniPareto> DbSetTurniPareto { get; set; }
+        public virtual DbSet<TurniParetoOdl> DbSetTurniParetoOdl { get; set; }
         public virtual DbSet<UserActionLog> DbSetUserLog { get; set; }
 
         #endregion Public Properties
@@ -68,6 +71,108 @@ namespace MP.Data
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS");
+
+            modelBuilder.Entity<TurniOee>(entity =>
+            {
+                entity.HasNoKey();
+
+                entity.ToView("v_UI_OEE_Turni");
+
+                entity.Property(e => e.ClasseTempo).HasMaxLength(50);
+
+                entity.Property(e => e.CodArticolo)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.CodMacchina).HasMaxLength(50);
+
+                entity.Property(e => e.DataRif).HasColumnType("datetime");
+
+                entity.Property(e => e.DescArticolo).HasMaxLength(250);
+
+                entity.Property(e => e.Descrizione).HasMaxLength(50);
+
+                entity.Property(e => e.IdxMacchina)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.IdxOdl).HasColumnName("IdxODL");
+
+                entity.Property(e => e.KeyRichiesta).HasMaxLength(50);
+
+                entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo");
+
+                entity.Property(e => e.Turno)
+                    .IsRequired()
+                    .HasMaxLength(5);
+            });
+
+            modelBuilder.Entity<TurniPareto>(entity =>
+            {
+                entity.HasNoKey();
+
+                entity.ToView("v_UI_Pareto_Turni");
+
+                entity.Property(e => e.ClasseTempo).HasMaxLength(50);
+
+                entity.Property(e => e.CodArticolo)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.CodMacchina).HasMaxLength(50);
+
+                entity.Property(e => e.DataRif).HasColumnType("datetime");
+
+                entity.Property(e => e.DescArticolo).HasMaxLength(250);
+
+                entity.Property(e => e.Descrizione).HasMaxLength(50);
+
+                entity.Property(e => e.IdxMacchina)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo");
+
+                entity.Property(e => e.Turno)
+                    .IsRequired()
+                    .HasMaxLength(5);
+            });
+
+            modelBuilder.Entity<TurniParetoOdl>(entity =>
+            {
+                entity.HasNoKey();
+
+                entity.ToView("v_UI_Pareto_TurniOdl");
+
+                entity.Property(e => e.ClasseTempo).HasMaxLength(50);
+
+                entity.Property(e => e.CodArticolo)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.CodMacchina).HasMaxLength(50);
+
+                entity.Property(e => e.DataRif).HasColumnType("datetime");
+
+                entity.Property(e => e.DescArticolo).HasMaxLength(250);
+
+                entity.Property(e => e.Descrizione).HasMaxLength(50);
+
+                entity.Property(e => e.IdxMacchina)
+                    .IsRequired()
+                    .HasMaxLength(50);
+
+                entity.Property(e => e.IdxOdl).HasColumnName("IdxODL");
+
+                entity.Property(e => e.KeyRichiesta).HasMaxLength(50);
+
+                entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo");
+
+                entity.Property(e => e.Turno)
+                    .IsRequired()
+                    .HasMaxLength(5);
+            });
+
             modelBuilder.Entity<AnagArticoli>(entity =>
             {
                 entity.HasNoKey();

From 081a4792ba6d75396e9e6a6f0b6a9c9b39f121a8 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 12:03:58 +0200
Subject: [PATCH 3/7] Completato calcoli OEE

---
 MP.Data/Controllers/MpStatsController.cs | 81 ++++++++++++++++++++++++
 MP.Data/DatabaseModels/TurniOee.cs       | 13 +++-
 MP.Data/MoonPro_STATSContext.cs          |  4 --
 3 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs
index 61036130..853d1c02 100644
--- a/MP.Data/Controllers/MpStatsController.cs
+++ b/MP.Data/Controllers/MpStatsController.cs
@@ -220,6 +220,87 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Elenco tabella TurniOee da filtro
+        /// </summary>
+        /// <param name="DataStart"></param>
+        /// <param name="DataEnd"></param>
+        /// <param name="IdxMacchina"></param>
+        /// <param name="DataEnd"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TurniOee> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        {
+            List<DatabaseModels.TurniOee> dbResult = new List<DatabaseModels.TurniOee>();
+
+            var dataFrom = new SqlParameter("@dataFrom", DataStart);
+            var dataTo = new SqlParameter("@dataTo", DataEnd);
+            var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+            var idxODL = new SqlParameter("@IdxODL", IdxODL);
+            var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+            var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
+            dbResult = dbCtx
+                .DbSetTurniOee
+                .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
+                .ToList();
+
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco tabella TurniPareto da filtro
+        /// </summary>
+        /// <param name="DataStart"></param>
+        /// <param name="DataEnd"></param>
+        /// <param name="IdxMacchina"></param>
+        /// <param name="DataEnd"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TurniPareto> StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        {
+            List<DatabaseModels.TurniPareto> dbResult = new List<DatabaseModels.TurniPareto>();
+
+            var dataFrom = new SqlParameter("@dataFrom", DataStart);
+            var dataTo = new SqlParameter("@dataTo", DataEnd);
+            var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+            var idxODL = new SqlParameter("@IdxODL", IdxODL);
+            var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+            var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
+            dbResult = dbCtx
+                .DbSetTurniPareto
+                .FromSqlRaw("EXEC stp_UI_ParetoTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
+                .ToList();
+
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Elenco tabella TurniParetoOdl da filtro
+        /// </summary>
+        /// <param name="DataStart"></param>
+        /// <param name="DataEnd"></param>
+        /// <param name="IdxMacchina"></param>
+        /// <param name="DataEnd"></param>
+        /// <returns></returns>
+        public List<DatabaseModels.TurniParetoOdl> StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        {
+            List<DatabaseModels.TurniParetoOdl> dbResult = new List<DatabaseModels.TurniParetoOdl>();
+
+            var dataFrom = new SqlParameter("@dataFrom", DataStart);
+            var dataTo = new SqlParameter("@dataTo", DataEnd);
+            var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina);
+            var idxODL = new SqlParameter("@IdxODL", IdxODL);
+            var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta);
+            var codArticolo = new SqlParameter("@CodArticolo", CodArticolo);
+
+            dbResult = dbCtx
+                .DbSetTurniParetoOdl
+                .FromSqlRaw("EXEC stp_UI_ParetoTurniOdl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo)
+                .ToList();
+
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco tabella UserLog da filtro
         /// </summary>
diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs
index ec0a36c1..2187765c 100644
--- a/MP.Data/DatabaseModels/TurniOee.cs
+++ b/MP.Data/DatabaseModels/TurniOee.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 #nullable disable
 
@@ -16,10 +18,15 @@ namespace MP.Data.DatabaseModels
         public string DescArticolo { get; set; }
         public string Descrizione { get; set; }
         public string IdxMacchina { get; set; }
-        public int? IdxOdl { get; set; }
         public int IdxStato { get; set; }
-        public string KeyRichiesta { get; set; }
-        public double? TotPeriodo { get; set; }
+
+        [NotMapped]
+        [DisplayFormat(DataFormatString = "{0:P2}", ApplyFormatInEditMode = true)]
+        public double OEE => (double)TotPeriodo / 480;
+
+        [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)]
+        public double TotPeriodo { get; set; }
+
         public int? TotPz { get; set; }
         public string Turno { get; set; }
 
diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs
index ffb3bcc6..b6161519 100644
--- a/MP.Data/MoonPro_STATSContext.cs
+++ b/MP.Data/MoonPro_STATSContext.cs
@@ -96,10 +96,6 @@ namespace MP.Data
                     .IsRequired()
                     .HasMaxLength(50);
 
-                entity.Property(e => e.IdxOdl).HasColumnName("IdxODL");
-
-                entity.Property(e => e.KeyRichiesta).HasMaxLength(50);
-
                 entity.Property(e => e.TotPeriodo).HasColumnName("totPeriodo");
 
                 entity.Property(e => e.Turno)

From bbe18f38d6174d8d367225ba96355ee82cd7dcca Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 12:04:06 +0200
Subject: [PATCH 4/7] update controlli recupero dati OEE

---
 MP.Stats/Data/MpStatsService.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index fb5e3995..0ef4c259 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -100,6 +100,21 @@ namespace MP.Stats.Data
             return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
         }
 
+        public Task<MP.Data.DatabaseModels.TurniOee[]> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
+        {
+            return Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
+        }
+
+        public Task<MP.Data.DatabaseModels.TurniPareto[]> StatTurniParetoGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
+        {
+            return Task.FromResult(dbController.StatTurniParetoGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
+        }
+
+        public Task<MP.Data.DatabaseModels.TurniParetoOdl[]> StatTurniParetoOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
+        {
+            return Task.FromResult(dbController.StatTurniParetoOdlGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
+        }
+
         public Task<MP.Data.DatabaseModels.UserActionLog[]> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
         {
             return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());

From 1121f0f3dad709d45199af297ab0fdaed4d2d202 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 12:04:12 +0200
Subject: [PATCH 5/7] Prima vers pagina OEE

---
 MP.Stats/Pages/Oee.razor      |  71 ++++++++++++++++++
 MP.Stats/Pages/Oee.razor.cs   | 131 ++++++++++++++++++++++++++++++++++
 MP.Stats/Shared/NavMenu.razor |  10 +--
 3 files changed, 207 insertions(+), 5 deletions(-)
 create mode 100644 MP.Stats/Pages/Oee.razor
 create mode 100644 MP.Stats/Pages/Oee.razor.cs

diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor
new file mode 100644
index 00000000..68d95794
--- /dev/null
+++ b/MP.Stats/Pages/Oee.razor
@@ -0,0 +1,71 @@
+@page "/oee"
+
+@using MP.Stats.Components
+@using MP.Stats.Data
+
+<div class="card">
+    <div class="card-header table-primary">
+        <div class="row">
+            <div class="col-6 col-lg-3 h2">TRS / OEE %</div>
+            <div class="col-6 col-lg-9">
+            </div>
+        </div>
+    </div>
+    <div class="card-body py-0">
+        @if (currRecord != null)
+        {
+            @*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
+        }
+        @if (ListRecords == null)
+        {
+            <div class="progress-bar progress-bar-striped progress-bar-animated" style="width:70%"></div>
+        }
+        else
+        {
+            <div class="row">
+                <div class="col-12 table-secondary">
+                    <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
+                </div>
+                <div class="col-12">
+                    <table class="table table-sm table-striped">
+                        <thead>
+                            <tr>
+                                @*<th></th>*@
+                                <th>Data</th>
+                                <th>Turno</th>
+                                <th>Macchina</th>
+                                <th>Articolo</th>
+                                <th class="text-right">Durata</th>
+                                <th class="text-right">Pezzi</th>
+                                <th class="text-right">OEE</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var record in ListRecords)
+                            {
+                                <tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
+                                    @*<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowDocs(record)" title="Vai ai documenti"><span class="oi oi-document"></span></button></td>*@
+                                    <td>
+                                        <div>@record.DataRif.ToString("yyyy.MM.dd")</div>
+                                    </td>
+                                    <td>@record.Turno</td>
+                                    <td>
+                                        <div>@record.CodMacchina</div>
+                                        <div class="small">@record.IdxMacchina</div>
+                                    </td>
+                                    <td>@record.CodArticolo</td>
+                                    <td class="text-right">@record.TotPeriodo.ToString("N2")</td>
+                                    <td class="text-right">@record.TotPz</td>
+                                    <td class="text-right">@record.OEE</td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        }
+    </div>
+    <div class="card-footer py-1">
+        <DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@SearchRecords.Count()" />
+    </div>
+</div>
\ No newline at end of file
diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs
new file mode 100644
index 00000000..be601c8e
--- /dev/null
+++ b/MP.Stats/Pages/Oee.razor.cs
@@ -0,0 +1,131 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using MP.Stats.Data;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MP.Stats.Pages
+{
+    public partial class Oee : ComponentBase, IDisposable
+    {
+        #region Private Fields
+
+        private MP.Data.DatabaseModels.TurniOee currRecord = null;
+
+        private MP.Data.DatabaseModels.TurniOee[] ListRecords;
+
+        private MP.Data.DatabaseModels.TurniOee[] SearchRecords;
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        private SelectData currFilter { get; set; } = new SelectData();
+        private int currPage { get; set; } = 1;
+        private int numRecord { get; set; } = 10;
+
+        #endregion Private Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; }
+
+        [Inject]
+        protected MessageService MessageService { get; set; }
+
+        [Inject]
+        protected NavigationManager NavManager { get; set; }
+
+        [Inject]
+        protected MpStatsService StatService { get; set; }
+
+        #endregion Protected Properties
+
+        #region Private Methods
+
+        private async Task reloadData()
+        {
+            SearchRecords = await StatService.StatTurniOeeGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal);
+            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray();
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected async Task DoFilter(SelectData newFilter)
+        {
+            currFilter = newFilter;
+            await reloadData();
+        }
+
+        protected async Task ForceReload(int newNum)
+        {
+            numRecord = newNum;
+            await reloadData();
+        }
+
+        protected async Task ForceReloadPage(int newNum)
+        {
+            currPage = newNum;
+            await reloadData();
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            numRecord = 10;
+            MessageService.ShowSearch = true;
+            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            await reloadData();
+        }
+
+        protected void ResetData()
+        {
+            StatService.rollBackEdit(currRecord);
+            currRecord = null;
+        }
+
+        protected async Task UpdateData()
+        {
+            currRecord = null;
+            await reloadData();
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public string checkSelect(DateTime DataRif, string Turno, string IdxMacchina)
+        {
+            string answ = "";
+            if (currRecord != null)
+            {
+                try
+                {
+                    answ = (currRecord.IdxMacchina == IdxMacchina && currRecord.Turno == Turno && currRecord.DataRif == DataRif) ? "table-info" : "";
+                }
+                catch
+                { }
+            }
+            return answ;
+        }
+
+        public void Dispose()
+        {
+            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+        }
+
+        public void OnSeachUpdated()
+        {
+            InvokeAsync(() =>
+            {
+                UpdateData();
+                StateHasChanged();
+            });
+        }
+
+        #endregion Public Methods
+    }
+}
\ No newline at end of file
diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor
index 810eb676..ef470f19 100644
--- a/MP.Stats/Shared/NavMenu.razor
+++ b/MP.Stats/Shared/NavMenu.razor
@@ -7,16 +7,16 @@
 
 <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
     <ul class="nav flex-column">
-        <li class="nav-item px-3">
-                <NavLink class="nav-link" href="oee">
-                    <span class="oi oi-monitor" aria-hidden="true"></span> TRS/OEE %
-                </NavLink>
-        </li>
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
                 <span class="oi oi-home" aria-hidden="true"></span> Home
             </NavLink>
         </li>
+        <li class="nav-item px-3">
+            <NavLink class="nav-link" href="oee">
+                <span class="oi oi-monitor" aria-hidden="true"></span> TRS/OEE %
+            </NavLink>
+        </li>
         <li class="nav-item px-3">
             <NavLink class="nav-link" href="ReportODL">
                 <span class="oi oi-book" aria-hidden="true" title="Dati di Produzione ODL"></span> Report ODL/Comm.

From dba6ab60abf601012eda9a215a9d06cf2650eda4 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 12:08:03 +0200
Subject: [PATCH 6/7] Update visualizzazione OEE (da DB)

---
 MP.Data/DatabaseModels/TurniOee.cs | 4 ++--
 MP.Stats/Pages/Oee.razor           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs
index 2187765c..94697231 100644
--- a/MP.Data/DatabaseModels/TurniOee.cs
+++ b/MP.Data/DatabaseModels/TurniOee.cs
@@ -21,8 +21,8 @@ namespace MP.Data.DatabaseModels
         public int IdxStato { get; set; }
 
         [NotMapped]
-        [DisplayFormat(DataFormatString = "{0:P2}", ApplyFormatInEditMode = true)]
-        public double OEE => (double)TotPeriodo / 480;
+        [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)]
+        public double OEE => (double)TotPeriodo * 100 / 480;
 
         [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)]
         public double TotPeriodo { get; set; }
diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor
index 68d95794..0a2def79 100644
--- a/MP.Stats/Pages/Oee.razor
+++ b/MP.Stats/Pages/Oee.razor
@@ -37,7 +37,7 @@
                                 <th>Articolo</th>
                                 <th class="text-right">Durata</th>
                                 <th class="text-right">Pezzi</th>
-                                <th class="text-right">OEE</th>
+                                <th class="text-right">OEE %</th>
                             </tr>
                         </thead>
                         <tbody>

From 80705cb480b036e772ac699d8e4acbcf298f201d Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 20 May 2021 12:20:40 +0200
Subject: [PATCH 7/7] Fix display % x OEE

---
 MP.Data/DatabaseModels/TurniOee.cs | 2 +-
 MP.Stats/Pages/Oee.razor           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DatabaseModels/TurniOee.cs
index 94697231..969bcc0c 100644
--- a/MP.Data/DatabaseModels/TurniOee.cs
+++ b/MP.Data/DatabaseModels/TurniOee.cs
@@ -22,7 +22,7 @@ namespace MP.Data.DatabaseModels
 
         [NotMapped]
         [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)]
-        public double OEE => (double)TotPeriodo * 100 / 480;
+        public double OEE => (double)TotPeriodo / 480;
 
         [DisplayFormat(DataFormatString = "{0:N2}", ApplyFormatInEditMode = true)]
         public double TotPeriodo { get; set; }
diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor
index 0a2def79..a2e0beff 100644
--- a/MP.Stats/Pages/Oee.razor
+++ b/MP.Stats/Pages/Oee.razor
@@ -56,7 +56,7 @@
                                     <td>@record.CodArticolo</td>
                                     <td class="text-right">@record.TotPeriodo.ToString("N2")</td>
                                     <td class="text-right">@record.TotPz</td>
-                                    <td class="text-right">@record.OEE</td>
+                                    <td class="text-right">@record.OEE.ToString("P2")</td>
                                 </tr>
                             }
                         </tbody>