diff --git a/MP.MONO.Data/DbModels/CounterModel.cs b/MP.MONO.Data/DbModels/CounterModel.cs index def0a62..332236c 100644 --- a/MP.MONO.Data/DbModels/CounterModel.cs +++ b/MP.MONO.Data/DbModels/CounterModel.cs @@ -17,7 +17,7 @@ namespace MP.MONO.Data.DbModels /// Codice Univoco /// [Key, DatabaseGenerated(DatabaseGeneratedOption.None), MaxLength(250)] - public string Code { get; set; } = ""; + public string CCode { get; set; } = ""; /// /// Descrizione diff --git a/MP.MONO.Data/DbModels/MGroupModel.cs b/MP.MONO.Data/DbModels/PMMGroupModel.cs similarity index 88% rename from MP.MONO.Data/DbModels/MGroupModel.cs rename to MP.MONO.Data/DbModels/PMMGroupModel.cs index 1520d42..fe3d7e3 100644 --- a/MP.MONO.Data/DbModels/MGroupModel.cs +++ b/MP.MONO.Data/DbModels/PMMGroupModel.cs @@ -11,13 +11,13 @@ namespace MP.MONO.Data.DbModels /// Tabella valore MAchine Groups /// [Table("MachineGroup")] - public class MGroupModel + public class PMMGroupModel { /// /// Codice Univoco /// [Key, DatabaseGenerated(DatabaseGeneratedOption.None), MaxLength(250)] - public string Code { get; set; } = ""; + public string PMMGCode { get; set; } = ""; /// /// Descrizione diff --git a/MP.MONO.Data/DbModels/PMTopicModel.cs b/MP.MONO.Data/DbModels/PMTopicModel.cs index 2f33832..7019146 100644 --- a/MP.MONO.Data/DbModels/PMTopicModel.cs +++ b/MP.MONO.Data/DbModels/PMTopicModel.cs @@ -17,7 +17,7 @@ namespace MP.MONO.Data.DbModels /// Codice Univoco /// [Key, DatabaseGenerated(DatabaseGeneratedOption.None), MaxLength(250)] - public string Code { get; set; } = ""; + public string PMTCode { get; set; } = ""; /// /// Descrizione diff --git a/MP.MONO.Data/DbModels/UserTeamModel.cs b/MP.MONO.Data/DbModels/PMUTModel.cs similarity index 89% rename from MP.MONO.Data/DbModels/UserTeamModel.cs rename to MP.MONO.Data/DbModels/PMUTModel.cs index c130350..de138e5 100644 --- a/MP.MONO.Data/DbModels/UserTeamModel.cs +++ b/MP.MONO.Data/DbModels/PMUTModel.cs @@ -11,13 +11,13 @@ namespace MP.MONO.Data.DbModels /// Tabella valore team utente /// [Table("UserTeam")] - public class UserTeamModel + public class PMUTModel { /// /// Codice Univoco /// [Key, DatabaseGenerated(DatabaseGeneratedOption.None), MaxLength(250)] - public string Code { get; set; } = ""; + public string PMUTCode { get; set; } = ""; /// /// Descrizione diff --git a/MP.MONO.Data/DbModels/PrevMaintModel.cs b/MP.MONO.Data/DbModels/PrevMaintModel.cs index 735a2d3..933f44d 100644 --- a/MP.MONO.Data/DbModels/PrevMaintModel.cs +++ b/MP.MONO.Data/DbModels/PrevMaintModel.cs @@ -32,15 +32,13 @@ namespace MP.MONO.Data.DbModels /// /// Area di riferimento generale x manutenzione /// - [MaxLength(50)] - public string Topic { get; set; } = ""; + public string PMTCode { get; set; } = ""; /// /// Gruppo logico di riferimento /// - [MaxLength(50)] - public string MachGroup { get; set; } = ""; - + public string PMMGCode { get; set; } = ""; + /// /// Valore per trigger di expiry /// @@ -54,30 +52,12 @@ namespace MP.MONO.Data.DbModels /// /// Team / Ruolo responsabile /// - [MaxLength(50)] - public string TeamInCharge { get; set; } = ""; + public string PMUTCode { get; set; } = ""; /// /// Contatore associato al task /// - public string CounterCode { get; set; } = ""; - -#if false - /// - /// DataOra evento start - /// - public DateTime DtRif { get; set; } = DateTime.Now; - - /// - /// Tipologia di driver del task - /// - public PMTaskDriver TDriver { get; set; } = PMTaskDriver.ND; - - /// - /// Tipologia di timer del task - /// - public PMTimeInterval TTimer { get; set; } = PMTimeInterval.ND; -#endif + public string CCode { get; set; } = ""; /// /// Navigazione oggetto Machine @@ -88,7 +68,25 @@ namespace MP.MONO.Data.DbModels /// /// Navigazione oggetto Counter /// - [ForeignKey("CounterCode")] + [ForeignKey("CCode")] public virtual CounterModel CounterNav { get; set; } = null!; + + /// + /// Navigazione oggetto User Team + /// + [ForeignKey("PMUTCode")] + public virtual PMUTModel UserTeamNav { get; set; } = null!; + + /// + /// Navigazione oggetto User Team + /// + [ForeignKey("PMMGCode")] + public virtual PMMGroupModel MachGroupNav { get; set; } = null!; + + /// + /// Navigazione oggetto User Team + /// + [ForeignKey("PMTCode")] + public virtual PMTopicModel TopicNav { get; set; } = null!; } } diff --git a/MP.MONO.Data/MapoMonoContext.cs b/MP.MONO.Data/MapoMonoContext.cs index 3fa799f..ca8f49a 100644 --- a/MP.MONO.Data/MapoMonoContext.cs +++ b/MP.MONO.Data/MapoMonoContext.cs @@ -90,7 +90,7 @@ namespace MP.MONO.Data /// /// DbSet User Team definiti x Prev Maint /// - public virtual DbSet DbSetUTeam { get; set; } = null!; + public virtual DbSet DbSetUTeam { get; set; } = null!; /// /// DbSet Topics x Prev Maint @@ -100,7 +100,7 @@ namespace MP.MONO.Data /// /// DbSet MachineGroup x Prev Maint /// - public virtual DbSet DbSetPMMachGroup { get; set; } = null!; + public virtual DbSet DbSetPMMachGroup { get; set; } = null!; /// /// DbSet Task di Prev Maint definiti /// diff --git a/MP.MONO.Data/ModelBuilderExtensions.cs b/MP.MONO.Data/ModelBuilderExtensions.cs index 6bb167c..c664f14 100644 --- a/MP.MONO.Data/ModelBuilderExtensions.cs +++ b/MP.MONO.Data/ModelBuilderExtensions.cs @@ -105,50 +105,50 @@ namespace MP.MONO.Data // inizializzazione dei valori di default x Tipologia counters modelBuilder.Entity().HasData( - new CounterModel { Code = "MacPowerOn", Description = "Machine Power On" }, - new CounterModel { Code = "CycleProc01", Description = "Process 1 on Cycle state" }, - new CounterModel { Code = "SpindleTorque01", Description = "Spindle 01 Torque % > 0" }, - new CounterModel { Code = "SpindleTorque02", Description = "Spindle 02 Torque % > 0" }, - new CounterModel { Code = "SpindleTorque03", Description = "Spindle 03 Torque % > 0" }, - new CounterModel { Code = "SpindleTorque04", Description = "Spindle 04 Torque % > 0" }, - new CounterModel { Code = "LMCheckElapsed", Description = "Time Elapsed from last full Manufacturer Check" } + new CounterModel { CCode = "MacPowerOn", Description = "Machine Power On" }, + new CounterModel { CCode = "CycleProc01", Description = "Process 1 on Cycle state" }, + new CounterModel { CCode = "SpindleTorque01", Description = "Spindle 01 Torque % > 0" }, + new CounterModel { CCode = "SpindleTorque02", Description = "Spindle 02 Torque % > 0" }, + new CounterModel { CCode = "SpindleTorque03", Description = "Spindle 03 Torque % > 0" }, + new CounterModel { CCode = "SpindleTorque04", Description = "Spindle 04 Torque % > 0" }, + new CounterModel { CCode = "LMCheckElapsed", Description = "Time Elapsed from last full Manufacturer Check" } ); // inizializzazione dei valori di default x Tipologia UserTeam - modelBuilder.Entity().HasData( - new UserTeamModel { Code = "TrainOp", Description = "Trained Operator" }, - new UserTeamModel { Code = "MaintServ", Description = "Maintenance Service" }, - new UserTeamModel { Code = "DevSupp", Description = "Device Supplier" }, - new UserTeamModel { Code = "MultiaxServ", Description = "Multiax Service" } + modelBuilder.Entity().HasData( + new PMUTModel { PMUTCode = "TrainOp", Description = "Trained Operator" }, + new PMUTModel { PMUTCode = "MaintServ", Description = "Maintenance Service" }, + new PMUTModel { PMUTCode = "DevSupp", Description = "Device Supplier" }, + new PMUTModel { PMUTCode = "MultiaxServ", Description = "Multiax Service" } ); // inizializzazione dei valori di default x Topic di Prev Maint modelBuilder.Entity().HasData( - new PMTopicModel { Code = "Mechanical", Description = "Mechanical system" }, - new PMTopicModel { Code = "Elettro", Description = "Electrical system" }, - new PMTopicModel { Code = "Lubro", Description = "Lubrication system" }, - new PMTopicModel { Code = "Coolant", Description = "Coolant system" }, - new PMTopicModel { Code = "Preumo", Description = "Pneumatic system" }, - new PMTopicModel { Code = "Hydro", Description = "Hydraulic system" }, - new PMTopicModel { Code = "Safety", Description = "Enclosure/Safety system" }, - new PMTopicModel { Code = "Suction", Description = "Suction system" }, - new PMTopicModel { Code = "GeoAdj", Description = "Geometrical system" } + new PMTopicModel { PMTCode = "Mechanical", Description = "Mechanical system" }, + new PMTopicModel { PMTCode = "Elettro", Description = "Electrical system" }, + new PMTopicModel { PMTCode = "Lubro", Description = "Lubrication system" }, + new PMTopicModel { PMTCode = "Coolant", Description = "Coolant system" }, + new PMTopicModel { PMTCode = "Preumo", Description = "Pneumatic system" }, + new PMTopicModel { PMTCode = "Hydro", Description = "Hydraulic system" }, + new PMTopicModel { PMTCode = "Safety", Description = "Enclosure/Safety system" }, + new PMTopicModel { PMTCode = "Suction", Description = "Suction system" }, + new PMTopicModel { PMTCode = "GeoAdj", Description = "Geometrical system" } ); // inizializzazione dei valori di default x Machine Group - modelBuilder.Entity().HasData( - new MGroupModel { Code = "Whole", Description = "Whole Machine" }, - new MGroupModel { Code = "Load", Description = "Part loader/unloader" }, - new MGroupModel { Code = "MovBelts", Description = "Part moving belts" }, - new MGroupModel { Code = "MovRoll", Description = "Part moving rollers" }, - new MGroupModel { Code = "Axis", Description = "Machining axis" }, - new MGroupModel { Code = "Spindles", Description = "Tool spindles" }, - new MGroupModel { Code = "ToolChange", Description = "Automatic tool changer" }, - new MGroupModel { Code = "Cabinet", Description = "Electrical cabinet" }, - new MGroupModel { Code = "ChipConv", Description = "Chips conveyor" }, - new MGroupModel { Code = "DustSuct", Description = "Dust suction" }, - new MGroupModel { Code = "OpPanel", Description = "Operator pannel" }, - new MGroupModel { Code = "Access", Description = "Accessories" } + modelBuilder.Entity().HasData( + new PMMGroupModel { PMMGCode = "Whole", Description = "Whole Machine" }, + new PMMGroupModel { PMMGCode = "Load", Description = "Part loader/unloader" }, + new PMMGroupModel { PMMGCode = "MovBelts", Description = "Part moving belts" }, + new PMMGroupModel { PMMGCode = "MovRoll", Description = "Part moving rollers" }, + new PMMGroupModel { PMMGCode = "Axis", Description = "Machining axis" }, + new PMMGroupModel { PMMGCode = "Spindles", Description = "Tool spindles" }, + new PMMGroupModel { PMMGCode = "ToolChange", Description = "Automatic tool changer" }, + new PMMGroupModel { PMMGCode = "Cabinet", Description = "Electrical cabinet" }, + new PMMGroupModel { PMMGCode = "ChipConv", Description = "Chips conveyor" }, + new PMMGroupModel { PMMGCode = "DustSuct", Description = "Dust suction" }, + new PMMGroupModel { PMMGCode = "OpPanel", Description = "Operator pannel" }, + new PMMGroupModel { PMMGCode = "Access", Description = "Accessories" } ); #if false