Merge remote-tracking branch 'origin/develop'

MP-TAB3/Components/AlarmsMan.razor.cs

@@ -2,7 +2,7 @@ using global::Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MongoDB.Driver.Linq;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 using System.Text;

MP-TAB3/Components/CheckControls.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using MP_TAB3.Shared;
 

MP-TAB3/Components/CmpTop.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Services;
 using MP_TAB3.Pages;

MP-TAB3/Components/CommentEditor.razor.cs

@@ -1,6 +1,6 @@
 using global::Microsoft.AspNetCore.Components;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/ControlsMan.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 using static EgwCoreLib.Utils.DtUtils;

MP-TAB3/Components/CurrOdlDetail.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using System;
 

MP-TAB3/Components/DeclarEditor.razor.cs

@@ -1,6 +1,6 @@
 using global::Microsoft.AspNetCore.Components;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/DeclarMan.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 using Org.BouncyCastle.Asn1.IsisMtt.X509;

MP-TAB3/Components/FixOdl.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/LongStopList.razor.cs

@@ -1,6 +1,6 @@
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using System.Data;
 using System.Reflection.Metadata;

MP-TAB3/Components/MachSel.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using MP_TAB3.Shared;
 using System;

MP-TAB3/Components/MachineBlock.razor

@@ -175,7 +175,7 @@ else
                             {
                                 <div class="fs-5 text-end text-warning d-flex justify-content-between">
                                     <div class="px-0">
-                                        Da Confermare
+                                        Da Conferm.
                                     </div>
                                     <div class="px-0">
                                         @($"{datiProdAct.Pz2RecTot}")
@@ -186,7 +186,7 @@ else
                             {
                                 <div class="fs-5 text-end text-secondary d-flex justify-content-between">
                                     <div class="px-0">
-                                        Da Confermare
+                                        Da Conferm.
                                     </div>
                                     <div class="px-0">
                                         @($"{datiProdAct.Pz2RecTot}")
@@ -204,6 +204,16 @@ else
                                     </div>
                                 </div>
                             }
+                            else{
+                                <div class="fs-5 text-end text-secondary d-flex justify-content-between">
+                                    <div class="px-0">
+                                        Scarti Versati
+                                    </div>
+                                    <div class="px-0">
+                                        @($"{NumScartiConf}")
+                                    </div>
+                                </div>
+                            }
                             @if (datiProdAct.PzConfRilav > 0)
                             {
                                 <div class="fs-5 text-end text-info d-flex justify-content-between">
@@ -215,20 +225,31 @@ else
                                     </div>
                                 </div>
                             }
+                            else
+                            {
+                                <div class="fs-5 text-end text-secondary d-flex justify-content-between">
+                                    <div class="px-0">
+                                        Rilav Versati
+                                    </div>
+                                    <div class="px-0">
+                                        @($"{datiProdAct.PzConfRilav}")
+                                    </div>
+                                </div>
+                            }
                             <div class="text-end text-success d-flex justify-content-between">
                                 <div class="px-0">
-                                    Buoni Versati
+                                    Buoni Vers.
                                 </div>
                                 <div class="px-0">
                                     @($"{datiProdAct.PzConfBuoni}")
                                 </div>
                             </div>
                         }
-                        @if (CRecMSE.extraVal > 0)
+                        @if (CRecMSE.extraVal > 0 && showQtaExtra)
                         {
                             <div class="text-end text-primary d-flex justify-content-between">
                                 <div class="px-0">
-                                    Qta Extra
+                                    Extra
                                 </div>
                                 <div class="px-0">@($"{CRecMSE.extraVal}")</div>
                             </div>

MP-TAB3/Components/MachineBlock.razor.cs

@@ -2,7 +2,7 @@ using EgwCoreLib.Razor;
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 using System;
@@ -26,6 +26,7 @@ namespace MP_TAB3.Components
 
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
         private bool enableDisegno = false;
+        private bool showQtaExtra = false;
         private bool forceCloseOdl = true;
         private int IdxOdl = 0;
         private int IdxOdlAltra = 0;
@@ -353,6 +354,7 @@ namespace MP_TAB3.Components
             saveParams();
             // abilitazione disegni...
             TabDServ.ConfigGetVal("enableDisegno", ref enableDisegno);
+            TabDServ.ConfigGetVal("TAB_ShowQtaExtra", ref showQtaExtra);
             await ReloadXDL(true);
             // se configurata uso cartella virtuale... altrimenti cartella processo
             var sImgBasePath = config.GetValue<string>("ServerConf:ImgBasePath") ?? (config.GetValue<string>("OptConf:ImgBasePath") ?? "");
@@ -376,7 +378,7 @@ namespace MP_TAB3.Components
             {
                 saveParams();
                 isLoading = RecMSE == null;
-                // controllo SE ho variazioni così rileggo
+                // controllo SE ho variazioni cos� rileggo
                 if (!string.IsNullOrEmpty(IdxMacchSub) && RecMSE != null)
                 {
                     // solo se cambia macchina forzo da DB
@@ -438,7 +440,7 @@ namespace MP_TAB3.Components
 
         protected void setGaugeVals()
         {
-            // se è una doppio pallet uso dati MSE
+            // se � una doppio pallet uso dati MSE
             if (string.IsNullOrEmpty(IdxMacchSub) && isMulti)
             {
                 if (CRecMSE != null)
@@ -570,7 +572,7 @@ namespace MP_TAB3.Components
         }
 
         /// <summary>
-        /// Toggle visibilità button
+        /// Toggle visibilit� button
         /// </summary>
         private void ToggleDraw()
         {
@@ -578,7 +580,7 @@ namespace MP_TAB3.Components
         }
 
         /// <summary>
-        /// Toggle visibilità blocco PODL
+        /// Toggle visibilit� blocco PODL
         /// </summary>
         private void TogglePOdl()
         {

MP-TAB3/Components/MachineBlock.razor.css

@@ -136,7 +136,7 @@
   height: 10rem;
   object-fit: cover;
 }
-@media (max-width: 640.98px) {
+@media (max-width: 639.98px) {
   .imgFitToSize {
     height: 7.5rem;
   }

MP-TAB3/Components/MachineBlock.razor.less

@@ -162,7 +162,7 @@
     object-fit: cover;
 }
 
-@media (max-width: 640.98px){
+@media (max-width: 639.98px){
     .imgFitToSize{
         height: 7.5rem;
     }

MP-TAB3/Components/MachineBlock.razor.min.css

@@ -1 +1 @@
-.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.text-sizer{font-size:1.1rem;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.scroll-left{height:1.5em;overflow:hidden;position:relative;width:70%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);-moz-animation:scroll-left 8s ease infinite;-webkit-animation:scroll-left 8s ease infinite;animation:scroll-left 8s ease infinite;}@keyframes scroll-left{0%{transform:translateX(0%);}30%{transform:translateX(0%);}80%{transform:translateX(-50%);}}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.shadow{--bs-shadow-rgb:0,0,0;box-shadow:0 .5rem 1rem rgba(var(--bs-shadow-rgb),.15)!important;}.shadow-sm{--bs-shadow-rgb:0,0,0;box-shadow:0 .125rem .25rem rgba(var(--bs-shadow-rgb),.075)!important;}.shadow-lg{--bs-shadow-rgb:0,0,0;box-shadow:0 1rem 3rem rgba(var(--bs-shadow-rgb),.175)!important;}.shadow-none{box-shadow:none!important;}.shadow-primary{--bs-shadow-rgb:var(--bs-primary-rgb);}.shadow-secondary{--bs-shadow-rgb:var(--bs-secondary-rgb);}.shadow-success{--bs-shadow-rgb:var(--bs-success-rgb);}.shadow-info{--bs-shadow-rgb:var(--bs-info-rgb);}.shadow-warning{--bs-shadow-rgb:var(--bs-warning-rgb);}.shadow-danger{--bs-shadow-rgb:var(--bs-danger-rgb);}.shadow-light{--bs-shadow-rgb:var(--bs-light-rgb);}.shadow-dark{--bs-shadow-rgb:var(--bs-dark-rgb);}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);}.imgFitToSize{height:10rem;object-fit:cover;}@media(max-width:640.98px){.imgFitToSize{height:7.5rem;}.card-body{background-color:transparent;}}
+.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.text-sizer{font-size:1.1rem;}.labelTop{padding:.1em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.75);border-radius:15px 15px 0 0;}.scroll-left{height:1.5em;overflow:hidden;position:relative;width:70%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);-moz-animation:scroll-left 8s ease infinite;-webkit-animation:scroll-left 8s ease infinite;animation:scroll-left 8s ease infinite;}@keyframes scroll-left{0%{transform:translateX(0%);}30%{transform:translateX(0%);}80%{transform:translateX(-50%);}}.sVe{text-align:left;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffc107;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.shadow{--bs-shadow-rgb:0,0,0;box-shadow:0 .5rem 1rem rgba(var(--bs-shadow-rgb),.15)!important;}.shadow-sm{--bs-shadow-rgb:0,0,0;box-shadow:0 .125rem .25rem rgba(var(--bs-shadow-rgb),.075)!important;}.shadow-lg{--bs-shadow-rgb:0,0,0;box-shadow:0 1rem 3rem rgba(var(--bs-shadow-rgb),.175)!important;}.shadow-none{box-shadow:none!important;}.shadow-primary{--bs-shadow-rgb:var(--bs-primary-rgb);}.shadow-secondary{--bs-shadow-rgb:var(--bs-secondary-rgb);}.shadow-success{--bs-shadow-rgb:var(--bs-success-rgb);}.shadow-info{--bs-shadow-rgb:var(--bs-info-rgb);}.shadow-warning{--bs-shadow-rgb:var(--bs-warning-rgb);}.shadow-danger{--bs-shadow-rgb:var(--bs-danger-rgb);}.shadow-light{--bs-shadow-rgb:var(--bs-light-rgb);}.shadow-dark{--bs-shadow-rgb:var(--bs-dark-rgb);}.card-body{background-color:currentColor;background-image:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);}.imgFitToSize{height:10rem;object-fit:cover;}@media(max-width:639.98px){.imgFitToSize{height:7.5rem;}.card-body{background-color:transparent;}}

MP-TAB3/Components/MachineSelOdl.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/NotesEditor.razor.cs

@@ -15,7 +15,7 @@ using MP_TAB3;
 using MP_TAB3.Shared;
 using MP_TAB3.Components;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Services;
 using Newtonsoft.Json;

MP-TAB3/Components/NotesMan.razor.cs

@@ -1,6 +1,6 @@
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Services;
 using NLog.LayoutRenderers.Wrappers;

MP-TAB3/Components/OdlMan.razor.cs

@@ -1,7 +1,7 @@
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Objects;
 using MP.Data.Services;
 using NLog;

MP-TAB3/Components/ParamsMan.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Services;
 using NLog;

MP-TAB3/Components/PlaceholderDetail.razor

@@ -1,10 +1,10 @@
 <div class="card text-white2 shadow bg-dark p-0 m-0">
     <div class="card-body rounded rounded-3 py-2">
         <div class="row">
-            <div class="col-12 placeholder-glow text-center mb-2">
+            <div class="col-12 placeholder-glow text-center mb-1">
                 <span class="placeholder col-3 fs-2 bg-light"></span>
             </div>
-            <div class="col-4 placeholder-glow">
+            <div class="col-4 placeholder-glow my-1">
                 <span class="placeholder text-light col-12"></span>
                 <span class="placeholder text-warning placeholder-sm col-9"></span>
                 <span class="placeholder text-warning placeholder-sm col-2"></span>
@@ -13,10 +13,10 @@
                 <span class="placeholder text-primary placeholder-sm col-9"></span>
                 <span class="placeholder text-primary placeholder-sm col-2"></span>
             </div>
-            <div class="col-4 placeholder-glow text-center">
-                <span class="placeholder col-6 bg-success pholderHeight rounded rounded-5"></span>
+            <div class="col-4 placeholder-glow text-center py-2 my-1">
+                <span class="placeholder col-6 bg-success rounded-circle h-100"></span>
             </div>
-            <div class="col-4 placeholder-glow">
+            <div class="col-4 placeholder-glow my-1">
                 <span class="placeholder col-12"></span>
                 <span class="placeholder text-light col-9"></span>
                 <span class="placeholder text-light col-2"></span>
@@ -25,7 +25,7 @@
                 <span class="placeholder text-light col-9"></span>
                 <span class="placeholder text-light col-2"></span>
             </div>
-            <div class="col-12 placeholder-glow text-center mt-1">
+            <div class="col-12 placeholder-glow text-center my-1">
                 <span class="placeholder placeholder-lg fs-2 col-2 bg-warning"></span>
                 <span class="placeholder placeholder-lg fs-2 col-7 bg-primary"></span>
                 <span class="placeholder placeholder-lg fs-2 col-2 bg-info"></span>

MP-TAB3/Components/PrintMag.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/ProdConfirm.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 using NLog.Fluent;

MP-TAB3/Components/ProdPlanMan.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/ProdStat.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 
 namespace MP_TAB3.Components
 {

MP-TAB3/Components/ScrapEditor.razor.cs

@@ -1,6 +1,6 @@
 using global::Microsoft.AspNetCore.Components;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/ScrapKitMan.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 

MP-TAB3/Components/ScrapMan.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 using static EgwCoreLib.Utils.DtUtils;

MP-TAB3/Components/SlideMenu.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/TechSheetMan.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Components

MP-TAB3/Components/TechSheet_ST_Detail.razor.cs

@@ -15,7 +15,7 @@ using MP_TAB3;
 using MP_TAB3.Shared;
 using MP_TAB3.Components;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Services;
 using Newtonsoft.Json;

MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Objects;
 using MP.Data.Services;
 

MP-TAB3/Components/TechSheet_ST_ObjView.razor.cs

@@ -1,6 +1,6 @@
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Objects;
 using MP.Data.Services;
 

MP-TAB3/MP-TAB3.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2503.809</Version>
+      <Version>6.16.2503.1009</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>

MP-TAB3/Pages/BasePage.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data;
 using MP.Data.Services;
 using Newtonsoft.Json;

MP-TAB3/Pages/Index.razor.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data;
 using MP.Data.Services;
 using MP_TAB3.Shared;

MP-TAB3/Pages/ProdStop.razor.cs

@@ -1,7 +1,7 @@
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 using MP.Data;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using MP_TAB3.Components;
 using NLog;

MP-TAB3/Pages/RegNewDevice.razor.cs

@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.WebUtilities;
 
 //using MongoDB.Bson.IO;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Services;
 using Newtonsoft.Json;

MP-TAB3/Pages/StatusMap.razor

@@ -1,11 +1,11 @@
 @page "/status-map"
 
 <div class="pe-0">
-    <div class="row mb-2">
-        @if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
+    @if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
+    {
+        if (ListMachineEnabled == null || ListMachineEnabled.Count == 0)
         {
-            if (ListMachineEnabled == null || ListMachineEnabled.Count == 0)
-            {
+            <div class="row mb-2">
                 <div class="col alert alert-primary p-5 mx-3 text-center">
                     <h1 class="fs-1">
                         <b>Attenzione!</b>
@@ -20,38 +20,65 @@
                         <i class="fa fa-lg fa-sign-out pe-2" aria-hidden="true"></i> LogOut
                     </NavLink>
                 </div>
-            }
-            else
-            {
-                <div class="p-3">
-                    <EgwCoreLib.Razor.LoadingData DisplaySize="LoadingData.CtrlSize.Large"></EgwCoreLib.Razor.LoadingData>
-                </div>
-            }
+            </div>
         }
         else
         {
-            int maxBlocks = calcMaxBlock();
-            int currIdx = 0;
-            @foreach (var item in ListMSE)
-            {
-                currIdx++;
-                <div class="col ps-0 pe-1">
-                    <MachineBlock RecMSE="@item" FullMode="true" Width="@Width" Height="@Height" ShowCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
+            <div class="row mb-2">
+                <div class="p-3">
+                    <EgwCoreLib.Razor.LoadingData DisplaySize="LoadingData.CtrlSize.Large"></EgwCoreLib.Razor.LoadingData>
                 </div>
-                @if (currIdx >= maxBlocks)
+            </div>
+        }
+    }
+    else
+    {
+        int mseIdx = 0;
+        for (int i = 0; i < mapNRow; i++)
+        {
+            <div class="row mb-2">
+                @for (int j = 0; j < mapNCol; j++)
                 {
-                    currIdx = 0;
-                    @((MarkupString)"</div>")
-                    @((MarkupString)"<div class=\"row mb-2\">")
+                    var currMse = MseById(mseIdx);
+                    mseIdx++;
+                    if (currMse != null)
+                    {
+                        <div class="col ps-0 pe-1">
+                            <MachineBlock RecMSE="currMse" FullMode="true" Width="@Width" Height="@Height" ShowCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="col ps-0 pe-1 bloccoMacc">&nbsp;</div>
+                    }
+                }
+            </div>
+        }
+        @*  <div class="row mb-2">
+            @{
+                int maxBlocks = calcMaxBlock();
+                int currIdx = 0;
+                @foreach (var item in ListMSE)
+                {
+                    currIdx++;
+                    <div class="col ps-0 pe-1">
+                        <MachineBlock RecMSE="@item" FullMode="true" Width="@Width" Height="@Height" ShowCard="@ShowCard" doBlink="@doBlink"></MachineBlock>
+                    </div>
+                    @if (currIdx >= maxBlocks)
+                    {
+                        currIdx = 0;
+                        @((MarkupString)"</div>")
+                        @((MarkupString)"<div class=\"row mb-2\">")
+                    }
+                }
+                // controllo se devo "chiudere riga...
+                int currNum = (currIdx % maxBlocks);
+                while (currNum < (maxBlocks))
+                {
+                    @((MarkupString)"<div class=\"col ps-0 pe-1 bloccoMacc\">&nbsp;</div>")
+                    currNum++;
                 }
             }
-            // controllo se devo "chiudere riga...
-            int currNum = (currIdx % maxBlocks);
-            while (currNum < (maxBlocks))
-            {
-                @((MarkupString)"<div class=\"col ps-0 pe-1 bloccoMacc\">&nbsp;</div>")
-                currNum++;
-            }
-        }
-    </div>
+        </div> *@
+    }
 </div>

MP-TAB3/Pages/StatusMap.razor.cs

@@ -2,7 +2,7 @@ using global::Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MP.Data;
 using MP.Data.Conf;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using MP_TAB3.Shared;
 using Newtonsoft.Json;
@@ -111,6 +111,58 @@ namespace MP_TAB3.Pages
             return answ;
         }
 
+        /// <summary>
+        /// Numero righe mappa: calcolato da num elementi e numMax x riga...
+        /// </summary>
+        protected int mapNRow
+        {
+            get
+            {
+                int answ = 1;
+                int numElems = ListMSE != null ? ListMSE.Count : 1;
+                answ = (int)Math.Ceiling((double)numElems / mapNCol);
+                return answ;
+            }
+        }
+
+        /// <summary>
+        /// restituisce MSE dato indice
+        /// </summary>
+        /// <param name="mseIdx">Indice MSE richiesto</param>
+        /// <returns></returns>
+        protected MappaStatoExpl? MseById(int mseIdx)
+        {
+            MappaStatoExpl? answ = null;
+            if (ListMSE != null && ListMSE.Count > mseIdx)
+            {
+                answ = ListMSE[mseIdx];
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Numero colonne mappa: calcolato larghezza riga...
+        /// </summary>
+        protected int mapNCol
+        {
+            get
+            {
+                int answ = 2;
+                if (Width > 450)
+                {
+                    if (Width < 1024)
+                    {
+                        answ = (int)Math.Floor((decimal)Width / 200);
+                    }
+                    else
+                    {
+                        answ = (int)Math.Floor((decimal)Width / 220) - 1;
+                    }
+                }
+                return answ;
+            }
+        }
+
         protected async Task DoLogout()
         {
             string tgtUrl = "logout";

MP-TAB3/Pages/TCHistory.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 

MP-TAB3/Pages/User.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 

MP-TAB3/Pages/WorkShift.razor.cs

@@ -1,5 +1,5 @@
 using global::Microsoft.AspNetCore.Components;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 
 namespace MP_TAB3.Pages

MP-TAB3/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2503.809</h4>
+    <h4>Versione: 6.16.2503.1009</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP-TAB3/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2503.809
+6.16.2503.1009

MP-TAB3/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2503.809</version>
+  <version>6.16.2503.1009</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP-TAB3/Shared/MainLayout.razor.cs

@@ -1,7 +1,7 @@
 using global::Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.JSInterop;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Services;
 using NLog;
 

MP-TAB3/_Imports.razor

@@ -10,7 +10,7 @@
 @using MP_TAB3.Shared
 @using MP_TAB3.Components
 @using MP.Data
-@using MP.Data.DatabaseModels
+@using MP.Data.DbModels
 @using MP.Data.DTO
 @using MP.Data.Services
 @using Newtonsoft.Json

MP-TAB3/wwwroot/css/site.css

@@ -32,11 +32,6 @@ body {
 .longStopListNotes {
   height: 100%;
 }
-@media (max-width: 639.98px) {
-  .longStopListNotes {
-    max-height: 120px;
-  }
-}
 .borderStd {
   border-radius: 0.375rem;
 }
@@ -124,21 +119,6 @@ a,
   overflow: hidden;
   text-overflow: ellipsis;
 }
-@media (max-width: 800px) {
-  .top-row:not(.auth) {
-    display: none;
-  }
-  #mainBody {
-    width: 100%;
-  }
-  .top-row.auth {
-    justify-content: space-between;
-  }
-  .top-row ::deep a,
-  .top-row ::deep .btn-link {
-    margin-left: 0;
-  }
-}
 .top-row {
   position: sticky;
   top: 0;
@@ -153,4 +133,34 @@ a,
 article {
   padding-left: 1rem !important;
   padding-right: 0.5rem !important;
+}
+/* gestione override font size */
+* {
+  font-size: 16px;
+}
+@media (max-width: 639.98px) {
+  * {
+    font-size: 12px;
+  }
+  .longStopListNotes {
+    max-height: 120px;
+  }
+}
+@media (max-width: 800px) {
+  * {
+    font-size: 14px;
+  }
+  .top-row:not(.auth) {
+    display: none;
+  }
+  #mainBody {
+    width: 100%;
+  }
+  .top-row.auth {
+    justify-content: space-between;
+  }
+  .top-row ::deep a,
+  .top-row ::deep .btn-link {
+    margin-left: 0;
+  }
 }

MP-TAB3/wwwroot/css/site.less

@@ -15,6 +15,7 @@ html, body {
     /*height: 100%;*/
     flex-shrink: 0;
 }
+
 .cardObjNoBL {
     border-radius: 0.375rem 0 0 0.375rem;
     background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
@@ -23,97 +24,92 @@ html, body {
     flex-shrink: 0;
 }
 
-.cardFullHeight{
+.cardFullHeight {
     .cardObj;
     height: 100%;
 }
 
-.longStopListNotes{
+.longStopListNotes {
     height: 100%;
 }
 
-@media (max-width: 639.98px) {
-    .longStopListNotes{
-        max-height: 120px;
-    }
+
+.borderStd {
+    border-radius: 0.375rem;
 }
 
-    .borderStd {
-        border-radius: 0.375rem;
-    }
+.table-dark {
+    --bs-table-color: #fff;
+    --bs-table-bg: transparent;
+    --bs-table-border-color: #4d5154;
+    --bs-table-striped-bg: #2c3034;
+    --bs-table-striped-color: #fff;
+    --bs-table-active-bg: #373b3e;
+    --bs-table-active-color: #fff;
+    --bs-table-hover-bg: #323539;
+    --bs-table-hover-color: #fff;
+    color: var(--bs-table-color);
+    border-color: var(--bs-table-border-color);
+}
 
-    .table-dark {
-        --bs-table-color: #fff;
-        --bs-table-bg: transparent;
-        --bs-table-border-color: #4d5154;
-        --bs-table-striped-bg: #2c3034;
-        --bs-table-striped-color: #fff;
-        --bs-table-active-bg: #373b3e;
-        --bs-table-active-color: #fff;
-        --bs-table-hover-bg: #323539;
-        --bs-table-hover-color: #fff;
-        color: var(--bs-table-color);
-        border-color: var(--bs-table-border-color);
-    }
+h1:focus {
+    outline: none;
+}
 
-    h1:focus {
-        outline: none;
-    }
+a, .btn-link {
+    color: #0071c1;
+}
 
-    a, .btn-link {
-        color: #0071c1;
-    }
+.btn-primary {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
 
-    .btn-primary {
-        color: #fff;
-        background-color: #1b6ec2;
-        border-color: #1861ac;
-    }
+.content {
+    padding-top: 1.1rem;
+}
 
-    .content {
-        padding-top: 1.1rem;
-    }
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
 
-    .valid.modified:not([type=checkbox]) {
-        outline: 1px solid #26b050;
-    }
+.invalid {
+    outline: 1px solid red;
+}
 
-    .invalid {
-        outline: 1px solid red;
-    }
+.validation-message {
+    color: red;
+}
 
-    .validation-message {
-        color: red;
-    }
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
 
-    #blazor-error-ui {
-        background: lightyellow;
-        bottom: 0;
-        box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-        display: none;
-        left: 0;
-        padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-        position: fixed;
-        width: 100%;
-        z-index: 1000;
-    }
+#blazor-error-ui .dismiss {
+    cursor: pointer;
+    position: absolute;
+    right: 0.75rem;
+    top: 0.5rem;
+}
 
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
+.blazor-error-boundary {
+    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
+    padding: 1rem 1rem 1rem 3.7rem;
+    color: white;
+}
 
-    .blazor-error-boundary {
-        background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
-        padding: 1rem 1rem 1rem 3.7rem;
-        color: white;
-    }
-
-    .blazor-error-boundary::after {
-        content: "An error has occurred."
-    }
+.blazor-error-boundary::after {
+    content: "An error has occurred."
+}
 
 .top-row {
     background-color: #05173d;
@@ -140,24 +136,6 @@ html, body {
 }
 
 
-@media (max-width: 800px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    #mainBody {
-        width: 100%;
-    }
-
-    .top-row.auth {
-        justify-content: space-between;
-    }
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        margin-left: 0;
-    }
-}
-
 .top-row {
     position: sticky;
     top: 0;
@@ -173,4 +151,39 @@ html, body {
 .top-row, article {
     padding-left: 1rem !important;
     padding-right: .5rem !important;
+}
+
+/* gestione override font size */
+* {
+    font-size: 16px;
+}
+
+@media (max-width: 639.98px) {
+    * {
+        font-size: 12px;
+    }
+    .longStopListNotes {
+        max-height: 120px;
+    }
+}
+
+@media (max-width: 800px) {
+    * {
+        font-size: 14px;
+    }
+    .top-row:not(.auth) {
+        display: none;
+    }
+
+    #mainBody {
+        width: 100%;
+    }
+
+    .top-row.auth {
+        justify-content: space-between;
+    }
+
+    .top-row ::deep a, .top-row ::deep .btn-link {
+        margin-left: 0;
+    }
 }

MP-TAB3/wwwroot/css/site.min.css

@@ -1 +1 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Open Sans Condensed',sans-serif;background-color:#151321;color:#ededed;}.cardObj{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardObjNoBL{border-radius:.375rem 0 0 .375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardFullHeight{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;height:100%;}.longStopListNotes{height:100%;}@media(max-width:639.98px){.longStopListNotes{max-height:120px;}}.borderStd{border-radius:.375rem;}.table-dark{--bs-table-color:#fff;--bs-table-bg:transparent;--bs-table-border-color:#4d5154;--bs-table-striped-bg:#2c3034;--bs-table-striped-color:#fff;--bs-table-active-bg:#373b3e;--bs-table-active-color:#fff;--bs-table-hover-bg:#323539;--bs-table-hover-color:#fff;color:var(--bs-table-color);border-color:var(--bs-table-border-color);}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}.top-row{background-color:#05173d;justify-content:flex-end;height:3.5rem;display:flex;align-items:center;}.top-row ::deep a,.top-row ::deep .btn-link{white-space:nowrap;text-decoration:none;}.top-row ::deep a:hover,.top-row ::deep .btn-link:hover{text-decoration:underline;}.top-row ::deep a:first-child{overflow:hidden;text-overflow:ellipsis;}@media(max-width:800px){.top-row:not(.auth){display:none;}#mainBody{width:100%;}.top-row.auth{justify-content:space-between;}.top-row ::deep a,.top-row ::deep .btn-link{margin-left:0;}}.top-row{position:sticky;top:0;z-index:1;}.top-row.auth ::deep a:first-child{flex:1;text-align:right;width:0;}.top-row,article{padding-left:1rem!important;padding-right:.5rem!important;}
+@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');html,body{font-family:'Open Sans Condensed',sans-serif;background-color:#151321;color:#ededed;}.cardObj{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardObjNoBL{border-radius:.375rem 0 0 .375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;}.cardFullHeight{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);flex-shrink:0;height:100%;}.longStopListNotes{height:100%;}.borderStd{border-radius:.375rem;}.table-dark{--bs-table-color:#fff;--bs-table-bg:transparent;--bs-table-border-color:#4d5154;--bs-table-striped-bg:#2c3034;--bs-table-striped-color:#fff;--bs-table-active-bg:#373b3e;--bs-table-active-color:#fff;--bs-table-hover-bg:#323539;--bs-table-hover-color:#fff;color:var(--bs-table-color);border-color:var(--bs-table-border-color);}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}.top-row{background-color:#05173d;justify-content:flex-end;height:3.5rem;display:flex;align-items:center;}.top-row ::deep a,.top-row ::deep .btn-link{white-space:nowrap;text-decoration:none;}.top-row ::deep a:hover,.top-row ::deep .btn-link:hover{text-decoration:underline;}.top-row ::deep a:first-child{overflow:hidden;text-overflow:ellipsis;}.top-row{position:sticky;top:0;z-index:1;}.top-row.auth ::deep a:first-child{flex:1;text-align:right;width:0;}.top-row,article{padding-left:1rem!important;padding-right:.5rem!important;}*{font-size:16px;}@media(max-width:639.98px){*{font-size:12px;}.longStopListNotes{max-height:120px;}}@media(max-width:800px){*{font-size:14px;}.top-row:not(.auth){display:none;}#mainBody{width:100%;}.top-row.auth{justify-content:space-between;}.top-row ::deep a,.top-row ::deep .btn-link{margin-left:0;}}

MP.AppAuth/Models/AnagraficaFlussi.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace MP.AppAuth.Models
-{
-    public partial class AnagraficaFlussi
-    {
-        #region Public Properties
-
-        public string CodFlux { get; set; }
-        public string DescrFlux { get; set; }
-
-        #endregion Public Properties
-    }
-}

MP.AppAuth/MoonProContext.cs

@@ -58,7 +58,6 @@ namespace MP.AppAuth
         public virtual DbSet<AnagraficaEventi> DbSetAnagEventi { get; set; }
         public virtual DbSet<AnagClassiTempo> DbSetAnagClassiTempo { get; set; }
         public virtual DbSet<AnagraficaCausaliScarto> DbSetAnagCauSca { get; set; }
-        public virtual DbSet<AnagraficaFlussi> DbSetAnagFlussi { get; set; }
         public virtual DbSet<AnagraficaIngressi> DbSetAnagIngressi { get; set; }
         public virtual DbSet<AnagraficaMicroStati> DbSetAnagMicroStati { get; set; }
         public virtual DbSet<AnagraficaStati> DbSetAnagStati { get; set; }
@@ -210,17 +209,6 @@ namespace MP.AppAuth
                     .HasDefaultValueSql("('')");
             });
 
-            modelBuilder.Entity<AnagraficaFlussi>(entity =>
-            {
-                entity.HasKey(e => e.CodFlux);
-
-                entity.ToTable("AnagraficaFlussi");
-
-                entity.Property(e => e.CodFlux).HasMaxLength(50);
-
-                entity.Property(e => e.DescrFlux).HasMaxLength(50);
-            });
-
             modelBuilder.Entity<AnagraficaIngressi>(entity =>
             {
                 entity.HasKey(e => new { e.IdxFamigliaIngresso, e.ValoreIngresso });

MP.Data/Controllers/MpInveController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using NLog;
 using System;
 using System.Collections.Generic;

MP.Data/Controllers/MpIocController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -127,9 +127,9 @@ namespace MP.Data.Controllers
         /// <param name="CodFlux">*=tutti, altrimenti solo selezionato</param>
         /// <param name="MaxRec">numero massimo record da restituire</param>
         /// <returns></returns>
-        public List<FluxLog> FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec)
+        public List<FluxLogModel> FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec)
         {
-            List<FluxLog> dbResult = new List<FluxLog>();
+            List<FluxLogModel> dbResult = new List<FluxLogModel>();
             using (var dbCtx = new MoonPro_FluxContext(_configuration))
             {
                 dbResult = dbCtx

MP.Data/Controllers/MpLandController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Objects;
 using NLog;
 using System;

MP.Data/Controllers/MpMonController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -29,9 +29,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.StatsAnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
+        public List<DbModels.StatsAnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
         {
-            List<DatabaseModels.StatsAnagArticoli> dbResult = new List<DatabaseModels.StatsAnagArticoli>();
+            List<DbModels.StatsAnagArticoli> dbResult = new List<DbModels.StatsAnagArticoli>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 dbResult = dbCtx
@@ -49,9 +49,9 @@ namespace MP.Data.Controllers
         /// Elenco da tabella Macchine
         /// </summary>
         /// <returns></returns>
-        public List<DatabaseModels.ConfigModel> ConfigGetAll()
+        public List<DbModels.ConfigModel> ConfigGetAll()
         {
-            List<DatabaseModels.ConfigModel> dbResult = new List<DatabaseModels.ConfigModel>();
+            List<DbModels.ConfigModel> dbResult = new List<DbModels.ConfigModel>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 dbResult = dbCtx
@@ -71,9 +71,9 @@ namespace MP.Data.Controllers
         /// Elenco da tabella Macchine
         /// </summary>
         /// <returns></returns>
-        public List<DatabaseModels.Macchine> MacchineGetAll()
+        public List<DbModels.Macchine> MacchineGetAll()
         {
-            List<DatabaseModels.Macchine> dbResult = new List<DatabaseModels.Macchine>();
+            List<DbModels.Macchine> dbResult = new List<DbModels.Macchine>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 dbResult = dbCtx
@@ -136,9 +136,9 @@ namespace MP.Data.Controllers
         /// Elenco da tabella MappaStatoExpl
         /// </summary>
         /// <returns></returns>
-        public List<DatabaseModels.MappaStatoExpl> MseGetAll(int maxAge = 2000)
+        public List<DbModels.MappaStatoExpl> MseGetAll(int maxAge = 2000)
         {
-            List<DatabaseModels.MappaStatoExpl> dbResult = new List<DatabaseModels.MappaStatoExpl>();
+            List<DbModels.MappaStatoExpl> dbResult = new List<DbModels.MappaStatoExpl>();
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge);

MP.Data/Controllers/MpSpecController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.DTO;
 using MP.Data.Objects;
 using NLog;
@@ -696,9 +696,9 @@ namespace MP.Data.Controllers
         /// <param name="CodFlux">*=tutti, altrimenti solo selezionato</param>
         /// <param name="MaxRec">numero massimo record da restituire</param>
         /// <returns></returns>
-        public List<FluxLog> FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec)
+        public List<FluxLogModel> FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec)
         {
-            List<FluxLog> dbResult = new List<FluxLog>();
+            List<FluxLogModel> dbResult = new List<FluxLogModel>();
             using (var dbCtx = new MoonPro_FluxContext(_configuration))
             {
                 dbResult = dbCtx

MP.Data/Controllers/MpStatsController.cs

@@ -2,7 +2,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -277,6 +277,28 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+
+        /// <summary>
+        /// Restituisce dataset FluxLog filtrato
+        /// </summary>
+        /// <param name="IdxMacchina">Macchina singola, se "" = tutte</param>
+        /// <param name="DtStart">Data inizio selezione odl (inizio/fine)</param>
+        /// <param name="DtEnd">Data fine selezione odl (inizio/fine)</param>
+        /// <returns></returns>
+        public List<FLModel> FluxLogRawData(string IdxMacchina, DateTime DtStart, DateTime DtEnd)
+        {
+            List<FLModel> dbResult = new List<FLModel>();
+            using (var dbCtx = new MoonPro_STATSContext(_configuration))
+            {
+
+                dbResult = dbCtx
+                            .DbSetFL
+                            .Where(x => (IdxMacchina=="*" || x.IdxMacchina == IdxMacchina) && (x.dtEvento >= DtStart && x.dtEvento <= DtEnd))
+                            .ToList();
+            }
+            return dbResult;
+        }
+
         /// <summary>
         /// Elenco tabella ODL da filtro
         /// </summary>

MP.Data/Controllers/MpTabController.cs

@@ -1,7 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using MP.Data.Objects;
 using NLog;
 using System;

MP.Data/Controllers/MpVocController.cs

@@ -2,7 +2,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using NLog;
 using System;
 using System.Collections.Generic;

MP.Data/DTO/DossierFluxLogDTO.cs

@@ -1,4 +1,4 @@
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

MP.Data/DTO/FermiCommentatiDTO.cs

@@ -1,4 +1,4 @@
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

MP.Data/DTO/userTknDTO.cs

@@ -1,4 +1,4 @@
-using MP.Data.DatabaseModels;
+using MP.Data.DbModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;

MP.Data/DbModels/AlarmLogModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AlarmLog")]
     public partial class AlarmLogModel

MP.Data/DbModels/AnagArticoli.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagArticoli")]
     public partial class AnagArticoli

MP.Data/DbModels/AnagArticoli_MAG.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagArticoli")]
     public partial class AnagArticoli_MAG

MP.Data/DbModels/AnagEventiModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagraficaEventi")]
     public class AnagEventiModel

MP.Data/DbModels/AnagFLTransModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagFLTrans")]
     public class AnagFLTransModel

MP.Data/DbModels/AnagFluxTypeModel.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DbModels
+{
+    [Table("AnagFluxType")]
+    public partial class AnagFluxTypeModel
+    {
+        #region Public Properties
+
+        [Key, MaxLength(50)]
+        public string FluxType { get; set; } = "";
+
+        [MaxLength(50)]
+        public string DescrType { get; set; } = "";
+
+        public bool IsNumber { get; set; } = false;
+
+        public bool IsEnergy { get; set; } = false;
+
+        #endregion Public Properties
+    }
+}

MP.Data/DbModels/AnagGiacenzeModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("RegGiacenze")]
     public class AnagGiacenzeModel

MP.Data/DbModels/AnagGruppi.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagraficaGruppi")]
     public partial class AnagGruppi

MP.Data/DbModels/AnagKeyValueModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagKeyValue")]
     public partial class AnagKeyValueModel

MP.Data/DbModels/AnagLottiArca.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Keyless]
     public partial class AnagLottiArca

MP.Data/DbModels/AnagLottoModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("ElencoLotti")]
     public class AnagLottoModel

MP.Data/DbModels/AnagMagModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagMagazzini")]
     public partial class AnagMagModel

MP.Data/DbModels/AnagOperatoriModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     // <Auto-Generated>
     // This is here so CodeMaid doesn't reorganize this document

MP.Data/DbModels/AnagStatiModel.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagraficaStati")]
     public class AnagStatiModel

MP.Data/DbModels/AnagTagsModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("AnagTags")]
     public partial class AnagTagsModel

MP.Data/DbModels/AnagUdcModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("ElencoUdc")]
     public class AnagUdcModel

MP.Data/DbModels/AnagraficaFlussiModel.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+#nullable disable
+
+namespace MP.Data.DbModels
+{
+    [Table("AnagraficaFlussi")]
+    public partial class AnagraficaFlussiModel
+    {
+        #region Public Properties
+
+        [Key, MaxLength(50)]
+        public string CodFlux { get; set; }
+
+        [MaxLength(50)]
+        public string DescrFlux { get; set; }
+
+        [MaxLength(50)]
+        public string FluxType { get; set; } = "";
+
+        /// <summary>
+        /// Navigazione oggetto AnagFluxType
+        /// </summary>
+        [ForeignKey("FluxType")]
+        public virtual AnagFluxTypeModel FluxTypeNav { get; set; } = null!;
+
+        #endregion Public Properties
+    }
+}

MP.Data/DbModels/AzioniUL.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     public partial class AzioniUL
     {

MP.Data/DbModels/CommentiModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     public partial class CommentiModel
     {

MP.Data/DbModels/ConfigModel.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("Config")]
     public partial class ConfigModel

MP.Data/DbModels/DatiMacchineModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     public partial class DatiMacchineModel
     {

MP.Data/DbModels/DdbTurni.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     public partial class DdbTurni
     {

MP.Data/DbModels/DiarioDiBordoModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("DiarioDiBordo")]
     public partial class DiarioDiBordoModel

MP.Data/DbModels/DossierModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("Dossiers")]
     public partial class DossierModel

MP.Data/DbModels/ElencoLottiModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("ElencoLotti")]
     public partial class ElencoLottiModel

MP.Data/DbModels/EventListModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("EventList")]
     public partial class EventListModel
@@ -36,6 +36,7 @@ namespace MP.Data.DatabaseModels
         /// </summary>
         [ForeignKey("IdxMacchina")]
         public virtual Macchine MachineNav { get; set; } = null!;
+
         /// <summary>
         /// Navigazione oggetto Articolo
         /// </summary>

MP.Data/DbModels/FLModel.cs

@@ -0,0 +1,30 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+
+#nullable disable
+// <Auto-Generated>
+// This is here so CodeMaid doesn't reorganize this document
+// </Auto-Generated>
+namespace MP.Data.DbModels
+{
+    [Table("FL")]
+    public partial class FLModel
+    {
+        #region Public Properties
+
+        [MaxLength(50)]
+        public string IdxMacchina { get; set; }
+
+        public DateTime dtEvento { get; set; }
+
+        [MaxLength(50)]
+        public string CodFlux { get; set; }
+
+        [MaxLength(250)]
+        public string Valore { get; set; }
+
+        #endregion Public Properties
+    }
+}

MP.Data/DbModels/FermiNonQualModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     public partial class FermiNonQualModel
     {

MP.Data/DbModels/FluxLogModel.cs

@@ -7,10 +7,10 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("FluxLog")]
-    public partial class FluxLog
+    public partial class FluxLogModel
     {
         #region Public Properties
 

MP.Data/DbModels/Gruppi2MaccModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("Gruppi2Macchine")]
     public partial class Gruppi2MaccModel

MP.Data/DbModels/Gruppi2OperModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("Gruppi2Operatori")]
     public partial class Gruppi2OperModel

MP.Data/DbModels/InveSessTotLotModel.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Keyless]
     public partial class InveSessTotLotModel

MP.Data/DbModels/InventorySessionModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("InveSess")]
     public class InventorySessionModel

MP.Data/DbModels/KeepAliveModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     public partial class KeepAliveModel
     {

MP.Data/DbModels/LingueModel.cs

@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 // <Auto-Generated>
 // This is here so CodeMaid doesn't reorganize this document
 // </Auto-Generated>
-namespace MP.Data.DatabaseModels
+namespace MP.Data.DbModels
 {
     [Table("Lingue")]
     public partial class LingueModel