GUI anpassung

Kunden sind nicht mehr ganz oben im Navigation gelistet

DaSaSo.Domain/Enums/EMainWindowViewType.cs

@@ -8,6 +8,7 @@
         Projects,
         Buildingsites,
         SewerObjects,
-        SewerMainMenu
+        SewerMainMenu,
+        Impregnierung
     }
 }

DaSaSo.Domain/Model/Buildingsite.cs

@@ -8,6 +8,7 @@ namespace DaSaSo.Domain.Model
 {
     public class Buildingsite : DomainObject
     {
+        public Client Client { get; set; }
         public Project Project { get; set; }
         public string BuildingSiteNumber { get; set; }
         public string Country { get; set; }

DaSaSo.Domain/Model/Client.cs

@@ -13,7 +13,7 @@ namespace DaSaSo.Domain.Model
         public string Country { get; set; }
         public string Street { get; set; }
         public string Postcode { get; set; }
-        public ICollection<Project> Projects { get; set; } = new List<Project>();
+        //public ICollection<Project> Projects { get; set; } = new List<Project>();
 
     }
 }

DaSaSo.Domain/Model/Project.cs

@@ -10,7 +10,7 @@ namespace DaSaSo.Domain.Model
     {
         public string Name {  get; set; }
         public string Projektnummer { get; set; }
-        public Client Client { get; set; }
+        //public Client Client { get; set; }
         public ICollection<Buildingsite> BuildingSites { get; set; } = new List<Buildingsite>();
     }
 }

DaSaSo.Domain/Services/ProjectServices/IProjectService.cs

@@ -9,6 +9,6 @@ namespace DaSaSo.Domain.Services.ProjectServices
 {
     public interface IProjectService
     {
-        Task<Project> CreateProject(Client Auftraggeber);
+        Task<Project> CreateProject();
     }
 }

DaSaSo.Domain/Services/ProjectServices/ProjectService.cs

@@ -16,16 +16,18 @@ namespace DaSaSo.Domain.Services.ProjectServices
             _clientService = clientService;
         }
 
-        public async Task<Project> CreateProject(Client Auftraggeber)
+        public async Task<Project> CreateProject()
         {
+            /*
             Project project = new Project()
             {
                 Client = Auftraggeber
             };
-
-            Auftraggeber.Projects.Add(project);
-            await _clientService.Update(Auftraggeber.Id, Auftraggeber);
-            return project;
+            */
+            /*Auftraggeber.Projects.Add(project);
+            await _clientService.Update(Auftraggeber.Id, Auftraggeber);*/
+            
+            return new Project();
         }
     }
 }

DaSaSo.EntityFramework/Migrations/20211101090936_RemoveClientAsDomain.Designer.cs

@@ -0,0 +1,386 @@
+// <auto-generated />
+using System;
+using DaSaSo.EntityFramework;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DaSaSo.EntityFramework.Migrations
+{
+    [DbContext(typeof(DaSaSoDbContext))]
+    [Migration("20211101090936_RemoveClientAsDomain")]
+    partial class RemoveClientAsDomain
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("BuildingSiteNumber")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ProjectId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("Buildingsites");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Firstname")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Postcode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Impregnation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DN")
+                        .HasColumnType("integer");
+
+                    b.Property<DateOnly>("Date")
+                        .HasColumnType("date");
+
+                    b.Property<bool>("IsAvaible")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LinerNumber")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("Linerlength")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("WallThickness")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Impregnations");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("ClosedEnd")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateOnly>("Date")
+                        .HasColumnType("date");
+
+                    b.Property<int?>("ImpregnationId")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("InversionPressure")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("LinerLength")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Operator")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Preliner")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("PreparationType")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("TemperaturAssembly")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("TemperaturStorage")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("TemperatureOutdoors")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal>("TemperatureSewer")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Weather")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImpregnationId");
+
+                    b.ToTable("PipeLiners");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Projektnummer")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Projects");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DamageType")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("Distance")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("SewerObjectId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SewerObjectId");
+
+                    b.ToTable("SewerDamages");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int?>("BuildingSiteId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("BuildingsiteBarier")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("DN")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Hausnummer")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Material")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ObjektName")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PermitNeeded")
+                        .HasColumnType("boolean");
+
+                    b.Property<int?>("PipeLinerId")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("PunktObenId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PunktObenType")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("PunktUntenId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("PunktUntenType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SanNummer")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("SewerActivated")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("SewerCleaned")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal>("SewerLength")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("StreetName")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("WaterBarrier")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingSiteId");
+
+                    b.HasIndex("PipeLinerId");
+
+                    b.HasIndex("PunktObenId");
+
+                    b.HasIndex("PunktUntenId");
+
+                    b.ToTable("SewerObjects");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerPoint", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Objektnummer")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SewerPoints");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("DaSaSo.Domain.Model.Project", "Project")
+                        .WithMany("BuildingSites")
+                        .HasForeignKey("ProjectId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Project");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.Impregnation", "Impregnation")
+                        .WithMany()
+                        .HasForeignKey("ImpregnationId");
+
+                    b.Navigation("Impregnation");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
+                        .WithMany("SewerDamages")
+                        .HasForeignKey("SewerObjectId");
+
+                    b.Navigation("SewerObject");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
+                {
+                    b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
+                        .WithMany("SewerObjects")
+                        .HasForeignKey("BuildingSiteId");
+
+                    b.HasOne("DaSaSo.Domain.Model.PipeLiner", "PipeLiner")
+                        .WithMany()
+                        .HasForeignKey("PipeLinerId");
+
+                    b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktOben")
+                        .WithMany()
+                        .HasForeignKey("PunktObenId");
+
+                    b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktUnten")
+                        .WithMany()
+                        .HasForeignKey("PunktUntenId");
+
+                    b.Navigation("BuildingSite");
+
+                    b.Navigation("PipeLiner");
+
+                    b.Navigation("PunktOben");
+
+                    b.Navigation("PunktUnten");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
+                {
+                    b.Navigation("SewerObjects");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
+                {
+                    b.Navigation("BuildingSites");
+                });
+
+            modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
+                {
+                    b.Navigation("SewerDamages");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DaSaSo.EntityFramework/Migrations/20211101090936_RemoveClientAsDomain.cs

@@ -0,0 +1,92 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DaSaSo.EntityFramework.Migrations
+{
+    public partial class RemoveClientAsDomain : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Projects_Clients_ClientId",
+                table: "Projects");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Projects_ClientId",
+                table: "Projects");
+
+            migrationBuilder.DropColumn(
+                name: "ClientId",
+                table: "Projects");
+
+            migrationBuilder.AlterColumn<DateOnly>(
+                name: "Date",
+                table: "Impregnations",
+                type: "date",
+                nullable: false,
+                oldClrType: typeof(DateTime),
+                oldType: "timestamp with time zone");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ClientId",
+                table: "Buildingsites",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Buildingsites_ClientId",
+                table: "Buildingsites",
+                column: "ClientId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Buildingsites_Clients_ClientId",
+                table: "Buildingsites",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Buildingsites_Clients_ClientId",
+                table: "Buildingsites");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Buildingsites_ClientId",
+                table: "Buildingsites");
+
+            migrationBuilder.DropColumn(
+                name: "ClientId",
+                table: "Buildingsites");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ClientId",
+                table: "Projects",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.AlterColumn<DateTime>(
+                name: "Date",
+                table: "Impregnations",
+                type: "timestamp with time zone",
+                nullable: false,
+                oldClrType: typeof(DateOnly),
+                oldType: "date");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Projects_ClientId",
+                table: "Projects",
+                column: "ClientId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Projects_Clients_ClientId",
+                table: "Projects",
+                column: "ClientId",
+                principalTable: "Clients",
+                principalColumn: "Id");
+        }
+    }
+}

DaSaSo.EntityFramework/Migrations/DaSaSoDbContextModelSnapshot.cs

@@ -33,6 +33,9 @@ namespace DaSaSo.EntityFramework.Migrations
                     b.Property<string>("BuildingSiteNumber")
                         .HasColumnType("text");
 
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("integer");
+
                     b.Property<string>("ContactPerson")
                         .HasColumnType("text");
 
@@ -44,6 +47,8 @@ namespace DaSaSo.EntityFramework.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("ClientId");
+
                     b.HasIndex("ProjectId");
 
                     b.ToTable("Buildingsites");
@@ -88,8 +93,8 @@ namespace DaSaSo.EntityFramework.Migrations
                     b.Property<int>("DN")
                         .HasColumnType("integer");
 
-                    b.Property<DateTime>("Date")
-                        .HasColumnType("timestamp with time zone");
+                    b.Property<DateOnly>("Date")
+                        .HasColumnType("date");
 
                     b.Property<bool>("IsAvaible")
                         .HasColumnType("boolean");
@@ -173,9 +178,6 @@ namespace DaSaSo.EntityFramework.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("integer");
-
                     b.Property<string>("Name")
                         .HasColumnType("text");
 
@@ -184,8 +186,6 @@ namespace DaSaSo.EntityFramework.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("ClientId");
-
                     b.ToTable("Projects");
                 });
 
@@ -306,10 +306,16 @@ namespace DaSaSo.EntityFramework.Migrations
 
             modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
                 {
+                    b.HasOne("DaSaSo.Domain.Model.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
                     b.HasOne("DaSaSo.Domain.Model.Project", "Project")
                         .WithMany("BuildingSites")
                         .HasForeignKey("ProjectId");
 
+                    b.Navigation("Client");
+
                     b.Navigation("Project");
                 });
 
@@ -322,15 +328,6 @@ namespace DaSaSo.EntityFramework.Migrations
                     b.Navigation("Impregnation");
                 });
 
-            modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
-                {
-                    b.HasOne("DaSaSo.Domain.Model.Client", "Client")
-                        .WithMany("Projects")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
                 {
                     b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
@@ -372,11 +369,6 @@ namespace DaSaSo.EntityFramework.Migrations
                     b.Navigation("SewerObjects");
                 });
 
-            modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
-                {
-                    b.Navigation("Projects");
-                });
-
             modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
                 {
                     b.Navigation("BuildingSites");

DaSaSo.EntityFramework/Services/ClientDataService.cs

@@ -40,7 +40,7 @@ namespace DaSaSo.EntityFramework.Services
         public async Task<Client> Get(int id)
         {
             using DaSaSoDbContext context = _contextFactory.CreateDbContext();
-            Client entity = await context.Clients.Include(a => a.Projects).FirstOrDefaultAsync((e) => e.Id == id);
+            Client entity = await context.Clients.FirstOrDefaultAsync((e) => e.Id == id);
 
             return entity;
         }

DaSaSo.EntityFramework/Services/ImpregnationDataService.cs

@@ -0,0 +1,56 @@
+using DaSaSo.Domain.Model;
+using DaSaSo.Domain.Services;
+using DaSaSo.EntityFramework.Services.Common;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.EntityFramework.Services
+{
+    public class ImpregnationDataService : IDataService<Impregnation>
+    {
+        private readonly DaSaSoDbContextFactory _contextFactory;
+        private readonly NonQueryDataService<Impregnation> _nonQueryDataService;
+
+        public ImpregnationDataService(DaSaSoDbContextFactory contextFactory)
+        {
+            _contextFactory = contextFactory;
+            _nonQueryDataService = new NonQueryDataService<Impregnation>(contextFactory);
+        }
+
+        public async Task<Impregnation> Create(Impregnation entity)
+        {
+            return await _nonQueryDataService.Create(entity);
+        }
+
+        public Impregnation CreateNonAsync(Impregnation entity)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<bool> Delete(int id)
+        {
+            return await _nonQueryDataService.Delete(id);
+        }
+
+        public Task<Impregnation> Get(int id)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<IEnumerable<Impregnation>> GetAll()
+        {
+            using DaSaSoDbContext context = _contextFactory.CreateDbContext();
+            IEnumerable<Impregnation> entities = await context.Impregnations.ToListAsync();
+            return entities;
+        }
+
+        public Task<Impregnation> Update(int id, Impregnation entity)
+        {
+            return _nonQueryDataService.Update(id, entity);
+        }
+    }
+}

DaSaSo.EntityFramework/Services/ProjectDataService.cs

@@ -41,22 +41,16 @@ namespace DaSaSo.EntityFramework.Services
             }
         }
 
-        public async Task<IEnumerable<Project>> GetAllByClient(Client client)
+       
+        public async Task<IEnumerable<Project>> GetAll()
         {
-            // Get Clientid
-            int id = client.Id;
-            using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
+            using(DaSaSoDbContext context = _contextFactory.CreateDbContext())
             {
-                IEnumerable<Project> entities = await context.Projects.Where(x => x.Client.Id == id).ToListAsync();
+                IEnumerable<Project> entities = await context.Projects.ToListAsync();
                 return entities;
             }
         }
 
-        public Task<IEnumerable<Project>> GetAll()
-        {
-            throw new NotImplementedException();
-        }
-
         public async Task<Project> Update(int id, Project entity)
         {
             return await _nonQueryDataService.Update(id, entity);

DaSaSo.ViewModel/BuildingsiteEditViewModel.cs

@@ -69,12 +69,12 @@ namespace DaSaSo.ViewModel
             _renavigator = renavigator;
             _model = actualProject.AktuellBaustelle;
 
-            SaveBuildingsiteCommand = new RelayCommand(SaveBuildingsite);
+            SaveBuildingsiteCommand = new RelayCommand(SaveBuildingsiteAsync);
         }
 
-        private void SaveBuildingsite()
+        private async void SaveBuildingsiteAsync()
         {
-            _buildingsiteService.Update(Model.Id, Model);
+            await _buildingsiteService.Update(Model.Id, Model);
             _renavigator.Renavigate();
         }
     }

DaSaSo.ViewModel/ClientListViewModel.cs

@@ -22,7 +22,6 @@ namespace DaSaSo.ViewModel
         private readonly IDataService<Client> _dataService;
         bool _isLoading = true;
 
-        public ICommand SelectCommand { get; set; }
         public ICommand EditCommand { get; set; }
         public ICommand AddNewClientCommand { get; set; }
 
@@ -63,7 +62,7 @@ namespace DaSaSo.ViewModel
             _dataService = dataService;
             
             LoadClient();
-            SelectCommand = new SelectClientCommand(dataService,actualProject, this);
+            
             EditCommand = new EditClientCommand(_dataService,actualProject, editRenavigator, this);
             AddNewClientCommand = new AddClientCommand(_dataService, actualProject, editRenavigator, this);
 

DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs

@@ -0,0 +1,28 @@
+using DaSaSo.Domain.Model;
+using DaSaSo.Domain.Services;
+using DaSaSo.ViewModel.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.ViewModel.Commands
+{
+    internal class AddImpregnationCommand : AsyncCommandBase
+    {
+        private IDataService<Impregnation> impregnationService;
+        private IRenavigator editRenavigator;
+
+        public AddImpregnationCommand(IDataService<Impregnation> impregnationService, IRenavigator editRenavigator)
+        {
+            this.impregnationService = impregnationService;
+            this.editRenavigator = editRenavigator;
+        }
+
+        public override Task ExecuteAsync(object? parameter)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

DaSaSo.ViewModel/Commands/AddProjectCommand.cs

@@ -29,7 +29,7 @@ namespace DaSaSo.ViewModel.Commands
 
         public override async Task ExecuteAsync(object? parameter)
         {
-            Project pro = await _projectService.CreateProject(_actualProject.AktuellClient);
+            Project pro = await _projectService.CreateProject();
             _actualProject.SetProject(pro);
             _renavigator.Renavigate();
             

DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs

@@ -0,0 +1,37 @@
+using DaSaSo.Domain.Model;
+using DaSaSo.Domain.Services;
+using DaSaSo.ViewModel.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.ViewModel.Commands
+{
+    internal class EditImpregnationCommand : AsyncCommandBase
+    {
+        private IDataService<Impregnation> _impregnationService;
+        private ImpregnierungListViewModel _impregnierungListViewModel;
+        private IRenavigator _editRenavigator;
+        private IActualProject _actualProject;
+
+        public EditImpregnationCommand(
+            IDataService<Impregnation> impregnationService,
+            ImpregnierungListViewModel impregnierungListViewModel,
+            IActualProject actualProject,
+            IRenavigator editRenavigator)
+        {
+            _impregnationService = impregnationService;
+            _impregnierungListViewModel = impregnierungListViewModel;
+            _actualProject = actualProject;
+            _editRenavigator = editRenavigator;
+        }
+
+        public override async Task ExecuteAsync(object? parameter)
+        {
+            _actualProject.SetImpregnation(_impregnierungListViewModel.SelectedImpregnation);
+            _editRenavigator.Renavigate();
+        }
+    }
+}

DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs

@@ -0,0 +1,28 @@
+using DaSaSo.Domain.Model;
+using DaSaSo.Domain.Services;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.ViewModel.Commands
+{
+    internal class SaveImpregnationCommand : AsyncCommandBase
+    {
+        private IDataService<Impregnation> _impregnationService;
+        private ImpregnierungEditViewModel _impregnationEditViewModel;
+
+        public SaveImpregnationCommand(ImpregnierungEditViewModel impregnierungEditViewModel, IDataService<Impregnation> dataService)
+        {
+            _impregnationService = dataService;
+            _impregnationEditViewModel = impregnierungEditViewModel;
+        }
+        public override async Task ExecuteAsync(object? parameter)
+        {
+            _impregnationEditViewModel.Model = await _impregnationService.Update(_impregnationEditViewModel.Model.Id, _impregnationEditViewModel.Model);
+            Trace.WriteLine("Daten gespeichert");
+        }
+    }
+}

DaSaSo.ViewModel/Controls/SewerRhebalationControllViewModel.cs

@@ -83,5 +83,10 @@ namespace DaSaSo.ViewModel.Controls
             SewerPreperationControllViewModel = new SewerPreperationControllViewModel(model.PreparationType);
             _date = model.Date.ToDateTime(new TimeOnly(0));
         }
+        public override void Dispose()
+        {
+            model.PreparationType = SewerPreperationControllViewModel.CalculatePreparationFlags();
+            base.Dispose();
+        }
     }
 }

DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs

@@ -13,6 +13,7 @@ namespace DaSaSo.ViewModel.Factories
         private CreateViewModel<BuildingsiteListViewModel> _createBuildingsiteListViewModel;
         private CreateViewModel<SewerObjectListViewModel> _createSewerObjectListViewModel;
         private CreateViewModel<SewerMainListViewModel> _createSewerMainMenuListViewModel;
+        private CreateViewModel<ImpregnierungListViewModel> _createImpregnierungListViewModel;
 
         public MainWindowViewModelFactory(
             CreateViewModel<HomeViewModel> createHomeViewModel,
@@ -21,7 +22,8 @@ namespace DaSaSo.ViewModel.Factories
             CreateViewModel<ProjectListViewModel> createProjektListViewModel,
             CreateViewModel<BuildingsiteListViewModel> createBuildingsiteListViewModel,
             CreateViewModel<SewerObjectListViewModel> createSewerObjectListViewModel,
-            CreateViewModel<SewerMainListViewModel> createSewerMainMenuListViewModel
+            CreateViewModel<SewerMainListViewModel> createSewerMainMenuListViewModel,
+            CreateViewModel<ImpregnierungListViewModel> createImpregnierungListViewModel
             )
         {
             _createHomeViewModel = createHomeViewModel;
@@ -31,6 +33,8 @@ namespace DaSaSo.ViewModel.Factories
             _createBuildingsiteListViewModel = createBuildingsiteListViewModel;
             _createSewerObjectListViewModel = createSewerObjectListViewModel;
             _createSewerMainMenuListViewModel = createSewerMainMenuListViewModel;
+            _createImpregnierungListViewModel = createImpregnierungListViewModel;
+
         }
 
         public BaseViewModel CreateViewModel(EMainWindowViewType viewType)
@@ -52,7 +56,10 @@ namespace DaSaSo.ViewModel.Factories
                     return _createSewerObjectListViewModel();
                 case EMainWindowViewType.SewerMainMenu:
                     return _createSewerMainMenuListViewModel();
-                
+                case EMainWindowViewType.Impregnierung:
+                    return _createImpregnierungListViewModel();
+
+
                 default:
                     throw new ArgumentException("The Viewtype does not have a ViewModel.", "viewType");
             }

DaSaSo.ViewModel/ImpregnierungEditViewModel.cs

@@ -0,0 +1,67 @@
+using DaSaSo.Domain.Model;
+using DaSaSo.Domain.Services;
+using DaSaSo.ViewModel.Commands;
+using DaSaSo.ViewModel.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace DaSaSo.ViewModel
+{
+    public class ImpregnierungEditViewModel : BaseViewModel
+    {
+        private Impregnation _model;
+        public ICommand SaveImpregnation { get; set; }
+        public Impregnation Model { get =>  _model; set => _model = value; }
+
+        public int DN
+        {
+            get => _model.DN;
+            set
+            {
+                _model.DN = value;
+            }
+        }
+        public string LinerCharge
+        {
+            get => _model.LinerNumber;
+            set
+            {
+                _model.LinerNumber = value;
+            }
+        }
+        public decimal Wandstärke
+        {
+            get => _model.WallThickness;
+            set
+            {
+                _model.WallThickness = value;
+            }
+        }
+        public decimal LinerLänge
+        {
+            get => _model.Linerlength;
+            set
+            {
+                _model.Linerlength = value;
+            }
+        }
+        public string Imprägniernummer
+        {
+            get => _model.Number;
+            set
+            {
+                _model.Number = value;
+            }
+        }
+
+        public ImpregnierungEditViewModel(IActualProject actualProject, IDataService<Impregnation> dataservice)
+        {
+            _model = actualProject.AktuellImpregnation;
+            SaveImpregnation = new SaveImpregnationCommand(this,dataservice);
+        }
+    }
+}

DaSaSo.ViewModel/ImpregnierungListViewModel.cs

@@ -0,0 +1,85 @@
+using DaSaSo.Domain.Model;
+using DaSaSo.Domain.Services;
+using DaSaSo.ViewModel.Commands;
+using DaSaSo.ViewModel.Interface;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace DaSaSo.ViewModel
+{
+    public class ImpregnierungListViewModel : BaseViewModel
+    {
+        public ObservableCollection<Impregnation> Impregnations { get; }
+        private readonly IDataService<Impregnation> _impregnationService;
+        private Impregnation? _selectedImpregnation = null;
+        public Impregnation? SelectedImpregnation
+        {
+            get => _selectedImpregnation;
+            set
+            {
+                if(_selectedImpregnation != value)
+                {
+                    _selectedImpregnation = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        public ICommand EditImpregnationCommand { get; set; }
+        public ICommand AddImpregnationCommand { get; set; }
+        bool _isLoading;
+
+        public bool IsLoading {
+            get => _isLoading;
+            set
+            {
+                if(_isLoading != value)
+                {
+                    _isLoading = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public ImpregnierungListViewModel(IDataService<Impregnation> impregnationService,IActualProject actualProject, IRenavigator editRenavigator)
+        {
+            IsLoading = true;
+            Impregnations = new ObservableCollection<Impregnation>();
+            _impregnationService = impregnationService;
+            AddImpregnationCommand = new RelayCommand(() =>
+            {
+                Impregnation newImpregnation = new Impregnation()
+                {
+                    Number = "Neu bitte Editieren!"
+                };
+                SelectedImpregnation = newImpregnation;
+                Impregnations.Add(newImpregnation);
+                OnPropertyChanged("Impregnations");
+            });
+            
+            //AddImpregnationCommand = //new AddImpregnationCommand(_impregnationService, editRenavigator);
+            EditImpregnationCommand = new EditImpregnationCommand(_impregnationService, this,actualProject, editRenavigator);
+            LoadImpregnations();
+
+        }
+
+        private async void LoadImpregnations()
+        {
+            var impregList = await _impregnationService.GetAll();
+            InitCollection(Impregnations, impregList);
+            IsLoading = false;
+        }
+
+        private void InitCollection(ObservableCollection<Impregnation> target, IEnumerable<Impregnation> source)
+        {
+            target.Clear();
+            foreach (var i in source)
+                target.Add(i);
+        }
+    }
+}

DaSaSo.ViewModel/Interface/IActualProject.cs

@@ -19,12 +19,14 @@ namespace DaSaSo.ViewModel.Interface
         Buildingsite AktuellBaustelle { get; }
         SewerObject AktuellSewerObject { get; }
         SewerDamage AktuellSewerDamage { get; }
+        Impregnation AktuellImpregnation { get; }
 
         void SetClient(Client client, bool notification = true);
         void SetProject(Project project, bool notification = true);
         void SetBuildingSite(Buildingsite buildingsite);
         void SetSewerObject(SewerObject sewerObject, bool notification = true);
         void SetSewerDamage(SewerDamage sewerDamage, bool notification = true);
+        void SetImpregnation(Impregnation impregnation, bool notification = true);
         void ResetProject();
         void ResetBuildingSite();
     }

DaSaSo.ViewModel/ProjectListViewModel.cs

@@ -56,9 +56,10 @@ namespace DaSaSo.ViewModel
             LoadProjecte();
         }
 
-        public void LoadProjecte()
+        public async void LoadProjecte()
         {
-            InitCollection(Projekte, actualProject.AktuellClient.Projects);
+            var projects = await genericDataService.GetAll();
+            InitCollection(Projekte, projects);
         }
 
         private void InitCollection(ObservableCollection<Project> target, IEnumerable<Project> source)

DaSaSo.ViewModel/SewerMainListViewModel.cs

@@ -24,7 +24,7 @@ namespace DaSaSo.ViewModel
         private IActualProject ActualProject {  get; set; }
         public ICommand UpdateCurrentSewerViewModelCommand { get; }
         public ICommand CloseCommand { get; set; }
-        public ICommand SchadenCommand { get; set; }
+       // public ICommand SchadenCommand { get; set; }
         public ICommand Schlauchliner { get; set; }
         public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel;
 

DaSaSo.ViewModel/SewerPipeLinerViewModel.cs

@@ -117,6 +117,7 @@ namespace DaSaSo.ViewModel
             //Model.PreparationType = preparationFlags;
             //SewerPreperationControllViewModel.Dispose();
             //Debugger.Break();
+            SewerRhebalationControllViewModel.Dispose();
             base.Dispose();
         }
     }

DaSaSo.ViewModel/State/ActualState/ActualProject.cs

@@ -14,8 +14,8 @@ namespace DaSaSo.ViewModel.State.ActualState
         public Buildingsite? AktuellBaustelle { get; private set; }
         public Project? AktuellProjekt { get; private set; }
         public SewerObject? AktuellSewerObject { get; private set; }
-
         public SewerDamage? AktuellSewerDamage { get; private set; }
+        public Impregnation? AktuellImpregnation { get; private set;  }
 
 
         #region events
@@ -57,7 +57,6 @@ namespace DaSaSo.ViewModel.State.ActualState
 
         public void SetProject(Project project, bool notification = true)
         {
-            
             AktuellProjekt = project;
             if(notification)
                 OnProjectChanged();
@@ -76,7 +75,12 @@ namespace DaSaSo.ViewModel.State.ActualState
                 OnSewerObjectChanged();
         }
 
-
+        public void SetImpregnation(Impregnation impregnation, bool notification = true)
+        {
+            AktuellImpregnation = impregnation;
+            if (notification)
+                return; // TODO notification wird aktuell nicht benötigt
+        }
         public void ResetProject()
         {
             SetProject(null);

DaSaSo.ViewModel/Window/MainWindowViewModel.cs

@@ -41,7 +41,6 @@ namespace DaSaSo.ViewModel
         private string _buildingsitename = "";
         private RegistryKey? registry;
         const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
-        public bool CanSelectProject { get => _actualProject.AktuellClient != null; }
         public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; }
         public bool CanSelectSewerObjects { get => _actualProject.AktuellBaustelle != null; }
 
@@ -137,7 +136,6 @@ namespace DaSaSo.ViewModel
             UpdateCurrentViewModelCommand = new UpdateCurrentViewModelCommand(navigator, viewModelFactory);
             UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Home);
             _actualProject = actualProject;
-            _actualProject.ClientChanged += ActualProject_ClientChanged;
             _actualProject.ProjectChanged += ActualProject_ProjectChanged;
             _actualProject.BuildingSiteChanged += ActualProject_BuildingSiteChanged;
             _actualProject.SewerObjectChanged += ActualProject_SewerObjectChanged;
@@ -220,13 +218,5 @@ namespace DaSaSo.ViewModel
             OnPropertyChanged(nameof(CanSelectBuildingSite));
             UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Buildingsites);
         }
-
-        private void ActualProject_ClientChanged(object? sender, EventArgs e)
-        {
-            SaveInRegistry("lastclient", _actualProject.AktuellClient.Id.ToString());
-            ClientName = _actualProject.AktuellClient.Firstname;
-            OnPropertyChanged(nameof(CanSelectProject));
-            UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Projects);
-        }
     }
 }

DaSaSo.Wpf/App.xaml.cs

@@ -41,119 +41,7 @@ namespace DaSaSo.Wpf
                 .AddDBContext();
         }
 
-         /*   return Host.CreateDefaultBuilder(args)
-                .ConfigureAppConfiguration(c=>
-                {
-                    c.AddJsonFile("appsettings.json");
-                    c.AddEnvironmentVariables();
-                })
-                .ConfigureServices((context, services) =>
-                {
-
-                    string connectionString = context.Configuration.GetConnectionString("default");
-
-                    services.AddDbContext<DaSaSoDbContext>(o => o.UseSqlServer(connectionString));
-                    services.AddSingleton<DaSaSoDbContextFactory>(new DaSaSoDbContextFactory(connectionString));
-                    
-                    services.AddSingleton<IDataService<Client>, ClientDataService>();
-                    services.AddSingleton<IDataService<Project>, ProjectDataService>();
-                    services.AddSingleton<IDataService<Buildingsite>, BuildingsiteDataService>();
-                    services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
-                    services.AddSingleton<ClientListViewModel>();
-                    services.AddSingleton<IProjectService, ProjectService>();
-                    services.AddSingleton<IBuildingsiteService, BuildingsiteService>();
-                    services.AddSingleton<ISewerObjectService, SewerObjectService>();
-
-
-                    services.AddSingleton<IViewModelAbstractFactory, MainWindowViewModelFactory>();
-                    services.AddSingleton<IViewModelSewerMainFactory, SewerWindowViewModelFactory>();
-                    services.AddSingleton<CreateViewModel<ClientEditViewModel>>(services =>
-                    {
-                        return () => new ClientEditViewModel(
-                             services.GetRequiredService<IDataService<Client>>(),
-                             services.GetRequiredService<IActualProject>(),
-                             new ViewModelDelegateRenavigator(
-                                 services.GetRequiredService<IMainWindowNavigator>()
-                             ));
-                    });
-                    services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
-                    {
-                        return () => new HomeViewModel();
-                    });
-                    services.AddSingleton<CreateViewModel<SewerStammdatenViewModel>>(services =>
-                    {
-                        return () => new SewerStammdatenViewModel(
-                            services.GetRequiredService<IActualProject>()
-                            );
-                    });
-                    services.AddSingleton<CreateViewModel<SewerDamageListViewModel>>(services =>
-                    {
-                        return () => new SewerDamageListViewModel();
-                    });
-
-                    services.AddSingleton<CreateViewModel<ClientListViewModel>>(services =>
-                    {
-                        return () => new ClientListViewModel(
-                            services.GetRequiredService<IDataService<Client>>(),
-                            services.GetRequiredService<IActualProject>(),
-                            new ViewModelDelegateRenavigator(
-                                services.GetRequiredService<IMainWindowNavigator>()
-                            ));
-                    });
-                    services.AddSingleton<CreateViewModel<SewerMainListViewModel>>(services =>
-                    {
-                        return () => new SewerMainListViewModel(
-                            services.GetRequiredService<IDataService<SewerObject>>(),
-                            services.GetRequiredService<ISewerMainNavigator>(),
-                            services.GetRequiredService<IActualProject>(),
-                            services.GetRequiredService<IViewModelSewerMainFactory>(),
-                            new ViewModelDelegateRenavigator(
-                                services.GetRequiredService<IMainWindowNavigator>()
-                                ),
-                            services.GetRequiredService<ISewerObjectService>()
-                            );
-                    });
-                    services.AddSingleton<CreateViewModel<ProjectListViewModel>>(services =>
-                    {
-                        return () => new ProjectListViewModel(
-                            services.GetRequiredService<IDataService<Project>>(),
-                            services.GetRequiredService<IActualProject>(),
-                            new ViewModelDelegateRenavigator(
-                                services.GetRequiredService<IMainWindowNavigator>()),
-                            services.GetRequiredService<IProjectService>()
-                            
-                            );
-                    });
-
-                    services.AddSingleton<CreateViewModel<BuildingsiteListViewModel>>(services =>
-                    {
-                        return () => new BuildingsiteListViewModel(
-                            services.GetRequiredService<IDataService<Buildingsite>>(),
-                            services.GetRequiredService<IActualProject>(),
-                            new ViewModelDelegateRenavigator(
-                                services.GetRequiredService<IMainWindowNavigator>()),
-                            services.GetRequiredService<IBuildingsiteService>()
-                            );
-                    });
-
-                    services.AddSingleton<CreateViewModel<SewerObjectListViewModel>>(services =>
-                    {
-                        return () => new SewerObjectListViewModel(
-                            services.GetRequiredService<IDataService<SewerObject>>(),
-                            services.GetRequiredService<IActualProject>(),
-                            services.GetRequiredService<ISewerObjectService>()
-                            );
-                    });
-
-                    //services.AddSingleton<INavigator, Navigator>();
-                    services.AddScoped<IActualProject, ActualProject>();
-                    services.AddScoped<IMainWindowNavigator, MainWindowNavigator>();
-                    services.AddScoped<ISewerMainNavigator, SewerMainNavigator>();
-
-                    services.AddScoped<MainWindowViewModel>();
-                });
-        }
-         */
+         
         protected override void OnStartup(StartupEventArgs e)
         {
             Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
@@ -177,7 +65,7 @@ namespace DaSaSo.Wpf
 
         protected override  async void OnExit(ExitEventArgs e)
         {
-            _host.StopAsync();
+            await _host.StopAsync();
             _host.Dispose();
             base.OnExit(e);
         }

DaSaSo.Wpf/Controls/MainWindowNavigationBar.xaml

@@ -10,7 +10,7 @@
              xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
              d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
              mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="200">
+             d:DesignHeight="375" d:DesignWidth="200">
     <UserControl.Resources>
         <converters:EqualValueToParameterConverter x:Key="EqualValueToParameterConverter" />
         <converters:EqualValueToBooleanConverter x:Key="EqualValueToBooleanConverter" />
@@ -21,13 +21,14 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
-        <RadioButton Grid.Row="0" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ClientListViewModel}}" Content="Kunden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="True" CommandParameter="{x:Static nav:EMainWindowViewType.Clients}"/>
-        <RadioButton Grid.Row="1" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ProjectListViewModel}}" Content="Projekte" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectProject}" CommandParameter="{x:Static nav:EMainWindowViewType.Projects}" />
-        <RadioButton Grid.Row="2" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:BuildingsiteListViewModel}}" Content="Baustellen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectBuildingSite}" CommandParameter="{x:Static nav:EMainWindowViewType.Buildingsites}" />
-        <RadioButton Grid.Row="3" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:SewerObjectListViewModel}}" Content="Objekten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectSewerObjects}"  CommandParameter="{x:Static nav:EMainWindowViewType.SewerObjects}" />
-
-        <Border Grid.RowSpan="4" Background="LightBlue"  Visibility="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToBooleanConverter}, ConverterParameter={x:Type viewmodel:SewerMainListViewModel}}" d:Visibility="Hidden">
+        <RadioButton Grid.Row="0" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ProjectListViewModel}}" Content="Projekte" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EMainWindowViewType.Projects}" />
+        <RadioButton Grid.Row="1" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:BuildingsiteListViewModel}}" Content="Baustellen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectBuildingSite}" CommandParameter="{x:Static nav:EMainWindowViewType.Buildingsites}" />
+        <RadioButton Grid.Row="2" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:SewerObjectListViewModel}}" Content="Objekten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectSewerObjects}"  CommandParameter="{x:Static nav:EMainWindowViewType.SewerObjects}" />
+        <RadioButton Grid.Row="3" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ClientListViewModel}}" Content="Kunden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="True" CommandParameter="{x:Static nav:EMainWindowViewType.Clients}"/>
+        <RadioButton Grid.Row="4" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ImpregnierungListViewModel}}" Content="Imprägnierungen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EMainWindowViewType.Impregnierung}" />
+        <Border Grid.RowSpan="5" Background="LightBlue"  Visibility="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToBooleanConverter}, ConverterParameter={x:Type viewmodel:SewerMainListViewModel}}" d:Visibility="Hidden">
             <TextBlock Foreground="WhiteSmoke" FontSize="18" Text="Editing Sewer" />
         </Border>
     </Grid>

DaSaSo.Wpf/DaSaSo.Wpf.csproj.user

@@ -28,6 +28,12 @@
     <Compile Update="View\HomeView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="View\Impregnation\ImpregnationEditView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="View\Impregnation\ImpregnationListView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="View\Project\ProjectEditView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -90,6 +96,12 @@
     <Page Update="View\HomeView.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="View\Impregnation\ImpregnationEditView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="View\Impregnation\ImpregnationListView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="View\Project\ProjectEditView.xaml">
       <SubType>Designer</SubType>
     </Page>

DaSaSo.Wpf/HostBuilders/AddServicesHostBuilderExtensions.cs

@@ -26,6 +26,7 @@ namespace DaSaSo.Wpf.HostBuilders
                 services.AddTransient<IDataService<Buildingsite>, BuildingsiteDataService>();
                 services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
                 services.AddSingleton<IDataService<SewerPoint>, SewerpointDataService>();
+                services.AddSingleton<IDataService<Impregnation>, ImpregnationDataService>();
                 services.AddSingleton<IProjectService, ProjectService>();
                 services.AddSingleton<IBuildingsiteService, BuildingsiteService>();
                 services.AddSingleton<ISewerObjectService, SewerObjectService>();

DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs

@@ -40,6 +40,8 @@ namespace DaSaSo.Wpf.HostBuilders
                 services.AddSingleton<ViewModelDelegateRenavigator<SewerObjectListViewModel>>();
                 services.AddTransient<ViewModelDelegateRenavigator<SewerDamageEditViewModel>>();
 
+                services.AddSingleton<ViewModelDelegateRenavigator<ImpregnierungEditViewModel>>();
+
                 services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
                 {
                     return () => new HomeViewModel();
@@ -66,6 +68,23 @@ namespace DaSaSo.Wpf.HostBuilders
                 {
                     return () => new HomeViewModel();
                 });
+
+                services.AddSingleton<CreateViewModel<ImpregnierungListViewModel>>(services =>
+                {
+                    return () => new ImpregnierungListViewModel(
+                        services.GetRequiredService<IDataService<Impregnation>>(),
+                        services.GetRequiredService<IActualProject>(),
+                        services.GetRequiredService<ViewModelDelegateRenavigator<ImpregnierungEditViewModel>>()
+                        );
+                });
+                services.AddTransient<CreateViewModel<ImpregnierungEditViewModel>>(services =>
+                {
+                    return () => new ImpregnierungEditViewModel(
+                        services.GetRequiredService<IActualProject>(),
+                        services.GetRequiredService<IDataService<Impregnation>>()
+                        );
+                });
+
                 services.AddTransient<CreateViewModel<SewerStammdatenViewModel>>(services =>
                 {
                     return () => new SewerStammdatenViewModel(

DaSaSo.Wpf/View/Client/ClientListView.xaml

@@ -13,7 +13,6 @@
         <StackPanel>
             <TextBlock Text="Kundenliste" />
             <ListView Margin="20" ItemsSource="{Binding Clients}" DisplayMemberPath="Firstname" SelectedItem="{Binding SelectedClient, Mode=TwoWay}"/>
-            <Button Content="Kunde auswählen" Command="{Binding SelectCommand}" />
             <Button Content="Kunde Editieren"  Command="{Binding EditCommand}"/>
             <Button Content="Kunde Hinzufügen" Command="{Binding AddNewClientCommand}" />
         </StackPanel>

DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml

@@ -0,0 +1,42 @@
+<UserControl x:Class="DaSaSo.Wpf.View.Impregnation.ImpregnationEditView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungEditViewModel}"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <Label Grid.Column="0" Grid.Row="0" Content="Imprägniernummer" />
+        <Label Grid.Column="0" Grid.Row="1" Content="Linercharge" />
+        <Label Grid.Column="0" Grid.Row="2" Content="Liner Länge" />
+        <Label Grid.Column="0" Grid.Row="3" Content="Durchmesser" />
+        <Label Grid.Column="0" Grid.Row="4" Content="Wandstärke" />
+        <Label Grid.Column="0" Grid.Row="5" Content="Datum" />
+        <Label Grid.Column="0" Grid.Row="6" Content="Vorhanden" />
+
+        <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Imprägniernummer}" />
+        <TextBox Grid.Column="1" Grid.Row="1" Text="{Binding LinerCharge}" />
+        <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding LinerLänge}" />
+        <TextBox Grid.Column="1" Grid.Row="3" Text="{Binding DN}" />
+        <TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Wandstärke}" />
+        <TextBox Grid.Column="1" Grid.Row="5" Text="" />
+        <CheckBox Grid.Column="1" Grid.Row="6" Content="Ja" Style="{StaticResource checkBoxCircleSmall}"/>
+
+        <Button Grid.Row="7" Grid.ColumnSpan="2" Content="Speichern" Command="{Binding SaveImpregnation}" />
+    </Grid>
+</UserControl>

DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DaSaSo.Wpf.View.Impregnation
+{
+    /// <summary>
+    /// Interaction logic for ImpregnationEditView.xaml
+    /// </summary>
+    public partial class ImpregnationEditView : UserControl
+    {
+        public ImpregnationEditView()
+        {
+            InitializeComponent();
+        }
+    }
+}

DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml

@@ -0,0 +1,23 @@
+<UserControl x:Class="DaSaSo.Wpf.View.Impregnation.ImpregnationListView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungListViewModel}"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    </UserControl.Resources>
+    <Grid>
+        <StackPanel>
+            <TextBlock Text="Imprägnierungen" />
+            <ListView ItemsSource="{Binding Impregnations}" DisplayMemberPath="Number" SelectedItem="{Binding SelectedImpregnation, Mode=TwoWay}" />
+            <Button Content="Editieren" Command="{Binding EditImpregnationCommand}" CommandParameter="{Binding SelectedImpregnation}" />
+            <Button Content="Neue Hinzufügen" Command="{Binding AddImpregnationCommand}" />
+        </StackPanel>
+        <Border Background="Gray" d:Visibility="Hidden" Visibility="{Binding IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <TextBlock Foreground="White" FontSize="40" Text="Loading" />
+        </Border>
+    </Grid>
+</UserControl>

DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DaSaSo.Wpf.View.Impregnation
+{
+    /// <summary>
+    /// Interaction logic for ImpregnationListView.xaml
+    /// </summary>
+    public partial class ImpregnationListView : UserControl
+    {
+        public ImpregnationListView()
+        {
+            InitializeComponent();
+        }
+    }
+}

DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml

@@ -31,16 +31,10 @@
                             <TextBlock Text="] Hausnummer [" />
                             <TextBlock Text="{Binding Hausnummer}" Foreground="Red" />
                             <TextBlock Text="] Haltung [" />
-                            <!--<TextBlock Text="[" />-->
                             <TextBlock Foreground="Blue" Text="{Binding ObjektName}" />
                             <TextBlock Text="] DN [" />
                             <TextBlock Text="{Binding DN}" Foreground="Blue" />
                             <TextBlock Text="]" />
-                            <!--
-                            <TextBlock Text="] Material [" />
-                            <TextBlock Text="{Binding Material}" Foreground="Blue" />
-                            <TextBlock Text="]" />
-                            -->
                         </StackPanel>
                     </DataTemplate>
                     <Style TargetType="{x:Type TreeViewItem}">

DaSaSo.Wpf/Window/MainWindow.xaml

@@ -8,6 +8,7 @@
         xmlns:BuildingsiteViews="clr-namespace:DaSaSo.Wpf.View.Buildingsites"
         xmlns:SewerObjectViews="clr-namespace:DaSaSo.Wpf.View.SewerObjecte"
         xmlns:SewerObjectView="clr-namespace:DaSaSo.Wpf.View.SewerObject"
+        xmlns:ImpregnationViews="clr-namespace:DaSaSo.Wpf.View.Impregnation"
         xmlns:controls="clr-namespace:DaSaSo.Wpf.Controls"
         xmlns:View="clr-namespace:DaSaSo.Wpf.View"
         xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
@@ -41,6 +42,12 @@
         <DataTemplate DataType="{x:Type viewmodel:SewerMainListViewModel}">
             <SewerObjectView:SewerMainView />
         </DataTemplate>
+        <DataTemplate DataType="{x:Type viewmodel:ImpregnierungListViewModel}">
+            <ImpregnationViews:ImpregnationListView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type viewmodel:ImpregnierungEditViewModel}">
+            <ImpregnationViews:ImpregnationEditView />
+        </DataTemplate>
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>