diff --git a/AvaloniaApplication3/Date/Acts.cs b/AvaloniaApplication3/Date/Acts.cs index 7ec20b6..df8bb87 100644 --- a/AvaloniaApplication3/Date/Acts.cs +++ b/AvaloniaApplication3/Date/Acts.cs @@ -4,4 +4,5 @@ public class Acts { public int Id { get;} public string name { get; set; } + public Meropriatie meropriatie { get; set; } } \ No newline at end of file diff --git a/AvaloniaApplication3/Date/Conector/Conecter.cs b/AvaloniaApplication3/Date/Conector/Conecter.cs index 9411b17..425eb71 100644 --- a/AvaloniaApplication3/Date/Conector/Conecter.cs +++ b/AvaloniaApplication3/Date/Conector/Conecter.cs @@ -12,14 +12,14 @@ public class RemoteDatabaseContext : DbContext protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity().HasKey(group => group.Id); - modelBuilder.Entity().Property(group => group.Id).ValueGeneratedOnAdd(); + modelBuilder.Entity().HasKey(activity => activity.Id); + modelBuilder.Entity().Property(activity => activity.Id).ValueGeneratedOnAdd(); - modelBuilder.Entity().HasKey(user => user.code); - modelBuilder.Entity().Property(user => user.code).ValueGeneratedOnAdd(); + modelBuilder.Entity().HasKey(country => country.code); + modelBuilder.Entity().Property(country => country.code).ValueGeneratedOnAdd(); - modelBuilder.Entity() - .HasKey(meropriatie => meropriatie.numero); + modelBuilder.Entity() + .HasKey(actions => actions.number); modelBuilder.Entity() .Property(meropriatie => meropriatie.numero) diff --git a/AvaloniaApplication3/Date/Meropriatie.cs b/AvaloniaApplication3/Date/Meropriatie.cs index 5da2acb..7111509 100644 --- a/AvaloniaApplication3/Date/Meropriatie.cs +++ b/AvaloniaApplication3/Date/Meropriatie.cs @@ -1,4 +1,5 @@ using System; +using Tmds.DBus.Protocol; namespace AvaloniaApplication3.Date; diff --git a/AvaloniaApplication3/Date/Moders.cs b/AvaloniaApplication3/Date/Moders.cs index fccceed..1166f4c 100644 --- a/AvaloniaApplication3/Date/Moders.cs +++ b/AvaloniaApplication3/Date/Moders.cs @@ -12,4 +12,5 @@ public class Moders public string meropriatie { get; set; } public string Pass { get; set; } public string photo { get; set; } + public Meropriatie Meropriatie { get; set; } } \ No newline at end of file diff --git a/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.dll b/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.dll index d4a1ebd..7746980 100644 Binary files a/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.dll and b/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.dll differ diff --git a/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.pdb b/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.pdb index c1d83c8..9a41dab 100644 Binary files a/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.pdb and b/AvaloniaApplication3/bin/Debug/net8.0/AvaloniaApplication3.pdb differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.dll b/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.dll index d4a1ebd..7746980 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.dll and b/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.dll differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.pdb b/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.pdb index c1d83c8..9a41dab 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.pdb and b/AvaloniaApplication3/obj/Debug/net8.0/Avalonia/AvaloniaApplication3.pdb differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfo.cs b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfo.cs index aa6146b..45ef18f 100644 --- a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfo.cs +++ b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AvaloniaApplication3")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+167d9606b7b376823d65efb29774a054af195410")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+62cbc90a70e8c5a08fc7a0cd2f30c1f01c280d0d")] [assembly: System.Reflection.AssemblyProductAttribute("AvaloniaApplication3")] [assembly: System.Reflection.AssemblyTitleAttribute("AvaloniaApplication3")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfoInputs.cache b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfoInputs.cache index 147a693..a205d76 100644 --- a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfoInputs.cache +++ b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.AssemblyInfoInputs.cache @@ -1 +1 @@ -ddf08736301e55a15281c187fd3a705cd21e595e5488d2c5b25523215b7086d9 +60ae102342773f91586d093847a16e335cfab081c636eac53525fd97a755b92d diff --git a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.dll b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.dll index 93b6605..9bb7e43 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.dll and b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.dll differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.pdb b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.pdb index 5570602..f38d73e 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.pdb and b/AvaloniaApplication3/obj/Debug/net8.0/AvaloniaApplication3.pdb differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/ref/AvaloniaApplication3.dll b/AvaloniaApplication3/obj/Debug/net8.0/ref/AvaloniaApplication3.dll index 8892db0..460cb3f 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/ref/AvaloniaApplication3.dll and b/AvaloniaApplication3/obj/Debug/net8.0/ref/AvaloniaApplication3.dll differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/refint/Avalonia/AvaloniaApplication3.dll b/AvaloniaApplication3/obj/Debug/net8.0/refint/Avalonia/AvaloniaApplication3.dll index 8892db0..460cb3f 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/refint/Avalonia/AvaloniaApplication3.dll and b/AvaloniaApplication3/obj/Debug/net8.0/refint/Avalonia/AvaloniaApplication3.dll differ diff --git a/AvaloniaApplication3/obj/Debug/net8.0/refint/AvaloniaApplication3.dll b/AvaloniaApplication3/obj/Debug/net8.0/refint/AvaloniaApplication3.dll index a8166bf..09d12fb 100644 Binary files a/AvaloniaApplication3/obj/Debug/net8.0/refint/AvaloniaApplication3.dll and b/AvaloniaApplication3/obj/Debug/net8.0/refint/AvaloniaApplication3.dll differ