diff --git a/GPW.Api/Program.cs b/GPW.Api/Program.cs index 6e2c753..4cf1a8b 100644 --- a/GPW.Api/Program.cs +++ b/GPW.Api/Program.cs @@ -31,7 +31,7 @@ namespace GPW.Api public static void Main(string[] args) { - logger.Info("LiMan.API Application Starting Up"); + logger.Info("GPW.API Application Starting Up"); CreateHostBuilder(args).Build().Run(); } diff --git a/GPW.Data/DBModels/AnagGruppi.cs b/GPW.Data/DBModels/AnagGruppi.cs index 4259f25..e2903b3 100644 --- a/GPW.Data/DBModels/AnagGruppi.cs +++ b/GPW.Data/DBModels/AnagGruppi.cs @@ -9,7 +9,7 @@ namespace GPW.Data.DBModels { public AnagGruppi() { - Dipendentis = new HashSet(); + DipendentiNav = new HashSet(); } public string Gruppo { get; set; } @@ -17,6 +17,6 @@ namespace GPW.Data.DBModels public string CodExt { get; set; } public bool? ExportEnab { get; set; } - public virtual ICollection Dipendentis { get; set; } + public virtual ICollection DipendentiNav { get; set; } } } diff --git a/GPW.Data/DBModels/AnagOrari.cs b/GPW.Data/DBModels/AnagOrari.cs index 95a0ef0..9b99850 100644 --- a/GPW.Data/DBModels/AnagOrari.cs +++ b/GPW.Data/DBModels/AnagOrari.cs @@ -9,7 +9,7 @@ namespace GPW.Data.DBModels { public AnagOrari() { - Dipendentis = new HashSet(); + DipendentiNav = new HashSet(); } public string CodOrario { get; set; } @@ -34,6 +34,6 @@ namespace GPW.Data.DBModels public int ArrotMinuti { get; set; } public string ChkFun { get; set; } - public virtual ICollection Dipendentis { get; set; } + public virtual ICollection DipendentiNav { get; set; } } } diff --git a/GPW.Data/DBModels/AnagTipoTimb.cs b/GPW.Data/DBModels/AnagTipoTimb.cs index 560b714..095c351 100644 --- a/GPW.Data/DBModels/AnagTipoTimb.cs +++ b/GPW.Data/DBModels/AnagTipoTimb.cs @@ -9,12 +9,12 @@ namespace GPW.Data.DBModels { public AnagTipoTimb() { - Timbratures = new HashSet(); + TimbratureNav = new HashSet(); } public string CodTipoTimb { get; set; } public string DescrTipoTimb { get; set; } - public virtual ICollection Timbratures { get; set; } + public virtual ICollection TimbratureNav { get; set; } } } diff --git a/GPW.Data/DBModels/Dipendenti.cs b/GPW.Data/DBModels/Dipendenti.cs index f21e837..62685d7 100644 --- a/GPW.Data/DBModels/Dipendenti.cs +++ b/GPW.Data/DBModels/Dipendenti.cs @@ -15,7 +15,7 @@ namespace GPW.Data.DBModels //RegAttivita = new HashSet(); //RegAttivitaEgals = new HashSet(); //RilievoTemps = new HashSet(); - Timbratures = new HashSet(); + TimbratureNav = new HashSet(); } #endregion Public Constructors @@ -53,7 +53,7 @@ namespace GPW.Data.DBModels //public virtual ICollection RegAttivita { get; set; } //public virtual ICollection RegAttivitaEgals { get; set; } //public virtual ICollection RilievoTemps { get; set; } - public virtual ICollection Timbratures { get; set; } + public virtual ICollection TimbratureNav { get; set; } public string Utente { get; set; } public string WolMac { get; set; } diff --git a/GPW.Data/DBModels/Timbrature.cs b/GPW.Data/DBModels/Timbrature.cs index ea4e475..2589f61 100644 --- a/GPW.Data/DBModels/Timbrature.cs +++ b/GPW.Data/DBModels/Timbrature.cs @@ -14,7 +14,7 @@ namespace GPW.Data.DBModels public string CodTipoTimb { get; set; } public bool? Approv { get; set; } - public virtual AnagTipoTimb CodTipoTimbNavigation { get; set; } - public virtual Dipendenti IdxDipendenteNavigation { get; set; } + public virtual AnagTipoTimb CodTipoTimbNav { get; set; } + public virtual Dipendenti DipNav { get; set; } } } diff --git a/GPW.Data/GPWContext.cs b/GPW.Data/GPWContext.cs index 1e14f92..614d30f 100644 --- a/GPW.Data/GPWContext.cs +++ b/GPW.Data/GPWContext.cs @@ -1696,12 +1696,12 @@ namespace GPW.Data .HasColumnName("WOL_MAC"); entity.HasOne(d => d.CodOrarioNavigation) - .WithMany(p => p.Dipendentis) + .WithMany(p => p.DipendentiNav) .HasForeignKey(d => d.CodOrario) .HasConstraintName("FK_Dipendenti_AnagOrari"); entity.HasOne(d => d.GruppoNavigation) - .WithMany(p => p.Dipendentis) + .WithMany(p => p.DipendentiNav) .HasForeignKey(d => d.Gruppo) .HasConstraintName("FK_Dipendenti_AnagGruppi"); }); @@ -1735,13 +1735,13 @@ namespace GPW.Data .HasColumnName("IPv4") .HasDefaultValueSql("(N'0.0.0.0')"); - entity.HasOne(d => d.CodTipoTimbNavigation) - .WithMany(p => p.Timbratures) + entity.HasOne(d => d.CodTipoTimbNav) + .WithMany(p => p.TimbratureNav) .HasForeignKey(d => d.CodTipoTimb) .HasConstraintName("FK_Timbrature_AnagTipoTimb"); - entity.HasOne(d => d.IdxDipendenteNavigation) - .WithMany(p => p.Timbratures) + entity.HasOne(d => d.DipNav) + .WithMany(p => p.TimbratureNav) .HasForeignKey(d => d.IdxDipendente) .OnDelete(DeleteBehavior.ClientSetNull) .HasConstraintName("FK_Timbrature_Dipendenti");