diff --git a/MP-TAB3/Components/AlarmsMan.razor.cs b/MP-TAB3/Components/AlarmsMan.razor.cs index dc36e6c3..25c46a45 100644 --- a/MP-TAB3/Components/AlarmsMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/CheckControls.razor.cs b/MP-TAB3/Components/CheckControls.razor.cs index d9da4b7e..a0b229f0 100644 --- a/MP-TAB3/Components/CheckControls.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/CmpTop.razor.cs b/MP-TAB3/Components/CmpTop.razor.cs index 9212a4b6..7c8e31b6 100644 --- a/MP-TAB3/Components/CmpTop.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/CommentEditor.razor.cs b/MP-TAB3/Components/CommentEditor.razor.cs index a7580480..f95cb061 100644 --- a/MP-TAB3/Components/CommentEditor.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/ControlsMan.razor.cs b/MP-TAB3/Components/ControlsMan.razor.cs index 423ef246..0386e08c 100644 --- a/MP-TAB3/Components/ControlsMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/CurrOdlDetail.razor.cs b/MP-TAB3/Components/CurrOdlDetail.razor.cs index a3638c9b..3ca29eb4 100644 --- a/MP-TAB3/Components/CurrOdlDetail.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/DeclarEditor.razor.cs b/MP-TAB3/Components/DeclarEditor.razor.cs index 5f12463c..d2e690a9 100644 --- a/MP-TAB3/Components/DeclarEditor.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/DeclarMan.razor.cs b/MP-TAB3/Components/DeclarMan.razor.cs index bf2f0250..590c2040 100644 --- a/MP-TAB3/Components/DeclarMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/FixOdl.razor.cs b/MP-TAB3/Components/FixOdl.razor.cs index de83ebde..4e42017b 100644 --- a/MP-TAB3/Components/FixOdl.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/LongStopList.razor.cs b/MP-TAB3/Components/LongStopList.razor.cs index 5a9c13a8..471540af 100644 --- a/MP-TAB3/Components/LongStopList.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/MachSel.razor.cs b/MP-TAB3/Components/MachSel.razor.cs index 77659a86..f494da1e 100644 --- a/MP-TAB3/Components/MachSel.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index ab79bfd9..de469228 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/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; @@ -376,7 +376,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 +438,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 +570,7 @@ namespace MP_TAB3.Components } /// - /// Toggle visibilità button + /// Toggle visibilit� button /// private void ToggleDraw() { @@ -578,7 +578,7 @@ namespace MP_TAB3.Components } /// - /// Toggle visibilità blocco PODL + /// Toggle visibilit� blocco PODL /// private void TogglePOdl() { diff --git a/MP-TAB3/Components/MachineSelOdl.razor.cs b/MP-TAB3/Components/MachineSelOdl.razor.cs index 32a41c74..6d92ec57 100644 --- a/MP-TAB3/Components/MachineSelOdl.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/NotesEditor.razor.cs b/MP-TAB3/Components/NotesEditor.razor.cs index 6ade2864..aab45933 100644 --- a/MP-TAB3/Components/NotesEditor.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/NotesMan.razor.cs b/MP-TAB3/Components/NotesMan.razor.cs index f2621695..05a2ce93 100644 --- a/MP-TAB3/Components/NotesMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/OdlMan.razor.cs b/MP-TAB3/Components/OdlMan.razor.cs index cd3c805c..ad194674 100644 --- a/MP-TAB3/Components/OdlMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/ParamsMan.razor.cs b/MP-TAB3/Components/ParamsMan.razor.cs index dcea9053..7458f2fc 100644 --- a/MP-TAB3/Components/ParamsMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/PrintMag.razor.cs b/MP-TAB3/Components/PrintMag.razor.cs index a7e6d9a0..7f3abc67 100644 --- a/MP-TAB3/Components/PrintMag.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index 901bbc51..023c95e4 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/ProdPlanMan.razor.cs b/MP-TAB3/Components/ProdPlanMan.razor.cs index 9aad1a23..479aaf41 100644 --- a/MP-TAB3/Components/ProdPlanMan.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/ProdStat.razor.cs b/MP-TAB3/Components/ProdStat.razor.cs index 5d5277dc..6a9dd52d 100644 --- a/MP-TAB3/Components/ProdStat.razor.cs +++ b/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 { diff --git a/MP-TAB3/Components/ScrapEditor.razor.cs b/MP-TAB3/Components/ScrapEditor.razor.cs index 67aafd2b..43ca3d55 100644 --- a/MP-TAB3/Components/ScrapEditor.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/ScrapKitMan.razor.cs b/MP-TAB3/Components/ScrapKitMan.razor.cs index 5206e199..776ed3ac 100644 --- a/MP-TAB3/Components/ScrapKitMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/ScrapMan.razor.cs b/MP-TAB3/Components/ScrapMan.razor.cs index 2908d642..563e7f0e 100644 --- a/MP-TAB3/Components/ScrapMan.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/SlideMenu.razor.cs b/MP-TAB3/Components/SlideMenu.razor.cs index 95d43cfb..165b6728 100644 --- a/MP-TAB3/Components/SlideMenu.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/TechSheetMan.razor.cs b/MP-TAB3/Components/TechSheetMan.razor.cs index 5082b9df..513be5d8 100644 --- a/MP-TAB3/Components/TechSheetMan.razor.cs +++ b/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 diff --git a/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs b/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs index 672fa1f4..f453f374 100644 --- a/MP-TAB3/Components/TechSheet_ST_Detail.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs b/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs index 927cea93..961bc66e 100644 --- a/MP-TAB3/Components/TechSheet_ST_ObjCheck.razor.cs +++ b/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; diff --git a/MP-TAB3/Components/TechSheet_ST_ObjView.razor.cs b/MP-TAB3/Components/TechSheet_ST_ObjView.razor.cs index 09a2ba51..5b40670a 100644 --- a/MP-TAB3/Components/TechSheet_ST_ObjView.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/BasePage.razor.cs b/MP-TAB3/Pages/BasePage.razor.cs index 87ae6fea..1569a7e4 100644 --- a/MP-TAB3/Pages/BasePage.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/Index.razor.cs b/MP-TAB3/Pages/Index.razor.cs index 746aa7a8..a29e3e19 100644 --- a/MP-TAB3/Pages/Index.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/ProdStop.razor.cs b/MP-TAB3/Pages/ProdStop.razor.cs index ee4a41c0..ff8477de 100644 --- a/MP-TAB3/Pages/ProdStop.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/RegNewDevice.razor.cs b/MP-TAB3/Pages/RegNewDevice.razor.cs index eadff98a..d7d00b95 100644 --- a/MP-TAB3/Pages/RegNewDevice.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/StatusMap.razor.cs b/MP-TAB3/Pages/StatusMap.razor.cs index afa603c1..cffe8fd6 100644 --- a/MP-TAB3/Pages/StatusMap.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/TCHistory.razor.cs b/MP-TAB3/Pages/TCHistory.razor.cs index fe281c80..64ff9a9a 100644 --- a/MP-TAB3/Pages/TCHistory.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/User.razor.cs b/MP-TAB3/Pages/User.razor.cs index 7d0d12f9..dbbd5946 100644 --- a/MP-TAB3/Pages/User.razor.cs +++ b/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; diff --git a/MP-TAB3/Pages/WorkShift.razor.cs b/MP-TAB3/Pages/WorkShift.razor.cs index b77a4fcf..17da5b40 100644 --- a/MP-TAB3/Pages/WorkShift.razor.cs +++ b/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 diff --git a/MP-TAB3/Shared/MainLayout.razor.cs b/MP-TAB3/Shared/MainLayout.razor.cs index eb50caa6..49cb8174 100644 --- a/MP-TAB3/Shared/MainLayout.razor.cs +++ b/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; diff --git a/MP-TAB3/_Imports.razor b/MP-TAB3/_Imports.razor index 614ae7d8..0bef7c4c 100644 --- a/MP-TAB3/_Imports.razor +++ b/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 diff --git a/MP.AppAuth/Models/AnagraficaFlussi.cs b/MP.AppAuth/Models/AnagraficaFlussi.cs deleted file mode 100644 index c004c9b8..00000000 --- a/MP.AppAuth/Models/AnagraficaFlussi.cs +++ /dev/null @@ -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 - } -} \ No newline at end of file diff --git a/MP.AppAuth/MoonProContext.cs b/MP.AppAuth/MoonProContext.cs index 20271e59..f1e58261 100644 --- a/MP.AppAuth/MoonProContext.cs +++ b/MP.AppAuth/MoonProContext.cs @@ -58,7 +58,6 @@ namespace MP.AppAuth public virtual DbSet DbSetAnagEventi { get; set; } public virtual DbSet DbSetAnagClassiTempo { get; set; } public virtual DbSet DbSetAnagCauSca { get; set; } - public virtual DbSet DbSetAnagFlussi { get; set; } public virtual DbSet DbSetAnagIngressi { get; set; } public virtual DbSet DbSetAnagMicroStati { get; set; } public virtual DbSet DbSetAnagStati { get; set; } @@ -210,17 +209,6 @@ namespace MP.AppAuth .HasDefaultValueSql("('')"); }); - modelBuilder.Entity(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(entity => { entity.HasKey(e => new { e.IdxFamigliaIngresso, e.ValoreIngresso }); diff --git a/MP.Data/Controllers/MpInveController.cs b/MP.Data/Controllers/MpInveController.cs index ea482d01..7e3ecb0b 100644 --- a/MP.Data/Controllers/MpInveController.cs +++ b/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; diff --git a/MP.Data/Controllers/MpIocController.cs b/MP.Data/Controllers/MpIocController.cs index e9cf347e..d50e3353 100644 --- a/MP.Data/Controllers/MpIocController.cs +++ b/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 /// *=tutti, altrimenti solo selezionato /// numero massimo record da restituire /// - public List FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec) + public List FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec) { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonPro_FluxContext(_configuration)) { dbResult = dbCtx diff --git a/MP.Data/Controllers/MpLandController.cs b/MP.Data/Controllers/MpLandController.cs index 92f56963..0c8c1806 100644 --- a/MP.Data/Controllers/MpLandController.cs +++ b/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; diff --git a/MP.Data/Controllers/MpMonController.cs b/MP.Data/Controllers/MpMonController.cs index 9b8cf124..1d4c2d4d 100644 --- a/MP.Data/Controllers/MpMonController.cs +++ b/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 /// /// /// - public List ArticoliGetSearch(int numRecord, string searchVal = "") + public List ArticoliGetSearch(int numRecord, string searchVal = "") { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { dbResult = dbCtx @@ -49,9 +49,9 @@ namespace MP.Data.Controllers /// Elenco da tabella Macchine /// /// - public List ConfigGetAll() + public List ConfigGetAll() { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { dbResult = dbCtx @@ -71,9 +71,9 @@ namespace MP.Data.Controllers /// Elenco da tabella Macchine /// /// - public List MacchineGetAll() + public List MacchineGetAll() { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { dbResult = dbCtx @@ -136,9 +136,9 @@ namespace MP.Data.Controllers /// Elenco da tabella MappaStatoExpl /// /// - public List MseGetAll(int maxAge = 2000) + public List MseGetAll(int maxAge = 2000) { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonProContext(_configuration)) { var maxAgeSec = new SqlParameter("@maxAgeSec", maxAge); diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index b3c1f5bc..b8f71dd1 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/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 /// *=tutti, altrimenti solo selezionato /// numero massimo record da restituire /// - public List FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec) + public List FluxLogGetLastFilt(DateTime DtMax, DateTime DtMin, string IdxMacchina, string CodFlux, int MaxRec) { - List dbResult = new List(); + List dbResult = new List(); using (var dbCtx = new MoonPro_FluxContext(_configuration)) { dbResult = dbCtx diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 6ec25ef1..a3460f58 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/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; diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs index 438514bf..7ed8d690 100644 --- a/MP.Data/Controllers/MpTabController.cs +++ b/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; diff --git a/MP.Data/Controllers/MpVocController.cs b/MP.Data/Controllers/MpVocController.cs index 6e55b500..7843306e 100644 --- a/MP.Data/Controllers/MpVocController.cs +++ b/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; diff --git a/MP.Data/DTO/DossierFluxLogDTO.cs b/MP.Data/DTO/DossierFluxLogDTO.cs index ed804309..0e00d97d 100644 --- a/MP.Data/DTO/DossierFluxLogDTO.cs +++ b/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; diff --git a/MP.Data/DTO/FermiCommentatiDTO.cs b/MP.Data/DTO/FermiCommentatiDTO.cs index 83294905..783d9e1c 100644 --- a/MP.Data/DTO/FermiCommentatiDTO.cs +++ b/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; diff --git a/MP.Data/DTO/userTknDTO.cs b/MP.Data/DTO/userTknDTO.cs index 4ff3b3bd..58769c8a 100644 --- a/MP.Data/DTO/userTknDTO.cs +++ b/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; diff --git a/MP.Data/DatabaseModels/AlarmLogModel.cs b/MP.Data/DbModels/AlarmLogModel.cs similarity index 97% rename from MP.Data/DatabaseModels/AlarmLogModel.cs rename to MP.Data/DbModels/AlarmLogModel.cs index 71bd0c1b..982c25c2 100644 --- a/MP.Data/DatabaseModels/AlarmLogModel.cs +++ b/MP.Data/DbModels/AlarmLogModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AlarmLog")] public partial class AlarmLogModel diff --git a/MP.Data/DatabaseModels/AnagArticoli.cs b/MP.Data/DbModels/AnagArticoli.cs similarity index 94% rename from MP.Data/DatabaseModels/AnagArticoli.cs rename to MP.Data/DbModels/AnagArticoli.cs index 8b889c73..122fb6cb 100644 --- a/MP.Data/DatabaseModels/AnagArticoli.cs +++ b/MP.Data/DbModels/AnagArticoli.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagArticoli")] public partial class AnagArticoli diff --git a/MP.Data/DatabaseModels/AnagArticoli_MAG.cs b/MP.Data/DbModels/AnagArticoli_MAG.cs similarity index 95% rename from MP.Data/DatabaseModels/AnagArticoli_MAG.cs rename to MP.Data/DbModels/AnagArticoli_MAG.cs index 62c5de77..acf8707d 100644 --- a/MP.Data/DatabaseModels/AnagArticoli_MAG.cs +++ b/MP.Data/DbModels/AnagArticoli_MAG.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagArticoli")] public partial class AnagArticoli_MAG diff --git a/MP.Data/DatabaseModels/AnagEventiModel.cs b/MP.Data/DbModels/AnagEventiModel.cs similarity index 96% rename from MP.Data/DatabaseModels/AnagEventiModel.cs rename to MP.Data/DbModels/AnagEventiModel.cs index 99c04d3e..75270875 100644 --- a/MP.Data/DatabaseModels/AnagEventiModel.cs +++ b/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 diff --git a/MP.Data/DatabaseModels/AnagFLTransModel.cs b/MP.Data/DbModels/AnagFLTransModel.cs similarity index 95% rename from MP.Data/DatabaseModels/AnagFLTransModel.cs rename to MP.Data/DbModels/AnagFLTransModel.cs index b263a52d..72ff7823 100644 --- a/MP.Data/DatabaseModels/AnagFLTransModel.cs +++ b/MP.Data/DbModels/AnagFLTransModel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagFLTrans")] public class AnagFLTransModel diff --git a/MP.Data/DbModels/AnagFluxTypeModel.cs b/MP.Data/DbModels/AnagFluxTypeModel.cs new file mode 100644 index 00000000..402e057c --- /dev/null +++ b/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 + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/AnagGiacenzeModel.cs b/MP.Data/DbModels/AnagGiacenzeModel.cs similarity index 96% rename from MP.Data/DatabaseModels/AnagGiacenzeModel.cs rename to MP.Data/DbModels/AnagGiacenzeModel.cs index 3b001a78..2ea61bc4 100644 --- a/MP.Data/DatabaseModels/AnagGiacenzeModel.cs +++ b/MP.Data/DbModels/AnagGiacenzeModel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("RegGiacenze")] public class AnagGiacenzeModel diff --git a/MP.Data/DatabaseModels/AnagGruppi.cs b/MP.Data/DbModels/AnagGruppi.cs similarity index 95% rename from MP.Data/DatabaseModels/AnagGruppi.cs rename to MP.Data/DbModels/AnagGruppi.cs index ccaff018..0502c46d 100644 --- a/MP.Data/DatabaseModels/AnagGruppi.cs +++ b/MP.Data/DbModels/AnagGruppi.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagraficaGruppi")] public partial class AnagGruppi diff --git a/MP.Data/DatabaseModels/AnagKeyValueModel.cs b/MP.Data/DbModels/AnagKeyValueModel.cs similarity index 95% rename from MP.Data/DatabaseModels/AnagKeyValueModel.cs rename to MP.Data/DbModels/AnagKeyValueModel.cs index 22fbf280..5677dcb1 100644 --- a/MP.Data/DatabaseModels/AnagKeyValueModel.cs +++ b/MP.Data/DbModels/AnagKeyValueModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagKeyValue")] public partial class AnagKeyValueModel diff --git a/MP.Data/DatabaseModels/AnagLottiArca.cs b/MP.Data/DbModels/AnagLottiArca.cs similarity index 97% rename from MP.Data/DatabaseModels/AnagLottiArca.cs rename to MP.Data/DbModels/AnagLottiArca.cs index ab057b2c..825f7d25 100644 --- a/MP.Data/DatabaseModels/AnagLottiArca.cs +++ b/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 diff --git a/MP.Data/DatabaseModels/AnagLottoModel.cs b/MP.Data/DbModels/AnagLottoModel.cs similarity index 96% rename from MP.Data/DatabaseModels/AnagLottoModel.cs rename to MP.Data/DbModels/AnagLottoModel.cs index 4ea18cb0..1af87b3d 100644 --- a/MP.Data/DatabaseModels/AnagLottoModel.cs +++ b/MP.Data/DbModels/AnagLottoModel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ElencoLotti")] public class AnagLottoModel diff --git a/MP.Data/DatabaseModels/AnagMagModel.cs b/MP.Data/DbModels/AnagMagModel.cs similarity index 95% rename from MP.Data/DatabaseModels/AnagMagModel.cs rename to MP.Data/DbModels/AnagMagModel.cs index 2be9fd43..4351a568 100644 --- a/MP.Data/DatabaseModels/AnagMagModel.cs +++ b/MP.Data/DbModels/AnagMagModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagMagazzini")] public partial class AnagMagModel diff --git a/MP.Data/DatabaseModels/AnagOperatoriModel.cs b/MP.Data/DbModels/AnagOperatoriModel.cs similarity index 96% rename from MP.Data/DatabaseModels/AnagOperatoriModel.cs rename to MP.Data/DbModels/AnagOperatoriModel.cs index abc7de20..d6edecb8 100644 --- a/MP.Data/DatabaseModels/AnagOperatoriModel.cs +++ b/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 { // // This is here so CodeMaid doesn't reorganize this document diff --git a/MP.Data/DatabaseModels/AnagStatiModel.cs b/MP.Data/DbModels/AnagStatiModel.cs similarity index 96% rename from MP.Data/DatabaseModels/AnagStatiModel.cs rename to MP.Data/DbModels/AnagStatiModel.cs index f2222adf..d6b6c65d 100644 --- a/MP.Data/DatabaseModels/AnagStatiModel.cs +++ b/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 diff --git a/MP.Data/DatabaseModels/AnagTagsModel.cs b/MP.Data/DbModels/AnagTagsModel.cs similarity index 95% rename from MP.Data/DatabaseModels/AnagTagsModel.cs rename to MP.Data/DbModels/AnagTagsModel.cs index 46acfdc5..878fd494 100644 --- a/MP.Data/DatabaseModels/AnagTagsModel.cs +++ b/MP.Data/DbModels/AnagTagsModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("AnagTags")] public partial class AnagTagsModel diff --git a/MP.Data/DatabaseModels/AnagUdcModel.cs b/MP.Data/DbModels/AnagUdcModel.cs similarity index 97% rename from MP.Data/DatabaseModels/AnagUdcModel.cs rename to MP.Data/DbModels/AnagUdcModel.cs index 96c81389..d6696e2a 100644 --- a/MP.Data/DatabaseModels/AnagUdcModel.cs +++ b/MP.Data/DbModels/AnagUdcModel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ElencoUdc")] public class AnagUdcModel diff --git a/MP.Data/DbModels/AnagraficaFlussiModel.cs b/MP.Data/DbModels/AnagraficaFlussiModel.cs new file mode 100644 index 00000000..69a3fc08 --- /dev/null +++ b/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; } = ""; + + /// + /// Navigazione oggetto AnagFluxType + /// + [ForeignKey("FluxType")] + public virtual AnagFluxTypeModel FluxTypeNav { get; set; } = null!; + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/AzioniUL.cs b/MP.Data/DbModels/AzioniUL.cs similarity index 92% rename from MP.Data/DatabaseModels/AzioniUL.cs rename to MP.Data/DbModels/AzioniUL.cs index 38b0b372..108c77a5 100644 --- a/MP.Data/DatabaseModels/AzioniUL.cs +++ b/MP.Data/DbModels/AzioniUL.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class AzioniUL { diff --git a/MP.Data/DatabaseModels/CommentiModel.cs b/MP.Data/DbModels/CommentiModel.cs similarity index 96% rename from MP.Data/DatabaseModels/CommentiModel.cs rename to MP.Data/DbModels/CommentiModel.cs index b79ccea1..7dfa3731 100644 --- a/MP.Data/DatabaseModels/CommentiModel.cs +++ b/MP.Data/DbModels/CommentiModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class CommentiModel { diff --git a/MP.Data/DatabaseModels/ConfigModel.cs b/MP.Data/DbModels/ConfigModel.cs similarity index 94% rename from MP.Data/DatabaseModels/ConfigModel.cs rename to MP.Data/DbModels/ConfigModel.cs index e053dc25..041e41f1 100644 --- a/MP.Data/DatabaseModels/ConfigModel.cs +++ b/MP.Data/DbModels/ConfigModel.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Config")] public partial class ConfigModel diff --git a/MP.Data/DatabaseModels/DatiMacchineModel.cs b/MP.Data/DbModels/DatiMacchineModel.cs similarity index 97% rename from MP.Data/DatabaseModels/DatiMacchineModel.cs rename to MP.Data/DbModels/DatiMacchineModel.cs index 329a6a1f..f9715bd3 100644 --- a/MP.Data/DatabaseModels/DatiMacchineModel.cs +++ b/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 { diff --git a/MP.Data/DatabaseModels/DdbTurni.cs b/MP.Data/DbModels/DdbTurni.cs similarity index 98% rename from MP.Data/DatabaseModels/DdbTurni.cs rename to MP.Data/DbModels/DdbTurni.cs index 14cd5104..637c2fe8 100644 --- a/MP.Data/DatabaseModels/DdbTurni.cs +++ b/MP.Data/DbModels/DdbTurni.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class DdbTurni { diff --git a/MP.Data/DatabaseModels/DiarioDiBordoModel.cs b/MP.Data/DbModels/DiarioDiBordoModel.cs similarity index 97% rename from MP.Data/DatabaseModels/DiarioDiBordoModel.cs rename to MP.Data/DbModels/DiarioDiBordoModel.cs index bc9efd18..d3b5e36c 100644 --- a/MP.Data/DatabaseModels/DiarioDiBordoModel.cs +++ b/MP.Data/DbModels/DiarioDiBordoModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("DiarioDiBordo")] public partial class DiarioDiBordoModel diff --git a/MP.Data/DatabaseModels/DossierModel.cs b/MP.Data/DbModels/DossierModel.cs similarity index 97% rename from MP.Data/DatabaseModels/DossierModel.cs rename to MP.Data/DbModels/DossierModel.cs index 5292fe98..08fc87ed 100644 --- a/MP.Data/DatabaseModels/DossierModel.cs +++ b/MP.Data/DbModels/DossierModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Dossiers")] public partial class DossierModel diff --git a/MP.Data/DatabaseModels/ElencoLottiModel.cs b/MP.Data/DbModels/ElencoLottiModel.cs similarity index 97% rename from MP.Data/DatabaseModels/ElencoLottiModel.cs rename to MP.Data/DbModels/ElencoLottiModel.cs index 509e8f61..557410b1 100644 --- a/MP.Data/DatabaseModels/ElencoLottiModel.cs +++ b/MP.Data/DbModels/ElencoLottiModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ElencoLotti")] public partial class ElencoLottiModel diff --git a/MP.Data/DatabaseModels/EventListModel.cs b/MP.Data/DbModels/EventListModel.cs similarity index 97% rename from MP.Data/DatabaseModels/EventListModel.cs rename to MP.Data/DbModels/EventListModel.cs index fc9e4558..d12e12e4 100644 --- a/MP.Data/DatabaseModels/EventListModel.cs +++ b/MP.Data/DbModels/EventListModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("EventList")] public partial class EventListModel @@ -36,6 +36,7 @@ namespace MP.Data.DatabaseModels /// [ForeignKey("IdxMacchina")] public virtual Macchine MachineNav { get; set; } = null!; + /// /// Navigazione oggetto Articolo /// diff --git a/MP.Data/DatabaseModels/FermiNonQualModel.cs b/MP.Data/DbModels/FermiNonQualModel.cs similarity index 96% rename from MP.Data/DatabaseModels/FermiNonQualModel.cs rename to MP.Data/DbModels/FermiNonQualModel.cs index 59e7a4ab..e6a03840 100644 --- a/MP.Data/DatabaseModels/FermiNonQualModel.cs +++ b/MP.Data/DbModels/FermiNonQualModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class FermiNonQualModel { diff --git a/MP.Data/DatabaseModels/FluxLog.cs b/MP.Data/DbModels/FluxLogModel.cs similarity index 90% rename from MP.Data/DatabaseModels/FluxLog.cs rename to MP.Data/DbModels/FluxLogModel.cs index 42e8426d..86c8fc95 100644 --- a/MP.Data/DatabaseModels/FluxLog.cs +++ b/MP.Data/DbModels/FluxLogModel.cs @@ -7,10 +7,10 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("FluxLog")] - public partial class FluxLog + public partial class FluxLogModel { #region Public Properties diff --git a/MP.Data/DatabaseModels/Gruppi2MaccModel.cs b/MP.Data/DbModels/Gruppi2MaccModel.cs similarity index 96% rename from MP.Data/DatabaseModels/Gruppi2MaccModel.cs rename to MP.Data/DbModels/Gruppi2MaccModel.cs index 5ea94ddb..0dcb43bc 100644 --- a/MP.Data/DatabaseModels/Gruppi2MaccModel.cs +++ b/MP.Data/DbModels/Gruppi2MaccModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Gruppi2Macchine")] public partial class Gruppi2MaccModel diff --git a/MP.Data/DatabaseModels/Gruppi2OperModel.cs b/MP.Data/DbModels/Gruppi2OperModel.cs similarity index 96% rename from MP.Data/DatabaseModels/Gruppi2OperModel.cs rename to MP.Data/DbModels/Gruppi2OperModel.cs index 78ffa5a1..68828472 100644 --- a/MP.Data/DatabaseModels/Gruppi2OperModel.cs +++ b/MP.Data/DbModels/Gruppi2OperModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Gruppi2Operatori")] public partial class Gruppi2OperModel diff --git a/MP.Data/DatabaseModels/InveSessTotLotModel.cs b/MP.Data/DbModels/InveSessTotLotModel.cs similarity index 94% rename from MP.Data/DatabaseModels/InveSessTotLotModel.cs rename to MP.Data/DbModels/InveSessTotLotModel.cs index abe423c0..505d161a 100644 --- a/MP.Data/DatabaseModels/InveSessTotLotModel.cs +++ b/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 diff --git a/MP.Data/DatabaseModels/InventorySessionModel.cs b/MP.Data/DbModels/InventorySessionModel.cs similarity index 97% rename from MP.Data/DatabaseModels/InventorySessionModel.cs rename to MP.Data/DbModels/InventorySessionModel.cs index 77ff9d0e..8fabf5dc 100644 --- a/MP.Data/DatabaseModels/InventorySessionModel.cs +++ b/MP.Data/DbModels/InventorySessionModel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("InveSess")] public class InventorySessionModel diff --git a/MP.Data/DatabaseModels/KeepAliveModel.cs b/MP.Data/DbModels/KeepAliveModel.cs similarity index 90% rename from MP.Data/DatabaseModels/KeepAliveModel.cs rename to MP.Data/DbModels/KeepAliveModel.cs index a30ac535..45022bf7 100644 --- a/MP.Data/DatabaseModels/KeepAliveModel.cs +++ b/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 { diff --git a/MP.Data/DatabaseModels/LingueModel.cs b/MP.Data/DbModels/LingueModel.cs similarity index 94% rename from MP.Data/DatabaseModels/LingueModel.cs rename to MP.Data/DbModels/LingueModel.cs index e1d3bcbf..695b6487 100644 --- a/MP.Data/DatabaseModels/LingueModel.cs +++ b/MP.Data/DbModels/LingueModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Lingue")] public partial class LingueModel diff --git a/MP.Data/DatabaseModels/LinkMenuJQM.cs b/MP.Data/DbModels/LinkMenuJQM.cs similarity index 96% rename from MP.Data/DatabaseModels/LinkMenuJQM.cs rename to MP.Data/DbModels/LinkMenuJQM.cs index f17daf93..190aefa5 100644 --- a/MP.Data/DatabaseModels/LinkMenuJQM.cs +++ b/MP.Data/DbModels/LinkMenuJQM.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("LinkMenuJQM")] public partial class LinkMenu diff --git a/MP.Data/DatabaseModels/ListValues.cs b/MP.Data/DbModels/ListValues.cs similarity index 95% rename from MP.Data/DatabaseModels/ListValues.cs rename to MP.Data/DbModels/ListValues.cs index 7aa9edfd..7bdd09ee 100644 --- a/MP.Data/DatabaseModels/ListValues.cs +++ b/MP.Data/DbModels/ListValues.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ListValues")] public partial class ListValues diff --git a/MP.Data/DatabaseModels/Macchine.cs b/MP.Data/DbModels/Macchine.cs similarity index 98% rename from MP.Data/DatabaseModels/Macchine.cs rename to MP.Data/DbModels/Macchine.cs index 757a70f3..b3899d7a 100644 --- a/MP.Data/DatabaseModels/Macchine.cs +++ b/MP.Data/DbModels/Macchine.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Macchine")] public partial class Macchine diff --git a/MP.Data/DatabaseModels/Macchine2SlaveModel.cs b/MP.Data/DbModels/Macchine2SlaveModel.cs similarity index 86% rename from MP.Data/DatabaseModels/Macchine2SlaveModel.cs rename to MP.Data/DbModels/Macchine2SlaveModel.cs index 6643c7d0..3057809b 100644 --- a/MP.Data/DatabaseModels/Macchine2SlaveModel.cs +++ b/MP.Data/DbModels/Macchine2SlaveModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class Macchine2SlaveModel { diff --git a/MP.Data/DatabaseModels/MappaStatoExpl.cs b/MP.Data/DbModels/MappaStatoExpl.cs similarity index 99% rename from MP.Data/DatabaseModels/MappaStatoExpl.cs rename to MP.Data/DbModels/MappaStatoExpl.cs index d96b5e2f..1b9d435b 100644 --- a/MP.Data/DatabaseModels/MappaStatoExpl.cs +++ b/MP.Data/DbModels/MappaStatoExpl.cs @@ -7,7 +7,7 @@ using System.Data; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class MappaStatoExpl { diff --git a/MP.Data/DatabaseModels/MicroStatoMacchinaModel.cs b/MP.Data/DbModels/MicroStatoMacchinaModel.cs similarity index 94% rename from MP.Data/DatabaseModels/MicroStatoMacchinaModel.cs rename to MP.Data/DbModels/MicroStatoMacchinaModel.cs index 223e5dab..ceacd583 100644 --- a/MP.Data/DatabaseModels/MicroStatoMacchinaModel.cs +++ b/MP.Data/DbModels/MicroStatoMacchinaModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("MicroStatoMacchina")] public partial class MicroStatoMacchinaModel diff --git a/MP.Data/DatabaseModels/ODLExpModel.cs b/MP.Data/DbModels/ODLExpModel.cs similarity index 98% rename from MP.Data/DatabaseModels/ODLExpModel.cs rename to MP.Data/DbModels/ODLExpModel.cs index e2ed9a4b..646216a1 100644 --- a/MP.Data/DatabaseModels/ODLExpModel.cs +++ b/MP.Data/DbModels/ODLExpModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("v_ODL_exp")] public partial class ODLExpModel diff --git a/MP.Data/DatabaseModels/ODLModel.cs b/MP.Data/DbModels/ODLModel.cs similarity index 98% rename from MP.Data/DatabaseModels/ODLModel.cs rename to MP.Data/DbModels/ODLModel.cs index 6b140ff1..42241428 100644 --- a/MP.Data/DatabaseModels/ODLModel.cs +++ b/MP.Data/DbModels/ODLModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ODL")] public partial class ODLModel diff --git a/MP.Data/DatabaseModels/OdlEnergyModel.cs b/MP.Data/DbModels/OdlEnergyModel.cs similarity index 98% rename from MP.Data/DatabaseModels/OdlEnergyModel.cs rename to MP.Data/DbModels/OdlEnergyModel.cs index 8fb0c93f..a303cde5 100644 --- a/MP.Data/DatabaseModels/OdlEnergyModel.cs +++ b/MP.Data/DbModels/OdlEnergyModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ODL_Energy")] public partial class OdlEnergyModel diff --git a/MP.Data/DatabaseModels/PODLExpModel.cs b/MP.Data/DbModels/PODLExpModel.cs similarity index 98% rename from MP.Data/DatabaseModels/PODLExpModel.cs rename to MP.Data/DbModels/PODLExpModel.cs index 018da8b1..e43935aa 100644 --- a/MP.Data/DatabaseModels/PODLExpModel.cs +++ b/MP.Data/DbModels/PODLExpModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class PODLExpModel { diff --git a/MP.Data/DatabaseModels/PODLModel.cs b/MP.Data/DbModels/PODLModel.cs similarity index 98% rename from MP.Data/DatabaseModels/PODLModel.cs rename to MP.Data/DbModels/PODLModel.cs index 668fbb87..4f0aae36 100644 --- a/MP.Data/DatabaseModels/PODLModel.cs +++ b/MP.Data/DbModels/PODLModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("PromesseODL")] public partial class PODLModel diff --git a/MP.Data/DatabaseModels/PzProdModel.cs b/MP.Data/DbModels/PzProdModel.cs similarity index 94% rename from MP.Data/DatabaseModels/PzProdModel.cs rename to MP.Data/DbModels/PzProdModel.cs index 6904d7e5..782f4609 100644 --- a/MP.Data/DatabaseModels/PzProdModel.cs +++ b/MP.Data/DbModels/PzProdModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class PzProdModel { diff --git a/MP.Data/DatabaseModels/RegCheckModel.cs b/MP.Data/DbModels/RegCheckModel.cs similarity index 93% rename from MP.Data/DatabaseModels/RegCheckModel.cs rename to MP.Data/DbModels/RegCheckModel.cs index 1c18a6ed..f478495b 100644 --- a/MP.Data/DatabaseModels/RegCheckModel.cs +++ b/MP.Data/DbModels/RegCheckModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class RegCheckModel { diff --git a/MP.Data/DatabaseModels/RegistroControlliModel.cs b/MP.Data/DbModels/RegistroControlliModel.cs similarity index 96% rename from MP.Data/DatabaseModels/RegistroControlliModel.cs rename to MP.Data/DbModels/RegistroControlliModel.cs index 44e08436..68358125 100644 --- a/MP.Data/DatabaseModels/RegistroControlliModel.cs +++ b/MP.Data/DbModels/RegistroControlliModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("RegistroControlli")] public partial class RegistroControlliModel diff --git a/MP.Data/DatabaseModels/RegistroDichiarazioniModel.cs b/MP.Data/DbModels/RegistroDichiarazioniModel.cs similarity index 96% rename from MP.Data/DatabaseModels/RegistroDichiarazioniModel.cs rename to MP.Data/DbModels/RegistroDichiarazioniModel.cs index 3d3e800c..117bb018 100644 --- a/MP.Data/DatabaseModels/RegistroDichiarazioniModel.cs +++ b/MP.Data/DbModels/RegistroDichiarazioniModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { //[Table("DiarioDichiarazioni")] public partial class RegistroDichiarazioniModel diff --git a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs b/MP.Data/DbModels/RegistroScartiKitModel.cs similarity index 97% rename from MP.Data/DatabaseModels/RegistroScartiKitModel.cs rename to MP.Data/DbModels/RegistroScartiKitModel.cs index 14dc8de3..6b872f50 100644 --- a/MP.Data/DatabaseModels/RegistroScartiKitModel.cs +++ b/MP.Data/DbModels/RegistroScartiKitModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("RegistroScartiKit")] public partial class RegistroScartiKitModel diff --git a/MP.Data/DatabaseModels/RegistroScartiModel.cs b/MP.Data/DbModels/RegistroScartiModel.cs similarity index 98% rename from MP.Data/DatabaseModels/RegistroScartiModel.cs rename to MP.Data/DbModels/RegistroScartiModel.cs index a0829887..9a2f2322 100644 --- a/MP.Data/DatabaseModels/RegistroScartiModel.cs +++ b/MP.Data/DbModels/RegistroScartiModel.cs @@ -8,7 +8,7 @@ using static MP.Data.MgModels.RecipeModel; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class RegistroScartiModel { diff --git a/MP.Data/DatabaseModels/ResControlli.cs b/MP.Data/DbModels/ResControlli.cs similarity index 96% rename from MP.Data/DatabaseModels/ResControlli.cs rename to MP.Data/DbModels/ResControlli.cs index 762ab3d6..8ea6f192 100644 --- a/MP.Data/DatabaseModels/ResControlli.cs +++ b/MP.Data/DbModels/ResControlli.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class ResControlli { diff --git a/MP.Data/DatabaseModels/ResScarti.cs b/MP.Data/DbModels/ResScarti.cs similarity index 96% rename from MP.Data/DatabaseModels/ResScarti.cs rename to MP.Data/DbModels/ResScarti.cs index eeb0ac62..34002c21 100644 --- a/MP.Data/DatabaseModels/ResScarti.cs +++ b/MP.Data/DbModels/ResScarti.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class ResScarti { diff --git a/MP.Data/DatabaseModels/ST_Act.cs b/MP.Data/DbModels/ST_Act.cs similarity index 95% rename from MP.Data/DatabaseModels/ST_Act.cs rename to MP.Data/DbModels/ST_Act.cs index 97f1e16c..b5d28335 100644 --- a/MP.Data/DatabaseModels/ST_Act.cs +++ b/MP.Data/DbModels/ST_Act.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_Actual")] public partial class ST_Act diff --git a/MP.Data/DatabaseModels/ST_ActRow.cs b/MP.Data/DbModels/ST_ActRow.cs similarity index 97% rename from MP.Data/DatabaseModels/ST_ActRow.cs rename to MP.Data/DbModels/ST_ActRow.cs index beb6bc23..752f4890 100644 --- a/MP.Data/DatabaseModels/ST_ActRow.cs +++ b/MP.Data/DbModels/ST_ActRow.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_ActualRows")] public partial class ST_ActRow diff --git a/MP.Data/DatabaseModels/ST_AnagGruppi.cs b/MP.Data/DbModels/ST_AnagGruppi.cs similarity index 94% rename from MP.Data/DatabaseModels/ST_AnagGruppi.cs rename to MP.Data/DbModels/ST_AnagGruppi.cs index af723ef5..451e5060 100644 --- a/MP.Data/DatabaseModels/ST_AnagGruppi.cs +++ b/MP.Data/DbModels/ST_AnagGruppi.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_AnagGruppi")] public partial class ST_AnagGruppi diff --git a/MP.Data/DatabaseModels/ST_AnagTipi.cs b/MP.Data/DbModels/ST_AnagTipi.cs similarity index 93% rename from MP.Data/DatabaseModels/ST_AnagTipi.cs rename to MP.Data/DbModels/ST_AnagTipi.cs index 153e0ad3..85fb415c 100644 --- a/MP.Data/DatabaseModels/ST_AnagTipi.cs +++ b/MP.Data/DbModels/ST_AnagTipi.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_AnagTipi")] public partial class ST_AnagTipi diff --git a/MP.Data/DatabaseModels/ST_Check.cs b/MP.Data/DbModels/ST_Check.cs similarity index 96% rename from MP.Data/DatabaseModels/ST_Check.cs rename to MP.Data/DbModels/ST_Check.cs index 23d58db2..ce8985dd 100644 --- a/MP.Data/DatabaseModels/ST_Check.cs +++ b/MP.Data/DbModels/ST_Check.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_Check")] public partial class ST_Check diff --git a/MP.Data/DatabaseModels/ST_Template.cs b/MP.Data/DbModels/ST_Template.cs similarity index 93% rename from MP.Data/DatabaseModels/ST_Template.cs rename to MP.Data/DbModels/ST_Template.cs index da7eca57..6efffc79 100644 --- a/MP.Data/DatabaseModels/ST_Template.cs +++ b/MP.Data/DbModels/ST_Template.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_Template")] public partial class ST_Template diff --git a/MP.Data/DatabaseModels/ST_TemplateRows.cs b/MP.Data/DbModels/ST_TemplateRows.cs similarity index 96% rename from MP.Data/DatabaseModels/ST_TemplateRows.cs rename to MP.Data/DbModels/ST_TemplateRows.cs index 0e5d4df0..701062d4 100644 --- a/MP.Data/DatabaseModels/ST_TemplateRows.cs +++ b/MP.Data/DbModels/ST_TemplateRows.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("ST_TemplateRows")] public partial class ST_TemplateRows diff --git a/MP.Data/DatabaseModels/ScanDataModel.cs b/MP.Data/DbModels/ScanDataModel.cs similarity index 97% rename from MP.Data/DatabaseModels/ScanDataModel.cs rename to MP.Data/DbModels/ScanDataModel.cs index 56d87902..18d5994c 100644 --- a/MP.Data/DatabaseModels/ScanDataModel.cs +++ b/MP.Data/DbModels/ScanDataModel.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("InveScanData")] public class ScanDataModel diff --git a/MP.Data/DatabaseModels/StatODLModel.cs b/MP.Data/DbModels/StatODLModel.cs similarity index 95% rename from MP.Data/DatabaseModels/StatODLModel.cs rename to MP.Data/DbModels/StatODLModel.cs index 2594af04..9d879c6c 100644 --- a/MP.Data/DatabaseModels/StatODLModel.cs +++ b/MP.Data/DbModels/StatODLModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class StatODLModel { diff --git a/MP.Data/DatabaseModels/StatoMacchineModel.cs b/MP.Data/DbModels/StatoMacchineModel.cs similarity index 96% rename from MP.Data/DatabaseModels/StatoMacchineModel.cs rename to MP.Data/DbModels/StatoMacchineModel.cs index 7e0b274f..0577b4b4 100644 --- a/MP.Data/DatabaseModels/StatoMacchineModel.cs +++ b/MP.Data/DbModels/StatoMacchineModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("StatoMacchine")] public partial class StatoMacchineModel diff --git a/MP.Data/DatabaseModels/StatoProdModel.cs b/MP.Data/DbModels/StatoProdModel.cs similarity index 97% rename from MP.Data/DatabaseModels/StatoProdModel.cs rename to MP.Data/DbModels/StatoProdModel.cs index ca2fdc5b..9eb0e6cc 100644 --- a/MP.Data/DatabaseModels/StatoProdModel.cs +++ b/MP.Data/DbModels/StatoProdModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class StatoProdModel { diff --git a/MP.Data/DatabaseModels/StatsAnagArticoli.cs b/MP.Data/DbModels/StatsAnagArticoli.cs similarity index 93% rename from MP.Data/DatabaseModels/StatsAnagArticoli.cs rename to MP.Data/DbModels/StatsAnagArticoli.cs index a7d7dbc6..28cebc23 100644 --- a/MP.Data/DatabaseModels/StatsAnagArticoli.cs +++ b/MP.Data/DbModels/StatsAnagArticoli.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class StatsAnagArticoli { diff --git a/MP.Data/DatabaseModels/StatsODL.cs b/MP.Data/DbModels/StatsODL.cs similarity index 97% rename from MP.Data/DatabaseModels/StatsODL.cs rename to MP.Data/DbModels/StatsODL.cs index 6efedf94..4cf0a098 100644 --- a/MP.Data/DatabaseModels/StatsODL.cs +++ b/MP.Data/DbModels/StatsODL.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class StatsODL { diff --git a/MP.Data/DatabaseModels/TaskExecModel.cs b/MP.Data/DbModels/TaskExecModel.cs similarity index 98% rename from MP.Data/DatabaseModels/TaskExecModel.cs rename to MP.Data/DbModels/TaskExecModel.cs index 72798e11..221f22de 100644 --- a/MP.Data/DatabaseModels/TaskExecModel.cs +++ b/MP.Data/DbModels/TaskExecModel.cs @@ -8,7 +8,7 @@ using static MP.Data.Objects.Enums; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("TaskExec")] public partial class TaskExecModel diff --git a/MP.Data/DatabaseModels/TaskListModel.cs b/MP.Data/DbModels/TaskListModel.cs similarity index 98% rename from MP.Data/DatabaseModels/TaskListModel.cs rename to MP.Data/DbModels/TaskListModel.cs index cef8afad..14c69deb 100644 --- a/MP.Data/DatabaseModels/TaskListModel.cs +++ b/MP.Data/DbModels/TaskListModel.cs @@ -8,7 +8,7 @@ using static MP.Data.Objects.Enums; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("TaskList")] public partial class TaskListModel diff --git a/MP.Data/DatabaseModels/TaskResultModel.cs b/MP.Data/DbModels/TaskResultModel.cs similarity index 96% rename from MP.Data/DatabaseModels/TaskResultModel.cs rename to MP.Data/DbModels/TaskResultModel.cs index 28a4941d..4318673b 100644 --- a/MP.Data/DatabaseModels/TaskResultModel.cs +++ b/MP.Data/DbModels/TaskResultModel.cs @@ -9,7 +9,7 @@ using static MP.Data.Objects.Enums; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [NotMapped] public partial class TaskResultModel diff --git a/MP.Data/DatabaseModels/TransizioneIngressiModel.cs b/MP.Data/DbModels/TransizioneIngressiModel.cs similarity index 93% rename from MP.Data/DatabaseModels/TransizioneIngressiModel.cs rename to MP.Data/DbModels/TransizioneIngressiModel.cs index c9a3f9e1..58144420 100644 --- a/MP.Data/DatabaseModels/TransizioneIngressiModel.cs +++ b/MP.Data/DbModels/TransizioneIngressiModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("TransizioneIngressi")] public partial class TransizioneIngressiModel diff --git a/MP.Data/DatabaseModels/TransizioneStatiModel.cs b/MP.Data/DbModels/TransizioneStatiModel.cs similarity index 92% rename from MP.Data/DatabaseModels/TransizioneStatiModel.cs rename to MP.Data/DbModels/TransizioneStatiModel.cs index 378c2c99..b0dd2769 100644 --- a/MP.Data/DatabaseModels/TransizioneStatiModel.cs +++ b/MP.Data/DbModels/TransizioneStatiModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("TransizioneStati")] public partial class TransizioneStatiModel diff --git a/MP.Data/DatabaseModels/TurniMaccModel.cs b/MP.Data/DbModels/TurniMaccModel.cs similarity index 96% rename from MP.Data/DatabaseModels/TurniMaccModel.cs rename to MP.Data/DbModels/TurniMaccModel.cs index 50bc1619..cc413f84 100644 --- a/MP.Data/DatabaseModels/TurniMaccModel.cs +++ b/MP.Data/DbModels/TurniMaccModel.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("TurniMacchina")] public partial class TurniMaccModel diff --git a/MP.Data/DatabaseModels/TurniOee.cs b/MP.Data/DbModels/TurniOee.cs similarity index 97% rename from MP.Data/DatabaseModels/TurniOee.cs rename to MP.Data/DbModels/TurniOee.cs index cd54c135..529e1cef 100644 --- a/MP.Data/DatabaseModels/TurniOee.cs +++ b/MP.Data/DbModels/TurniOee.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class TurniOee { diff --git a/MP.Data/DatabaseModels/UserActionLog.cs b/MP.Data/DbModels/UserActionLog.cs similarity index 96% rename from MP.Data/DatabaseModels/UserActionLog.cs rename to MP.Data/DbModels/UserActionLog.cs index 28fff76c..0ca56efc 100644 --- a/MP.Data/DatabaseModels/UserActionLog.cs +++ b/MP.Data/DbModels/UserActionLog.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class UserActionLog { diff --git a/MP.Data/DatabaseModels/VExpInveSession.cs b/MP.Data/DbModels/VExpInveSession.cs similarity index 97% rename from MP.Data/DatabaseModels/VExpInveSession.cs rename to MP.Data/DbModels/VExpInveSession.cs index f3c0d29b..3a8fb9ab 100644 --- a/MP.Data/DatabaseModels/VExpInveSession.cs +++ b/MP.Data/DbModels/VExpInveSession.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { // // This is here so CodeMaid doesn't reorganize this document diff --git a/MP.Data/DatabaseModels/VMSFDModel.cs b/MP.Data/DbModels/VMSFDModel.cs similarity index 97% rename from MP.Data/DatabaseModels/VMSFDModel.cs rename to MP.Data/DbModels/VMSFDModel.cs index 9a989c95..deb9fbb5 100644 --- a/MP.Data/DatabaseModels/VMSFDModel.cs +++ b/MP.Data/DbModels/VMSFDModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { // // This is here so CodeMaid doesn't reorganize this document diff --git a/MP.Data/DatabaseModels/VocabolarioModel.cs b/MP.Data/DbModels/VocabolarioModel.cs similarity index 93% rename from MP.Data/DatabaseModels/VocabolarioModel.cs rename to MP.Data/DbModels/VocabolarioModel.cs index 9583e936..3ccc15a4 100644 --- a/MP.Data/DatabaseModels/VocabolarioModel.cs +++ b/MP.Data/DbModels/VocabolarioModel.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { [Table("Vocabolario")] public partial class VocabolarioModel diff --git a/MP.Data/DatabaseModels/vSelCauScartoModel.cs b/MP.Data/DbModels/vSelCauScartoModel.cs similarity index 94% rename from MP.Data/DatabaseModels/vSelCauScartoModel.cs rename to MP.Data/DbModels/vSelCauScartoModel.cs index 9c8a46a8..82adc351 100644 --- a/MP.Data/DatabaseModels/vSelCauScartoModel.cs +++ b/MP.Data/DbModels/vSelCauScartoModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class vSelCauScartoModel { diff --git a/MP.Data/DatabaseModels/vSelEventiBCodeModel.cs b/MP.Data/DbModels/vSelEventiBCodeModel.cs similarity index 94% rename from MP.Data/DatabaseModels/vSelEventiBCodeModel.cs rename to MP.Data/DbModels/vSelEventiBCodeModel.cs index f0b44ae0..714afad0 100644 --- a/MP.Data/DatabaseModels/vSelEventiBCodeModel.cs +++ b/MP.Data/DbModels/vSelEventiBCodeModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public class vSelEventiBCodeModel { diff --git a/MP.Data/DatabaseModels/vSelOdlModel.cs b/MP.Data/DbModels/vSelOdlModel.cs similarity index 93% rename from MP.Data/DatabaseModels/vSelOdlModel.cs rename to MP.Data/DbModels/vSelOdlModel.cs index 72e8ede8..a0a82c21 100644 --- a/MP.Data/DatabaseModels/vSelOdlModel.cs +++ b/MP.Data/DbModels/vSelOdlModel.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema; // // This is here so CodeMaid doesn't reorganize this document // -namespace MP.Data.DatabaseModels +namespace MP.Data.DbModels { public partial class vSelOdlModel { diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 540549d6..62a3583b 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/MP.Data/Migrations/20221111155708_InitialCreate.Designer.cs b/MP.Data/Migrations/20221111155708_InitialCreate.Designer.cs index 4db0284c..f8281946 100644 --- a/MP.Data/Migrations/20221111155708_InitialCreate.Designer.cs +++ b/MP.Data/Migrations/20221111155708_InitialCreate.Designer.cs @@ -25,7 +25,7 @@ namespace MP.Data.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("MP.Data.DatabaseModels.InventorySessionModel", b => + modelBuilder.Entity("MP.Data.DbModels.InventorySessionModel", b => { b.Property("InveSessID") .ValueGeneratedOnAdd() @@ -53,7 +53,7 @@ namespace MP.Data.Migrations b.ToTable("InveSess"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.ScanDataModel", b => + modelBuilder.Entity("MP.Data.DbModels.ScanDataModel", b => { b.Property("ScanID") .ValueGeneratedOnAdd() @@ -104,9 +104,9 @@ namespace MP.Data.Migrations b.ToTable("InveScanData"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.ScanDataModel", b => + modelBuilder.Entity("MP.Data.DbModels.ScanDataModel", b => { - b.HasOne("MP.Data.DatabaseModels.InventorySessionModel", "InveSessNav") + b.HasOne("MP.Data.DbModels.InventorySessionModel", "InveSessNav") .WithMany() .HasForeignKey("InveSessID") .OnDelete(DeleteBehavior.Cascade) diff --git a/MP.Data/Migrations/20221117105402_AddedAnagMag.Designer.cs b/MP.Data/Migrations/20221117105402_AddedAnagMag.Designer.cs index d7e6e374..fb8d82fa 100644 --- a/MP.Data/Migrations/20221117105402_AddedAnagMag.Designer.cs +++ b/MP.Data/Migrations/20221117105402_AddedAnagMag.Designer.cs @@ -25,7 +25,7 @@ namespace MP.Data.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("MP.Data.DatabaseModels.AnagMagModel", b => + modelBuilder.Entity("MP.Data.DbModels.AnagMagModel", b => { b.Property("MagID") .ValueGeneratedOnAdd() @@ -50,7 +50,7 @@ namespace MP.Data.Migrations b.ToTable("AnagMagazzini"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.InventorySessionModel", b => + modelBuilder.Entity("MP.Data.DbModels.InventorySessionModel", b => { b.Property("InveSessID") .ValueGeneratedOnAdd() @@ -83,7 +83,7 @@ namespace MP.Data.Migrations b.ToTable("InveSess"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.ScanDataModel", b => + modelBuilder.Entity("MP.Data.DbModels.ScanDataModel", b => { b.Property("ScanID") .ValueGeneratedOnAdd() @@ -134,18 +134,18 @@ namespace MP.Data.Migrations b.ToTable("InveScanData"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.InventorySessionModel", b => + modelBuilder.Entity("MP.Data.DbModels.InventorySessionModel", b => { - b.HasOne("MP.Data.DatabaseModels.AnagMagModel", "AnagMagNav") + b.HasOne("MP.Data.DbModels.AnagMagModel", "AnagMagNav") .WithMany() .HasForeignKey("MagID"); b.Navigation("AnagMagNav"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.ScanDataModel", b => + modelBuilder.Entity("MP.Data.DbModels.ScanDataModel", b => { - b.HasOne("MP.Data.DatabaseModels.InventorySessionModel", "InveSessNav") + b.HasOne("MP.Data.DbModels.InventorySessionModel", "InveSessNav") .WithMany() .HasForeignKey("InveSessID") .OnDelete(DeleteBehavior.Cascade) diff --git a/MP.Data/Migrations/MoonPro_InveContextModelSnapshot.cs b/MP.Data/Migrations/MoonPro_InveContextModelSnapshot.cs index 0eb5a9e7..4f8b5bcb 100644 --- a/MP.Data/Migrations/MoonPro_InveContextModelSnapshot.cs +++ b/MP.Data/Migrations/MoonPro_InveContextModelSnapshot.cs @@ -23,7 +23,7 @@ namespace MP.Data.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); - modelBuilder.Entity("MP.Data.DatabaseModels.AnagMagModel", b => + modelBuilder.Entity("MP.Data.DbModels.AnagMagModel", b => { b.Property("MagID") .ValueGeneratedOnAdd() @@ -48,7 +48,7 @@ namespace MP.Data.Migrations b.ToTable("AnagMagazzini"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.InventorySessionModel", b => + modelBuilder.Entity("MP.Data.DbModels.InventorySessionModel", b => { b.Property("InveSessID") .ValueGeneratedOnAdd() @@ -81,7 +81,7 @@ namespace MP.Data.Migrations b.ToTable("InveSess"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.ScanDataModel", b => + modelBuilder.Entity("MP.Data.DbModels.ScanDataModel", b => { b.Property("ScanID") .ValueGeneratedOnAdd() @@ -132,18 +132,18 @@ namespace MP.Data.Migrations b.ToTable("InveScanData"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.InventorySessionModel", b => + modelBuilder.Entity("MP.Data.DbModels.InventorySessionModel", b => { - b.HasOne("MP.Data.DatabaseModels.AnagMagModel", "AnagMagNav") + b.HasOne("MP.Data.DbModels.AnagMagModel", "AnagMagNav") .WithMany() .HasForeignKey("MagID"); b.Navigation("AnagMagNav"); }); - modelBuilder.Entity("MP.Data.DatabaseModels.ScanDataModel", b => + modelBuilder.Entity("MP.Data.DbModels.ScanDataModel", b => { - b.HasOne("MP.Data.DatabaseModels.InventorySessionModel", "InveSessNav") + b.HasOne("MP.Data.DbModels.InventorySessionModel", "InveSessNav") .WithMany() .HasForeignKey("InveSessID") .OnDelete(DeleteBehavior.Cascade) diff --git a/MP.Data/ModelBuilderExtensions.cs b/MP.Data/ModelBuilderExtensions.cs index f24fed20..d48ca071 100644 --- a/MP.Data/ModelBuilderExtensions.cs +++ b/MP.Data/ModelBuilderExtensions.cs @@ -1,5 +1,5 @@ using Microsoft.EntityFrameworkCore; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; namespace MP.Data { diff --git a/MP.Data/MoonProAdminContext.cs b/MP.Data/MoonProAdminContext.cs index aff50ce5..8b083a3d 100644 --- a/MP.Data/MoonProAdminContext.cs +++ b/MP.Data/MoonProAdminContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using NLog; diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs index f91b43e4..0700ffe1 100644 --- a/MP.Data/MoonProContext.cs +++ b/MP.Data/MoonProContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using NLog; @@ -40,23 +40,25 @@ namespace MP.Data public virtual DbSet DbSetAlarmLog { get; set; } public virtual DbSet DbSetAKV { get; set; } - public virtual DbSet DbSetStatArticoli { get; set; } - public virtual DbSet DbSetArticoli { get; set; } public virtual DbSet DbSetAnagEventi { get; set; } + public virtual DbSet DbSetAnagFlussi { get; set; } + public virtual DbSet DbSetAnagFluxType { get; set; } + public virtual DbSet DbSetAnagGruppi { get; set; } public virtual DbSet DbSetAnagStati { get; set; } public virtual DbSet DbSetAnagTags { get; set; } + public virtual DbSet DbSetArticoli { get; set; } + public virtual DbSet DbSetConfig { get; set; } + public virtual DbSet DbSetLinkMenu { get; set; } + public virtual DbSet DbSetListValues { get; set; } public virtual DbSet DbSetMacchine { get; set; } public virtual DbSet DbSetMSE { get; set; } - public virtual DbSet DbSetConfig { get; set; } - public virtual DbSet DbSetAnagGruppi { get; set; } - public virtual DbSet DbSetListValues { get; set; } - public virtual DbSet DbSetLinkMenu { get; set; } public virtual DbSet DbSetODL { get; set; } public virtual DbSet DbSetODLExp { get; set; } - public virtual DbSet DbSetPODLExp { get; set; } public virtual DbSet DbSetPODL { get; set; } - public virtual DbSet DbSetStatOdl { get; set; } + public virtual DbSet DbSetPODLExp { get; set; } public virtual DbSet DbSetPzProd { get; set; } + public virtual DbSet DbSetStatArticoli { get; set; } + public virtual DbSet DbSetStatOdl { get; set; } public virtual DbSet DbSetEvList { get; set; } public virtual DbSet DbSetDDB { get; set; } public virtual DbSet DbSetVocabolario { get; set; } diff --git a/MP.Data/MoonPro_FluxContext.cs b/MP.Data/MoonPro_FluxContext.cs index 5d9d7a32..b9dfa3f5 100644 --- a/MP.Data/MoonPro_FluxContext.cs +++ b/MP.Data/MoonPro_FluxContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using NLog; @@ -49,7 +49,7 @@ namespace MP.Data public virtual DbSet DbSetArticoli { get; set; } public virtual DbSet DbSetMacchine { get; set; } - public virtual DbSet DbSetFluxLog { get; set; } + public virtual DbSet DbSetFluxLog { get; set; } public virtual DbSet DbSetDossiers { get; set; } public virtual DbSet DbSetParetoFluxLog { get; set; } @@ -127,7 +127,7 @@ namespace MP.Data entity.Property(e => e.Nome).HasMaxLength(50); }); - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasKey(e => new { e.IdxMacchina, e.dtEvento, e.CodFlux }); diff --git a/MP.Data/MoonPro_ISContext.cs b/MP.Data/MoonPro_ISContext.cs index cd9cb28f..9eed9259 100644 --- a/MP.Data/MoonPro_ISContext.cs +++ b/MP.Data/MoonPro_ISContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; #nullable disable diff --git a/MP.Data/MoonPro_InveContext.cs b/MP.Data/MoonPro_InveContext.cs index 00f191c6..552ee788 100644 --- a/MP.Data/MoonPro_InveContext.cs +++ b/MP.Data/MoonPro_InveContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; #nullable disable diff --git a/MP.Data/MoonPro_MagContext.cs b/MP.Data/MoonPro_MagContext.cs index 2611f1a1..95d93525 100644 --- a/MP.Data/MoonPro_MagContext.cs +++ b/MP.Data/MoonPro_MagContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; #nullable disable diff --git a/MP.Data/MoonPro_STATSContext.cs b/MP.Data/MoonPro_STATSContext.cs index 28b5b027..e15406a3 100644 --- a/MP.Data/MoonPro_STATSContext.cs +++ b/MP.Data/MoonPro_STATSContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; #nullable disable diff --git a/MP.Data/MoonPro_VocContext.cs b/MP.Data/MoonPro_VocContext.cs index bebd8193..ca357a74 100644 --- a/MP.Data/MoonPro_VocContext.cs +++ b/MP.Data/MoonPro_VocContext.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.Extensions.Configuration; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; #nullable disable diff --git a/MP.Data/Services/ListSelectDataSrv.cs b/MP.Data/Services/ListSelectDataSrv.cs index 8b007b84..d8d3fc09 100644 --- a/MP.Data/Services/ListSelectDataSrv.cs +++ b/MP.Data/Services/ListSelectDataSrv.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs index 77eae03f..d4c51f81 100644 --- a/MP.Data/Services/MessageService.cs +++ b/MP.Data/Services/MessageService.cs @@ -4,7 +4,7 @@ using EgwCoreLib.Utils; using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal; using Microsoft.Extensions.Configuration; using MP.Data.Controllers; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using Newtonsoft.Json; using NLog; diff --git a/MP.Data/Services/OrderDataSrv.cs b/MP.Data/Services/OrderDataSrv.cs index 7c5990c6..d1d3e5b0 100644 --- a/MP.Data/Services/OrderDataSrv.cs +++ b/MP.Data/Services/OrderDataSrv.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/MP.Data/Services/SharedMemService.cs b/MP.Data/Services/SharedMemService.cs index 0ce1654c..0f02f88c 100644 --- a/MP.Data/Services/SharedMemService.cs +++ b/MP.Data/Services/SharedMemService.cs @@ -1,4 +1,4 @@ -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; using StackExchange.Redis; using System.Collections.Generic; diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs index 6484659c..143f2a1f 100644 --- a/MP.Data/Services/StatusData.cs +++ b/MP.Data/Services/StatusData.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using MP.Data.Conf; using MP.Data.Controllers; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index faa8b9c0..66388281 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using MP.Data.Objects; using Newtonsoft.Json; diff --git a/MP.Data/Services/TranslateSrv.cs b/MP.Data/Services/TranslateSrv.cs index 64839fe2..9d9a13d6 100644 --- a/MP.Data/Services/TranslateSrv.cs +++ b/MP.Data/Services/TranslateSrv.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/MP.Data/Utils.cs b/MP.Data/Utils.cs index 778a8906..201e5c34 100644 --- a/MP.Data/Utils.cs +++ b/MP.Data/Utils.cs @@ -1,4 +1,4 @@ -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using StackExchange.Redis; using System; using System.Collections.Generic; diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs index 027e0aa4..8fdf3e9e 100644 --- a/MP.FileData/Controllers/FileController.cs +++ b/MP.FileData/Controllers/FileController.cs @@ -38,9 +38,9 @@ namespace MP.FileData.Controllers /// Elenco tabella Macchine /// /// - public List ArchMaccGetAll() + public List ArchMaccGetAll() { - List dbResult = new List(); + List dbResult = new List(); using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration)) { dbResult = localDbCtx @@ -1241,9 +1241,9 @@ namespace MP.FileData.Controllers /// /// /// - public List TagGetAll() + public List TagGetAll() { - List dbResult = new List(); + List dbResult = new List(); using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration)) { dbResult = localDbCtx @@ -1260,10 +1260,10 @@ namespace MP.FileData.Controllers /// /// /// - public List TagGetFilt(string searchVal, int maxNum = 100) + public List TagGetFilt(string searchVal, int maxNum = 100) { maxNum = maxNum <= 0 ? 100 : maxNum; - List dbResult = new List(); + List dbResult = new List(); using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration)) { int totRecord = localDbCtx @@ -1278,7 +1278,7 @@ namespace MP.FileData.Controllers .OrderBy(x => x.TagId) .Take(maxNum) .ToList(); - dbResult.Add(new DatabaseModels.TagModel() { TagId = $"... +{totRecord - maxNum} rec ..." }); + dbResult.Add(new DbModels.TagModel() { TagId = $"... +{totRecord - maxNum} rec ..." }); } else { @@ -1348,9 +1348,9 @@ namespace MP.FileData.Controllers /// Elenco Azioni (decodifica) /// /// - public List ActionsGetAll() + public List ActionsGetAll() { - List dbResult = new List(); + List dbResult = new List(); dbResult = dbCtx .DbSetAzioniUL @@ -1365,9 +1365,9 @@ namespace MP.FileData.Controllers /// /// /// - public List ArticoliGetSearch(int numRecord, string searchVal = "") + public List ArticoliGetSearch(int numRecord, string searchVal = "") { - List dbResult = new List(); + List dbResult = new List(); dbResult = dbCtx .DbSetArticoli @@ -1385,9 +1385,9 @@ namespace MP.FileData.Controllers /// /// /// - public List CommesseGetSearch(int numRecord, string searchVal = "") + public List CommesseGetSearch(int numRecord, string searchVal = "") { - List dbResult = new List(); + List dbResult = new List(); dbResult = dbCtx .DbSetODL @@ -1406,9 +1406,9 @@ namespace MP.FileData.Controllers /// /// /// - public List StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public List StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { - List dbResult = new List(); + List dbResult = new List(); var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); @@ -1437,9 +1437,9 @@ namespace MP.FileData.Controllers /// /// /// - public List StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord) + public List StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord) { - List dbResult = new List(); + List dbResult = new List(); var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); @@ -1484,9 +1484,9 @@ namespace MP.FileData.Controllers /// /// /// - public List StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public List StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { - List dbResult = new List(); + List dbResult = new List(); var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); @@ -1511,9 +1511,9 @@ namespace MP.FileData.Controllers /// /// /// - public List StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public List StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { - List dbResult = new List(); + List dbResult = new List(); var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); @@ -1538,9 +1538,9 @@ namespace MP.FileData.Controllers /// /// /// - public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { - List dbResult = new List(); + List dbResult = new List(); var dataFrom = new SqlParameter("@dataFrom", DataStart); var dataTo = new SqlParameter("@dataTo", DataEnd); @@ -1563,9 +1563,9 @@ namespace MP.FileData.Controllers /// /// /// - public List StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) + public List StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { - List dbResult = new List(); + List dbResult = new List(); //dbResult = dbCtx // .DbSetUserLog diff --git a/MP.FileData/Migrations/20210913153816_InitDb.Designer.cs b/MP.FileData/Migrations/20210913153816_InitDb.Designer.cs index a4c555e8..c6917a94 100644 --- a/MP.FileData/Migrations/20210913153816_InitDb.Designer.cs +++ b/MP.FileData/Migrations/20210913153816_InitDb.Designer.cs @@ -37,7 +37,7 @@ namespace MP.FileData.Migrations b.ToTable("FileModelTagModel"); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b => + modelBuilder.Entity("MP.FileData.DbModels.FileModel", b => { b.Property("FileId") .ValueGeneratedOnAdd() @@ -87,7 +87,7 @@ namespace MP.FileData.Migrations b.ToTable("Files"); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.MacchinaModel", b => + modelBuilder.Entity("MP.FileData.DbModels.MacchinaModel", b => { b.Property("IdxMacchina") .HasColumnType("nvarchar(450)"); @@ -131,7 +131,7 @@ namespace MP.FileData.Migrations }); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.TagModel", b => + modelBuilder.Entity("MP.FileData.DbModels.TagModel", b => { b.Property("TagId") .HasColumnType("nvarchar(450)"); @@ -143,22 +143,22 @@ namespace MP.FileData.Migrations modelBuilder.Entity("FileModelTagModel", b => { - b.HasOne("MP.FileData.DatabaseModels.FileModel", null) + b.HasOne("MP.FileData.DbModels.FileModel", null) .WithMany() .HasForeignKey("FilesFileId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("MP.FileData.DatabaseModels.TagModel", null) + b.HasOne("MP.FileData.DbModels.TagModel", null) .WithMany() .HasForeignKey("TagsTagId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b => + modelBuilder.Entity("MP.FileData.DbModels.FileModel", b => { - b.HasOne("MP.FileData.DatabaseModels.MacchinaModel", "Macchina") + b.HasOne("MP.FileData.DbModels.MacchinaModel", "Macchina") .WithMany() .HasForeignKey("IdxMacchina"); diff --git a/MP.FileData/Migrations/20241022090211_AddUserAppr.Designer.cs b/MP.FileData/Migrations/20241022090211_AddUserAppr.Designer.cs index 1ab3ab91..5b888a95 100644 --- a/MP.FileData/Migrations/20241022090211_AddUserAppr.Designer.cs +++ b/MP.FileData/Migrations/20241022090211_AddUserAppr.Designer.cs @@ -40,7 +40,7 @@ namespace MP.FileData.Migrations b.ToTable("FileModelTagModel"); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.ArchMaccModel", b => + modelBuilder.Entity("MP.FileData.DbModels.ArchMaccModel", b => { b.Property("IdxMacchina") .HasColumnType("nvarchar(450)"); @@ -84,7 +84,7 @@ namespace MP.FileData.Migrations }); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b => + modelBuilder.Entity("MP.FileData.DbModels.FileModel", b => { b.Property("FileId") .ValueGeneratedOnAdd() @@ -142,7 +142,7 @@ namespace MP.FileData.Migrations b.ToTable("Files"); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.TagModel", b => + modelBuilder.Entity("MP.FileData.DbModels.TagModel", b => { b.Property("TagId") .HasColumnType("nvarchar(450)"); @@ -154,22 +154,22 @@ namespace MP.FileData.Migrations modelBuilder.Entity("FileModelTagModel", b => { - b.HasOne("MP.FileData.DatabaseModels.FileModel", null) + b.HasOne("MP.FileData.DbModels.FileModel", null) .WithMany() .HasForeignKey("FilesFileId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("MP.FileData.DatabaseModels.TagModel", null) + b.HasOne("MP.FileData.DbModels.TagModel", null) .WithMany() .HasForeignKey("TagsTagId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b => + modelBuilder.Entity("MP.FileData.DbModels.FileModel", b => { - b.HasOne("MP.FileData.DatabaseModels.ArchMaccModel", "Macchina") + b.HasOne("MP.FileData.DbModels.ArchMaccModel", "Macchina") .WithMany() .HasForeignKey("IdxMacchina"); diff --git a/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs b/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs index fe7fc1e0..b0ec9fab 100644 --- a/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs +++ b/MP.FileData/Migrations/MoonPro_ProgContextModelSnapshot.cs @@ -38,7 +38,7 @@ namespace MP.FileData.Migrations b.ToTable("FileModelTagModel"); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.ArchMaccModel", b => + modelBuilder.Entity("MP.FileData.DbModels.ArchMaccModel", b => { b.Property("IdxMacchina") .HasColumnType("nvarchar(450)"); @@ -82,7 +82,7 @@ namespace MP.FileData.Migrations }); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b => + modelBuilder.Entity("MP.FileData.DbModels.FileModel", b => { b.Property("FileId") .ValueGeneratedOnAdd() @@ -140,7 +140,7 @@ namespace MP.FileData.Migrations b.ToTable("Files"); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.TagModel", b => + modelBuilder.Entity("MP.FileData.DbModels.TagModel", b => { b.Property("TagId") .HasColumnType("nvarchar(450)"); @@ -152,22 +152,22 @@ namespace MP.FileData.Migrations modelBuilder.Entity("FileModelTagModel", b => { - b.HasOne("MP.FileData.DatabaseModels.FileModel", null) + b.HasOne("MP.FileData.DbModels.FileModel", null) .WithMany() .HasForeignKey("FilesFileId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("MP.FileData.DatabaseModels.TagModel", null) + b.HasOne("MP.FileData.DbModels.TagModel", null) .WithMany() .HasForeignKey("TagsTagId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b => + modelBuilder.Entity("MP.FileData.DbModels.FileModel", b => { - b.HasOne("MP.FileData.DatabaseModels.ArchMaccModel", "Macchina") + b.HasOne("MP.FileData.DbModels.ArchMaccModel", "Macchina") .WithMany() .HasForeignKey("IdxMacchina"); diff --git a/MP.INVE/Components/InveSessionList.razor.cs b/MP.INVE/Components/InveSessionList.razor.cs index 0a618695..5fd62eed 100644 --- a/MP.INVE/Components/InveSessionList.razor.cs +++ b/MP.INVE/Components/InveSessionList.razor.cs @@ -1,7 +1,7 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/ListQrOpr.razor.cs b/MP.INVE/Components/ListQrOpr.razor.cs index c4aa1df3..d77c9f5a 100644 --- a/MP.INVE/Components/ListQrOpr.razor.cs +++ b/MP.INVE/Components/ListQrOpr.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/ListScan.razor.cs b/MP.INVE/Components/ListScan.razor.cs index 93b53d68..0772677f 100644 --- a/MP.INVE/Components/ListScan.razor.cs +++ b/MP.INVE/Components/ListScan.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/ListTotLotto.razor.cs b/MP.INVE/Components/ListTotLotto.razor.cs index ffd122f5..c9c31ba9 100644 --- a/MP.INVE/Components/ListTotLotto.razor.cs +++ b/MP.INVE/Components/ListTotLotto.razor.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/LotScanDetail.razor.cs b/MP.INVE/Components/LotScanDetail.razor.cs index 4f7c71d0..44e010ca 100644 --- a/MP.INVE/Components/LotScanDetail.razor.cs +++ b/MP.INVE/Components/LotScanDetail.razor.cs @@ -14,7 +14,7 @@ using Microsoft.JSInterop; using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/MagList.razor.cs b/MP.INVE/Components/MagList.razor.cs index 0e687681..e2c664eb 100644 --- a/MP.INVE/Components/MagList.razor.cs +++ b/MP.INVE/Components/MagList.razor.cs @@ -16,7 +16,7 @@ using MP.INVE.Shared; using MP.INVE.Components; using Blazored.LocalStorage; using Blazored.SessionStorage; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/ProcOperat.razor.cs b/MP.INVE/Components/ProcOperat.razor.cs index 99112847..281bed8b 100644 --- a/MP.INVE/Components/ProcOperat.razor.cs +++ b/MP.INVE/Components/ProcOperat.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Components diff --git a/MP.INVE/Components/ProcOperatore.razor.cs b/MP.INVE/Components/ProcOperatore.razor.cs index cea01089..4fe5396e 100644 --- a/MP.INVE/Components/ProcOperatore.razor.cs +++ b/MP.INVE/Components/ProcOperatore.razor.cs @@ -14,7 +14,7 @@ using Microsoft.JSInterop; using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; using MP.INVE.Pages; using Blazored.LocalStorage; diff --git a/MP.INVE/Components/ProcSess.razor.cs b/MP.INVE/Components/ProcSess.razor.cs index 721889ff..14e93702 100644 --- a/MP.INVE/Components/ProcSess.razor.cs +++ b/MP.INVE/Components/ProcSess.razor.cs @@ -14,7 +14,7 @@ using Microsoft.JSInterop; using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; using MP.INVE.Pages; using Blazored.LocalStorage; diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs index e7a08a51..19bb9350 100644 --- a/MP.INVE/Components/ProcSuggestion.razor.cs +++ b/MP.INVE/Components/ProcSuggestion.razor.cs @@ -15,7 +15,7 @@ using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; using MP.INVE.Data; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using System.Runtime.CompilerServices; using Microsoft.EntityFrameworkCore.Infrastructure.Internal; using NLog.Targets; @@ -77,7 +77,7 @@ namespace MP.INVE.Components alreadyScan = null; isQtaSbagliata = false; - // se il valore scansionato è != null... + // se il valore scansionato � != null... if (string.IsNullOrEmpty(lastScan)) { firstMsg = true; diff --git a/MP.INVE/Data/MiDataService.cs b/MP.INVE/Data/MiDataService.cs index d4b71a40..0a8472ff 100644 --- a/MP.INVE/Data/MiDataService.cs +++ b/MP.INVE/Data/MiDataService.cs @@ -1,5 +1,5 @@ using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Newtonsoft.Json; using NLog; using StackExchange.Redis; diff --git a/MP.INVE/Pages/Acquisizione.razor.cs b/MP.INVE/Pages/Acquisizione.razor.cs index 9d9d2a99..13257abe 100644 --- a/MP.INVE/Pages/Acquisizione.razor.cs +++ b/MP.INVE/Pages/Acquisizione.razor.cs @@ -18,7 +18,7 @@ using Blazored.LocalStorage; using MP.Data.DTO; using Microsoft.AspNetCore.WebUtilities; using MP.INVE.Data; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; namespace MP.INVE.Pages { diff --git a/MP.INVE/Pages/Cancellazione.razor.cs b/MP.INVE/Pages/Cancellazione.razor.cs index dc501500..931c7b4d 100644 --- a/MP.INVE/Pages/Cancellazione.razor.cs +++ b/MP.INVE/Pages/Cancellazione.razor.cs @@ -14,7 +14,7 @@ using Microsoft.JSInterop; using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; using Microsoft.AspNetCore.WebUtilities; diff --git a/MP.INVE/Pages/DeleteScan.razor.cs b/MP.INVE/Pages/DeleteScan.razor.cs index 88ab056b..ce62116f 100644 --- a/MP.INVE/Pages/DeleteScan.razor.cs +++ b/MP.INVE/Pages/DeleteScan.razor.cs @@ -14,7 +14,7 @@ using Microsoft.JSInterop; using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; using Microsoft.AspNetCore.WebUtilities; diff --git a/MP.INVE/Pages/ElencoMagazzini.razor.cs b/MP.INVE/Pages/ElencoMagazzini.razor.cs index e4a3032d..039b3a33 100644 --- a/MP.INVE/Pages/ElencoMagazzini.razor.cs +++ b/MP.INVE/Pages/ElencoMagazzini.razor.cs @@ -18,7 +18,7 @@ using Blazored.SessionStorage; using MP.Data.DTO; using MP.INVE.Data; using Blazored.LocalStorage; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using EgwCoreLib.Razor; namespace MP.INVE.Pages diff --git a/MP.INVE/Pages/Index.razor.cs b/MP.INVE/Pages/Index.razor.cs index 8b106951..dec73614 100644 --- a/MP.INVE/Pages/Index.razor.cs +++ b/MP.INVE/Pages/Index.razor.cs @@ -1,4 +1,4 @@ -using MP.Data.DatabaseModels; +using MP.Data.DbModels; namespace MP.INVE.Pages { diff --git a/MP.INVE/Pages/InveSession.razor.cs b/MP.INVE/Pages/InveSession.razor.cs index 0ac93b5d..558a1d62 100644 --- a/MP.INVE/Pages/InveSession.razor.cs +++ b/MP.INVE/Pages/InveSession.razor.cs @@ -14,7 +14,7 @@ using Microsoft.JSInterop; using MP.INVE; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; using MP.Data.DTO; using Blazored.LocalStorage; diff --git a/MP.INVE/Pages/Invio.razor.cs b/MP.INVE/Pages/Invio.razor.cs index 4528a4c3..58980747 100644 --- a/MP.INVE/Pages/Invio.razor.cs +++ b/MP.INVE/Pages/Invio.razor.cs @@ -2,7 +2,7 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.WebUtilities; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using MP.INVE.Data; diff --git a/MP.INVE/Pages/Jumper.razor.cs b/MP.INVE/Pages/Jumper.razor.cs index d7362b47..5d5642bc 100644 --- a/MP.INVE/Pages/Jumper.razor.cs +++ b/MP.INVE/Pages/Jumper.razor.cs @@ -2,7 +2,7 @@ using Blazored.LocalStorage; using Blazored.SessionStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.WebUtilities; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using MP.INVE.Data; using Newtonsoft.Json; @@ -88,7 +88,7 @@ namespace MP.INVE.Pages #if false //eseguo split su "?" e divido in due il link var uriProc1 = newScan.Split("?"); - //eseguo split su "&" e divido il rimanente del link ottenendo così le variabili singole + //eseguo split su "&" e divido il rimanente del link ottenendo cos� le variabili singole var uriProc2 = uriProc1[1].Split("&"); string[] uriProc3; diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs index 22f3eeed..9bcf4fe5 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor.cs +++ b/MP.INVE/Pages/OperatoreLogin.razor.cs @@ -15,7 +15,7 @@ using MP.INVE; using MP.INVE.Data; using MP.INVE.Shared; using MP.INVE.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Blazored.SessionStorage; using MP.Data.DTO; using Blazored.LocalStorage; diff --git a/MP.INVE/Pages/OperatoreQR.razor.cs b/MP.INVE/Pages/OperatoreQR.razor.cs index 2dbd3310..1907d251 100644 --- a/MP.INVE/Pages/OperatoreQR.razor.cs +++ b/MP.INVE/Pages/OperatoreQR.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.INVE.Data; namespace MP.INVE.Pages diff --git a/MP.INVE/Shared/NavMenu.razor.cs b/MP.INVE/Shared/NavMenu.razor.cs index b2703688..b90d4fd5 100644 --- a/MP.INVE/Shared/NavMenu.razor.cs +++ b/MP.INVE/Shared/NavMenu.razor.cs @@ -44,7 +44,7 @@ namespace MP.INVE.Shared #region Private Properties - //public List? ElencoLink { get; set; } + //public List? ElencoLink { get; set; } private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; #endregion Private Properties diff --git a/MP.IOC/Data/MpDataService.cs b/MP.IOC/Data/MpDataService.cs index 628c3789..1e6c3c7a 100644 --- a/MP.IOC/Data/MpDataService.cs +++ b/MP.IOC/Data/MpDataService.cs @@ -1,6 +1,6 @@ using MP.Data; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using MP.Data.MgModels; using Newtonsoft.Json; diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 19d2693f..4388b4ba 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2412.2708 + 6.16.2503.0809 Debug;Release;Debug_LiManDebug en True diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index a4a72abd..d0b4363b 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo Tablet MAPO - DotNet6 -

Versione: 6.16.2412.2708

+

Versione: 6.16.2503.0809


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 1a5a2f5d..0132789f 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2412.2708 +6.16.2503.0809 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index d5fe1793..18f4f7cb 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2412.2708 + 6.16.2503.0809 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Mon/Components/DetailMSE.razor.cs b/MP.Mon/Components/DetailMSE.razor.cs index 85b79107..10e6cd1e 100644 --- a/MP.Mon/Components/DetailMSE.razor.cs +++ b/MP.Mon/Components/DetailMSE.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.Extensions.FileSystemGlobbing; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; namespace MP.Mon.Components diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs index 82a49a45..af3b1c78 100644 --- a/MP.Mon/Pages/Index.razor.cs +++ b/MP.Mon/Pages/Index.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using MP.Data; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.Services; using Newtonsoft.Json; using NLog; diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 4957f05d..4abae05d 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using MP.SPEC.Data; using Newtonsoft.Json; diff --git a/MP.SPEC/Components/ListGiacenze.razor.cs b/MP.SPEC/Components/ListGiacenze.razor.cs index dbe28f59..4808dc09 100644 --- a/MP.SPEC/Components/ListGiacenze.razor.cs +++ b/MP.SPEC/Components/ListGiacenze.razor.cs @@ -1,6 +1,6 @@ using Blazored.SessionStorage; using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Components diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index 4dcef85e..810dbcf1 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.DataProtection; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Components; using MP.SPEC.Data; using MP.SPEC.Services; diff --git a/MP.SPEC/Components/ListPARAMS.razor.cs b/MP.SPEC/Components/ListPARAMS.razor.cs index e16335c4..d1b0e527 100644 --- a/MP.SPEC/Components/ListPARAMS.razor.cs +++ b/MP.SPEC/Components/ListPARAMS.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; using System.Diagnostics; diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 87492aeb..2d4a0f87 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using MP.Data; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; using MP.SPEC.Services; using NLog; diff --git a/MP.SPEC/Components/ODLPlot.razor.cs b/MP.SPEC/Components/ODLPlot.razor.cs index b4e0cba4..9e51d6e7 100644 --- a/MP.SPEC/Components/ODLPlot.razor.cs +++ b/MP.SPEC/Components/ODLPlot.razor.cs @@ -1,6 +1,6 @@ using EgwCoreLib.Razor.Data; using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Components diff --git a/MP.SPEC/Components/SelFilterXDL.razor.cs b/MP.SPEC/Components/SelFilterXDL.razor.cs index 1d5b96a5..58d80c19 100644 --- a/MP.SPEC/Components/SelFilterXDL.razor.cs +++ b/MP.SPEC/Components/SelFilterXDL.razor.cs @@ -1,6 +1,6 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Components diff --git a/MP.SPEC/Components/StatsOdl.razor.cs b/MP.SPEC/Components/StatsOdl.razor.cs index 1005517b..a1586fda 100644 --- a/MP.SPEC/Components/StatsOdl.razor.cs +++ b/MP.SPEC/Components/StatsOdl.razor.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Components diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 6a1fed52..b70eb2b0 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Options; using MP.Data; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.DTO; using MP.Data.MgModels; using MP.Data.Objects; diff --git a/MP.SPEC/Pages/Articoli.razor.cs b/MP.SPEC/Pages/Articoli.razor.cs index fc9f1872..9e0c29cd 100644 --- a/MP.SPEC/Pages/Articoli.razor.cs +++ b/MP.SPEC/Pages/Articoli.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Pages diff --git a/MP.SPEC/Pages/DOSS.razor.cs b/MP.SPEC/Pages/DOSS.razor.cs index 817626ca..7e7198e4 100644 --- a/MP.SPEC/Pages/DOSS.razor.cs +++ b/MP.SPEC/Pages/DOSS.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Components; using MP.SPEC.Data; using EgwCoreLib.Razor; diff --git a/MP.SPEC/Pages/Giacenze.razor.cs b/MP.SPEC/Pages/Giacenze.razor.cs index a359d9dc..ebd4c096 100644 --- a/MP.SPEC/Pages/Giacenze.razor.cs +++ b/MP.SPEC/Pages/Giacenze.razor.cs @@ -1,7 +1,7 @@ using Blazored.SessionStorage; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.WebUtilities; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Pages diff --git a/MP.SPEC/Pages/Index.razor.cs b/MP.SPEC/Pages/Index.razor.cs index 922dbb4f..742e45b9 100644 --- a/MP.SPEC/Pages/Index.razor.cs +++ b/MP.SPEC/Pages/Index.razor.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Pages diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 9c6414e0..5a17de74 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -2,7 +2,7 @@ using Blazored.LocalStorage; using EgwCoreLib.Razor; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Data; namespace MP.SPEC.Pages @@ -161,7 +161,7 @@ namespace MP.SPEC.Pages #region Private Fields private List? ListMacchine; - private List? ListStati; + private List? ListStati; #endregion Private Fields diff --git a/MP.SPEC/Pages/PARAMS.razor.cs b/MP.SPEC/Pages/PARAMS.razor.cs index a77d5396..9dbf37af 100644 --- a/MP.SPEC/Pages/PARAMS.razor.cs +++ b/MP.SPEC/Pages/PARAMS.razor.cs @@ -1,5 +1,5 @@ using Microsoft.AspNetCore.Components; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Components; using MP.SPEC.Data; using NLog; diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index e85eb936..4f03c80f 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -1,7 +1,7 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.SPEC.Components; using MP.SPEC.Data; using MP.SPEC.Services; diff --git a/MP.SPEC/Shared/NavMenu.razor.cs b/MP.SPEC/Shared/NavMenu.razor.cs index fd0bbb44..3a3bb51c 100644 --- a/MP.SPEC/Shared/NavMenu.razor.cs +++ b/MP.SPEC/Shared/NavMenu.razor.cs @@ -9,7 +9,7 @@ namespace MP.SPEC.Shared [Parameter] public EventCallback EC_compressUpdated { get; set; } - public List? ElencoLink { get; set; } + public List? ElencoLink { get; set; } #endregion Public Properties diff --git a/MP.Stats/Components/ChartControlli.razor.cs b/MP.Stats/Components/ChartControlli.razor.cs index 8ac9c307..af3a6685 100644 --- a/MP.Stats/Components/ChartControlli.razor.cs +++ b/MP.Stats/Components/ChartControlli.razor.cs @@ -44,7 +44,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _rawData { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); /// /// Genera colori sfondo 33% rosso / arancione / giallo @@ -91,7 +91,7 @@ namespace MP.Stats.Components #region Public Properties [Parameter] - public List RawData + public List RawData { get => _rawData; set diff --git a/MP.Stats/Components/ChartEnergy.razor.cs b/MP.Stats/Components/ChartEnergy.razor.cs index acff2888..4225d72f 100644 --- a/MP.Stats/Components/ChartEnergy.razor.cs +++ b/MP.Stats/Components/ChartEnergy.razor.cs @@ -16,7 +16,7 @@ namespace MP.Stats.Components public bool DynMode { get; set; } = false; [Parameter] - public List RawData + public List RawData { get => _rawData; set @@ -45,7 +45,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _rawData { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); /// /// Genera colori sfondo 33% rosso / arancione / giallo diff --git a/MP.Stats/Components/ChartOEE.razor.cs b/MP.Stats/Components/ChartOEE.razor.cs index 06222f42..b11a029e 100644 --- a/MP.Stats/Components/ChartOEE.razor.cs +++ b/MP.Stats/Components/ChartOEE.razor.cs @@ -37,7 +37,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _rawData { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); /// /// Genera colori sfondo 33% rosso / arancione / giallo @@ -84,7 +84,7 @@ namespace MP.Stats.Components #region Public Properties [Parameter] - public List RawData + public List RawData { get => _rawData; set diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index 07112c66..56b82ef7 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -36,7 +36,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _rawData { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); /// /// Genera colori sfondo 33% rosso / arancione / giallo @@ -83,7 +83,7 @@ namespace MP.Stats.Components #region Public Properties [Parameter] - public List RawData + public List RawData { get => _rawData; set diff --git a/MP.Stats/Components/ChartUserLog.razor.cs b/MP.Stats/Components/ChartUserLog.razor.cs index 54867f48..28175de6 100644 --- a/MP.Stats/Components/ChartUserLog.razor.cs +++ b/MP.Stats/Components/ChartUserLog.razor.cs @@ -44,7 +44,7 @@ namespace MP.Stats.Components protected SelectData _currFilter { get; set; } = new SelectData(); - protected List _rawData { get; set; } = new List(); + protected List _rawData { get; set; } = new List(); /// /// Genera colori sfondo 33% rosso / arancione / giallo @@ -91,7 +91,7 @@ namespace MP.Stats.Components #region Public Properties [Parameter] - public List RawData + public List RawData { get => _rawData; set diff --git a/MP.Stats/Components/DetailOee.razor b/MP.Stats/Components/DetailOee.razor index 2e65aa37..924fec79 100644 --- a/MP.Stats/Components/DetailOee.razor +++ b/MP.Stats/Components/DetailOee.razor @@ -16,10 +16,10 @@ @code{ - protected MP.Data.DatabaseModels.TurniOee _currRecord = new MP.Data.DatabaseModels.TurniOee(); + protected MP.Data.DbModels.TurniOee _currRecord = new MP.Data.DbModels.TurniOee(); [Parameter] - public MP.Data.DatabaseModels.TurniOee currRecord + public MP.Data.DbModels.TurniOee currRecord { get { diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 2c0030db..3048ebfe 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using MimeKit.Cryptography; using MP.Data.Controllers; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.Data.Services; using Newtonsoft.Json; using NLog; diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 59408c9b..65a2507f 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2502.2508 - 6.16.2502.2508 + 6.16.2503.0810 + 6.16.2503.0810 true $(NoWarn);1591 en diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index a364f41c..40cda38a 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -13,11 +13,11 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResControlli currRecord = null; + private MP.Data.DbModels.ResControlli currRecord = null; private string fileName = "Controlli.csv"; - private List ListRecords; - private List SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index d4979afc..4eba23a4 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -13,11 +13,11 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.DdbTurni currRecord = null; + private MP.Data.DbModels.DdbTurni currRecord = null; private string fileName = "Diario.csv"; - private List ListRecords; - private List SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields diff --git a/MP.Stats/Pages/Energy.razor.cs b/MP.Stats/Pages/Energy.razor.cs index 572aa72a..400a8997 100644 --- a/MP.Stats/Pages/Energy.razor.cs +++ b/MP.Stats/Pages/Energy.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 MP.Stats.Data; using System; diff --git a/MP.Stats/Pages/Oee.razor.cs b/MP.Stats/Pages/Oee.razor.cs index ce05045e..1d32b74c 100644 --- a/MP.Stats/Pages/Oee.razor.cs +++ b/MP.Stats/Pages/Oee.razor.cs @@ -17,12 +17,12 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.TurniOee currRecord = null; + private MP.Data.DbModels.TurniOee currRecord = null; private string fileName = "OEE.csv"; - private List ListRecords; + private List ListRecords; - private List SearchRecords; + private List SearchRecords; #endregion Private Fields @@ -188,7 +188,7 @@ namespace MP.Stats.Pages await ReloadData(); } - protected void Select(MP.Data.DatabaseModels.TurniOee selRecord) + protected void Select(MP.Data.DbModels.TurniOee selRecord) { // applico filtro da selezione currRecord = selRecord; diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index 606d216e..9bb6b089 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -13,10 +13,10 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.StatsODL currRecord = null; + private MP.Data.DbModels.StatsODL currRecord = null; - private List ListRecords; - private List SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index d41f90b8..35aac2c7 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -13,11 +13,11 @@ namespace MP.Stats.Pages { #region Private Fields - private MP.Data.DatabaseModels.ResScarti currRecord = null; + private MP.Data.DbModels.ResScarti currRecord = null; private string fileName = "Scarti.csv"; - private List ListRecords; - private List SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields diff --git a/MP.Stats/Pages/TaskScheduler.razor.cs b/MP.Stats/Pages/TaskScheduler.razor.cs index dd299819..3bbf24f7 100644 --- a/MP.Stats/Pages/TaskScheduler.razor.cs +++ b/MP.Stats/Pages/TaskScheduler.razor.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System; using System.Linq; using StackExchange.Redis; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using Microsoft.AspNetCore.DataProtection; using MP.TaskMan.Models; using static MP.TaskMan.Objects.Enums; diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 7f24d46d..4b8c7291 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -13,11 +13,11 @@ namespace MP.Stats.Pages { #region Private Fields - private List ActionsList; - private MP.Data.DatabaseModels.UserActionLog currRecord = null; + private List ActionsList; + private MP.Data.DbModels.UserActionLog currRecord = null; private string fileName = "UserLog.csv"; - private List ListRecords; - private List SearchRecords; + private List ListRecords; + private List SearchRecords; #endregion Private Fields @@ -216,13 +216,13 @@ namespace MP.Stats.Pages return answ; } - public MP.Data.DatabaseModels.AzioniUL decodeAction(string azione) + public MP.Data.DbModels.AzioniUL decodeAction(string azione) { // cerco - MP.Data.DatabaseModels.AzioniUL data = ActionsList + MP.Data.DbModels.AzioniUL data = ActionsList .Where(x => x.Azione == azione) .FirstOrDefault(); - data = data != null ? data : new MP.Data.DatabaseModels.AzioniUL() { Azione = "ND", Class = "", Descrizione = "ND" }; + data = data != null ? data : new MP.Data.DbModels.AzioniUL() { Azione = "ND", Class = "", Descrizione = "ND" }; return data; } diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 7394e0cb..01d16d49 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

    Versione: 6.16.2502.2508

    +

    Versione: 6.16.2503.0810


    Note di rilascio:
      diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 1ed9a64b..ecfa34c1 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2502.2508 +6.16.2503.0810 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 67a73c97..7123b06e 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2502.2508 + 6.16.2503.0810 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false diff --git a/MP.WASM.Mon/Client/Components/DetailMSE.razor.cs b/MP.WASM.Mon/Client/Components/DetailMSE.razor.cs index 02098d26..12e7bc39 100644 --- a/MP.WASM.Mon/Client/Components/DetailMSE.razor.cs +++ b/MP.WASM.Mon/Client/Components/DetailMSE.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; namespace MP.WASM.Mon.Client.Components diff --git a/MP.WASM.Mon/Client/Pages/Index.razor b/MP.WASM.Mon/Client/Pages/Index.razor index 1f8fa826..97bc41d6 100644 --- a/MP.WASM.Mon/Client/Pages/Index.razor +++ b/MP.WASM.Mon/Client/Pages/Index.razor @@ -1,7 +1,7 @@ @page "/" @using MP.Data -@using MP.Data.DatabaseModels +@using MP.Data.DbModels @inject HttpClient Http @inject NavigationManager NavManager diff --git a/MP.WASM.Mon/Client/Pages/Index.razor.cs b/MP.WASM.Mon/Client/Pages/Index.razor.cs index 30b1bc7b..759451d5 100644 --- a/MP.WASM.Mon/Client/Pages/Index.razor.cs +++ b/MP.WASM.Mon/Client/Pages/Index.razor.cs @@ -1,5 +1,5 @@ using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using NLog; using System.Net.Http.Json; diff --git a/MP.WASM.Mon/Server/Controllers/MSEController.cs b/MP.WASM.Mon/Server/Controllers/MSEController.cs index 072acb81..67eaed65 100644 --- a/MP.WASM.Mon/Server/Controllers/MSEController.cs +++ b/MP.WASM.Mon/Server/Controllers/MSEController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.WASM.Mon.Server.Data; using Newtonsoft.Json; using NLog; diff --git a/MP.WASM.Mon/Server/Data/MpDataService.cs b/MP.WASM.Mon/Server/Data/MpDataService.cs index e601bb87..29d798bb 100644 --- a/MP.WASM.Mon/Server/Data/MpDataService.cs +++ b/MP.WASM.Mon/Server/Data/MpDataService.cs @@ -1,5 +1,5 @@ using MP.Data.Conf; -using MP.Data.DatabaseModels; +using MP.Data.DbModels; using MP.WASM.Mon.Server.Controllers; using Newtonsoft.Json; using NLog;