diff --git a/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj b/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj index 1c9d818..37797e2 100644 --- a/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj +++ b/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj @@ -9,6 +9,7 @@ + diff --git a/SewerStammGen.DAL/SewerStammGen.DAL.csproj b/SewerStammGen.DAL/SewerStammGen.DAL.csproj index 0828c77..90a0b83 100644 --- a/SewerStammGen.DAL/SewerStammGen.DAL.csproj +++ b/SewerStammGen.DAL/SewerStammGen.DAL.csproj @@ -11,6 +11,7 @@ + diff --git a/SewerStammGen.EntityFramework/Migrations/20230328071830_InitialCreate.Designer.cs b/SewerStammGen.EntityFramework/Migrations/20230328071830_InitialCreate.Designer.cs deleted file mode 100644 index aef6f66..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230328071830_InitialCreate.Designer.cs +++ /dev/null @@ -1,217 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SewerStammGen.EntityFramework; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - [DbContext(typeof(SewerStammGenDbContext))] - [Migration("20230328071830_InitialCreate")] - partial class InitialCreate - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.4") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Shared.Domain.Auftraggeber", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Ansprechpartner") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Ort") - .IsRequired() - .HasColumnType("text"); - - b.Property("Postleitzahl") - .IsRequired() - .HasColumnType("text"); - - b.Property("Strasse") - .IsRequired() - .HasColumnType("text"); - - b.Property("Telefonnummer") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Auftraggebers"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DN") - .HasColumnType("integer"); - - b.Property("EndSchachtId") - .HasColumnType("integer"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("Haltungslaenge") - .HasColumnType("numeric"); - - b.Property("Material") - .IsRequired() - .HasColumnType("text"); - - b.Property("Objektbezeichnung") - .IsRequired() - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("StartSchachtId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("EndSchachtId"); - - b.HasIndex("ProjektId"); - - b.HasIndex("StartSchachtId"); - - b.ToTable("Kanaele"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Erstelldatum") - .IsRequired() - .HasColumnType("text"); - - b.Property("ExportType") - .HasColumnType("integer"); - - b.Property("Kodierungssystem") - .HasColumnType("integer"); - - b.Property("Ort") - .IsRequired() - .HasColumnType("text"); - - b.Property("Projektname") - .IsRequired() - .HasColumnType("text"); - - b.Property("Strasse") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Projekte"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DeckelHoehe") - .HasColumnType("decimal(18,4)"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("HochWert") - .HasColumnType("decimal(18,4)"); - - b.Property("Objektbezeichnung") - .IsRequired() - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("RechtsWert") - .HasColumnType("decimal(18,4)"); - - b.Property("SohlHoehe") - .HasColumnType("decimal(18,4)"); - - b.HasKey("Id"); - - b.HasIndex("ProjektId"); - - b.ToTable("Schaechte"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.HasOne("Shared.Domain.Schacht", "EndSchacht") - .WithMany() - .HasForeignKey("EndSchachtId"); - - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Kanaele") - .HasForeignKey("ProjektId"); - - b.HasOne("Shared.Domain.Schacht", "StartSchacht") - .WithMany() - .HasForeignKey("StartSchachtId"); - - b.Navigation("EndSchacht"); - - b.Navigation("StartSchacht"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Schaechte") - .HasForeignKey("ProjektId"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Navigation("Kanaele"); - - b.Navigation("Schaechte"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230328071830_InitialCreate.cs b/SewerStammGen.EntityFramework/Migrations/20230328071830_InitialCreate.cs deleted file mode 100644 index f46e15d..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230328071830_InitialCreate.cs +++ /dev/null @@ -1,146 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - /// - public partial class InitialCreate : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Auftraggebers", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Name = table.Column(type: "text", nullable: false), - Strasse = table.Column(type: "text", nullable: false), - Ort = table.Column(type: "text", nullable: false), - Postleitzahl = table.Column(type: "text", nullable: false), - Ansprechpartner = table.Column(type: "text", nullable: false), - Telefonnummer = table.Column(type: "text", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Auftraggebers", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Projekte", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Projektname = table.Column(type: "text", nullable: false), - Erstelldatum = table.Column(type: "text", nullable: false), - Strasse = table.Column(type: "text", nullable: false), - Ort = table.Column(type: "text", nullable: false), - ExportType = table.Column(type: "integer", nullable: false), - Kodierungssystem = table.Column(type: "integer", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Projekte", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Schaechte", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Objektbezeichnung = table.Column(type: "text", nullable: false), - RechtsWert = table.Column(type: "numeric(18,4)", nullable: false), - HochWert = table.Column(type: "numeric(18,4)", nullable: false), - SohlHoehe = table.Column(type: "numeric(18,4)", nullable: false), - DeckelHoehe = table.Column(type: "numeric(18,4)", nullable: false), - Entwaesserung = table.Column(type: "integer", nullable: false), - ProjektId = table.Column(type: "integer", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Schaechte", x => x.Id); - table.ForeignKey( - name: "FK_Schaechte_Projekte_ProjektId", - column: x => x.ProjektId, - principalTable: "Projekte", - principalColumn: "Id"); - }); - - migrationBuilder.CreateTable( - name: "Kanaele", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - Objektbezeichnung = table.Column(type: "text", nullable: false), - StartSchachtId = table.Column(type: "integer", nullable: true), - EndSchachtId = table.Column(type: "integer", nullable: true), - DN = table.Column(type: "integer", nullable: false), - Material = table.Column(type: "text", nullable: false), - Haltungslaenge = table.Column(type: "numeric", nullable: false), - Entwaesserung = table.Column(type: "integer", nullable: false), - ProjektId = table.Column(type: "integer", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Kanaele", x => x.Id); - table.ForeignKey( - name: "FK_Kanaele_Projekte_ProjektId", - column: x => x.ProjektId, - principalTable: "Projekte", - principalColumn: "Id"); - table.ForeignKey( - name: "FK_Kanaele_Schaechte_EndSchachtId", - column: x => x.EndSchachtId, - principalTable: "Schaechte", - principalColumn: "Id"); - table.ForeignKey( - name: "FK_Kanaele_Schaechte_StartSchachtId", - column: x => x.StartSchachtId, - principalTable: "Schaechte", - principalColumn: "Id"); - }); - - migrationBuilder.CreateIndex( - name: "IX_Kanaele_EndSchachtId", - table: "Kanaele", - column: "EndSchachtId"); - - migrationBuilder.CreateIndex( - name: "IX_Kanaele_ProjektId", - table: "Kanaele", - column: "ProjektId"); - - migrationBuilder.CreateIndex( - name: "IX_Kanaele_StartSchachtId", - table: "Kanaele", - column: "StartSchachtId"); - - migrationBuilder.CreateIndex( - name: "IX_Schaechte_ProjektId", - table: "Schaechte", - column: "ProjektId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Auftraggebers"); - - migrationBuilder.DropTable( - name: "Kanaele"); - - migrationBuilder.DropTable( - name: "Schaechte"); - - migrationBuilder.DropTable( - name: "Projekte"); - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230329145638_AuftraggeberAddedToProject.Designer.cs b/SewerStammGen.EntityFramework/Migrations/20230329145638_AuftraggeberAddedToProject.Designer.cs deleted file mode 100644 index 2eddf78..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230329145638_AuftraggeberAddedToProject.Designer.cs +++ /dev/null @@ -1,233 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SewerStammGen.EntityFramework; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - [DbContext(typeof(SewerStammGenDbContext))] - [Migration("20230329145638_AuftraggeberAddedToProject")] - partial class AuftraggeberAddedToProject - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.4") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Shared.Domain.Auftraggeber", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Ansprechpartner") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Ort") - .IsRequired() - .HasColumnType("text"); - - b.Property("Postleitzahl") - .IsRequired() - .HasColumnType("text"); - - b.Property("Strasse") - .IsRequired() - .HasColumnType("text"); - - b.Property("Telefonnummer") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Auftraggebers"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DN") - .HasColumnType("integer"); - - b.Property("EndSchachtId") - .HasColumnType("integer"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("Haltungslaenge") - .HasColumnType("numeric"); - - b.Property("Material") - .IsRequired() - .HasColumnType("text"); - - b.Property("Objektbezeichnung") - .IsRequired() - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("StartSchachtId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("EndSchachtId"); - - b.HasIndex("ProjektId"); - - b.HasIndex("StartSchachtId"); - - b.ToTable("Kanaele"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("AuftraggeberId") - .HasColumnType("integer"); - - b.Property("Erstelldatum") - .IsRequired() - .HasColumnType("text"); - - b.Property("ExportType") - .HasColumnType("integer"); - - b.Property("Kodierungssystem") - .HasColumnType("integer"); - - b.Property("Ort") - .IsRequired() - .HasColumnType("text"); - - b.Property("Projektname") - .IsRequired() - .HasColumnType("text"); - - b.Property("Strasse") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("AuftraggeberId"); - - b.ToTable("Projekte"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DeckelHoehe") - .HasColumnType("decimal(18,4)"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("HochWert") - .HasColumnType("decimal(18,4)"); - - b.Property("Objektbezeichnung") - .IsRequired() - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("RechtsWert") - .HasColumnType("decimal(18,4)"); - - b.Property("SohlHoehe") - .HasColumnType("decimal(18,4)"); - - b.HasKey("Id"); - - b.HasIndex("ProjektId"); - - b.ToTable("Schaechte"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.HasOne("Shared.Domain.Schacht", "EndSchacht") - .WithMany() - .HasForeignKey("EndSchachtId"); - - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Kanaele") - .HasForeignKey("ProjektId"); - - b.HasOne("Shared.Domain.Schacht", "StartSchacht") - .WithMany() - .HasForeignKey("StartSchachtId"); - - b.Navigation("EndSchacht"); - - b.Navigation("StartSchacht"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.HasOne("Shared.Domain.Auftraggeber", "Auftraggeber") - .WithMany() - .HasForeignKey("AuftraggeberId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Auftraggeber"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Schaechte") - .HasForeignKey("ProjektId"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Navigation("Kanaele"); - - b.Navigation("Schaechte"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230329145638_AuftraggeberAddedToProject.cs b/SewerStammGen.EntityFramework/Migrations/20230329145638_AuftraggeberAddedToProject.cs deleted file mode 100644 index 685755b..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230329145638_AuftraggeberAddedToProject.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - /// - public partial class AuftraggeberAddedToProject : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "AuftraggeberId", - table: "Projekte", - type: "integer", - nullable: false, - defaultValue: 0); - - migrationBuilder.CreateIndex( - name: "IX_Projekte_AuftraggeberId", - table: "Projekte", - column: "AuftraggeberId"); - - migrationBuilder.AddForeignKey( - name: "FK_Projekte_Auftraggebers_AuftraggeberId", - table: "Projekte", - column: "AuftraggeberId", - principalTable: "Auftraggebers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Projekte_Auftraggebers_AuftraggeberId", - table: "Projekte"); - - migrationBuilder.DropIndex( - name: "IX_Projekte_AuftraggeberId", - table: "Projekte"); - - migrationBuilder.DropColumn( - name: "AuftraggeberId", - table: "Projekte"); - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230330100444_AddedNullValue.Designer.cs b/SewerStammGen.EntityFramework/Migrations/20230330100444_AddedNullValue.Designer.cs deleted file mode 100644 index ee19a3d..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230330100444_AddedNullValue.Designer.cs +++ /dev/null @@ -1,220 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SewerStammGen.EntityFramework; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - [DbContext(typeof(SewerStammGenDbContext))] - [Migration("20230330100444_AddedNullValue")] - partial class AddedNullValue - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.4") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Shared.Domain.Auftraggeber", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Ansprechpartner") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Ort") - .HasColumnType("text"); - - b.Property("Postleitzahl") - .HasColumnType("text"); - - b.Property("Strasse") - .HasColumnType("text"); - - b.Property("Telefonnummer") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Auftraggebers"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DN") - .HasColumnType("integer"); - - b.Property("EndSchachtId") - .HasColumnType("integer"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("Haltungslaenge") - .HasColumnType("numeric"); - - b.Property("Material") - .HasColumnType("text"); - - b.Property("Objektbezeichnung") - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("StartSchachtId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("EndSchachtId"); - - b.HasIndex("ProjektId"); - - b.HasIndex("StartSchachtId"); - - b.ToTable("Kanaele"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("AuftraggeberId") - .HasColumnType("integer"); - - b.Property("Erstelldatum") - .HasColumnType("text"); - - b.Property("ExportType") - .HasColumnType("integer"); - - b.Property("Kodierungssystem") - .HasColumnType("integer"); - - b.Property("Ort") - .HasColumnType("text"); - - b.Property("Projektname") - .HasColumnType("text"); - - b.Property("Strasse") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("AuftraggeberId"); - - b.ToTable("Projekte"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DeckelHoehe") - .HasColumnType("decimal(18,4)"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("HochWert") - .HasColumnType("decimal(18,4)"); - - b.Property("Objektbezeichnung") - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("RechtsWert") - .HasColumnType("decimal(18,4)"); - - b.Property("SohlHoehe") - .HasColumnType("decimal(18,4)"); - - b.HasKey("Id"); - - b.HasIndex("ProjektId"); - - b.ToTable("Schaechte"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.HasOne("Shared.Domain.Schacht", "EndSchacht") - .WithMany() - .HasForeignKey("EndSchachtId"); - - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Kanaele") - .HasForeignKey("ProjektId"); - - b.HasOne("Shared.Domain.Schacht", "StartSchacht") - .WithMany() - .HasForeignKey("StartSchachtId"); - - b.Navigation("EndSchacht"); - - b.Navigation("StartSchacht"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.HasOne("Shared.Domain.Auftraggeber", "Auftraggeber") - .WithMany() - .HasForeignKey("AuftraggeberId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Auftraggeber"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Schaechte") - .HasForeignKey("ProjektId"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Navigation("Kanaele"); - - b.Navigation("Schaechte"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230330100444_AddedNullValue.cs b/SewerStammGen.EntityFramework/Migrations/20230330100444_AddedNullValue.cs deleted file mode 100644 index bb1f0dd..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230330100444_AddedNullValue.cs +++ /dev/null @@ -1,252 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - /// - public partial class AddedNullValue : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "Objektbezeichnung", - table: "Schaechte", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Strasse", - table: "Projekte", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Projektname", - table: "Projekte", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Ort", - table: "Projekte", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Erstelldatum", - table: "Projekte", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Objektbezeichnung", - table: "Kanaele", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Material", - table: "Kanaele", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Telefonnummer", - table: "Auftraggebers", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Strasse", - table: "Auftraggebers", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Postleitzahl", - table: "Auftraggebers", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Ort", - table: "Auftraggebers", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Name", - table: "Auftraggebers", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - - migrationBuilder.AlterColumn( - name: "Ansprechpartner", - table: "Auftraggebers", - type: "text", - nullable: true, - oldClrType: typeof(string), - oldType: "text"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.AlterColumn( - name: "Objektbezeichnung", - table: "Schaechte", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Strasse", - table: "Projekte", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Projektname", - table: "Projekte", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Ort", - table: "Projekte", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Erstelldatum", - table: "Projekte", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Objektbezeichnung", - table: "Kanaele", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Material", - table: "Kanaele", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Telefonnummer", - table: "Auftraggebers", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Strasse", - table: "Auftraggebers", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Postleitzahl", - table: "Auftraggebers", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Ort", - table: "Auftraggebers", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Name", - table: "Auftraggebers", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - - migrationBuilder.AlterColumn( - name: "Ansprechpartner", - table: "Auftraggebers", - type: "text", - nullable: false, - defaultValue: "", - oldClrType: typeof(string), - oldType: "text", - oldNullable: true); - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230331095322_SchachtRefProject.Designer.cs b/SewerStammGen.EntityFramework/Migrations/20230331095322_SchachtRefProject.Designer.cs deleted file mode 100644 index abf2545..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230331095322_SchachtRefProject.Designer.cs +++ /dev/null @@ -1,222 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SewerStammGen.EntityFramework; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - [DbContext(typeof(SewerStammGenDbContext))] - [Migration("20230331095322_SchachtRefProject")] - partial class SchachtRefProject - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.4") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Shared.Domain.Auftraggeber", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Ansprechpartner") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Ort") - .HasColumnType("text"); - - b.Property("Postleitzahl") - .HasColumnType("text"); - - b.Property("Strasse") - .HasColumnType("text"); - - b.Property("Telefonnummer") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Auftraggebers"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DN") - .HasColumnType("integer"); - - b.Property("EndSchachtId") - .HasColumnType("integer"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("Haltungslaenge") - .HasColumnType("numeric"); - - b.Property("Material") - .HasColumnType("text"); - - b.Property("Objektbezeichnung") - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("StartSchachtId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("EndSchachtId"); - - b.HasIndex("ProjektId"); - - b.HasIndex("StartSchachtId"); - - b.ToTable("Kanaele"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("AuftraggeberId") - .HasColumnType("integer"); - - b.Property("Erstelldatum") - .HasColumnType("text"); - - b.Property("ExportType") - .HasColumnType("integer"); - - b.Property("Kodierungssystem") - .HasColumnType("integer"); - - b.Property("Ort") - .HasColumnType("text"); - - b.Property("Projektname") - .HasColumnType("text"); - - b.Property("Strasse") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("AuftraggeberId"); - - b.ToTable("Projekte"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DeckelHoehe") - .HasColumnType("decimal(18,4)"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("HochWert") - .HasColumnType("decimal(18,4)"); - - b.Property("Objektbezeichnung") - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("RechtsWert") - .HasColumnType("decimal(18,4)"); - - b.Property("SohlHoehe") - .HasColumnType("decimal(18,4)"); - - b.HasKey("Id"); - - b.HasIndex("ProjektId"); - - b.ToTable("Schaechte"); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.HasOne("Shared.Domain.Schacht", "EndSchacht") - .WithMany() - .HasForeignKey("EndSchachtId"); - - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Kanaele") - .HasForeignKey("ProjektId"); - - b.HasOne("Shared.Domain.Schacht", "StartSchacht") - .WithMany() - .HasForeignKey("StartSchachtId"); - - b.Navigation("EndSchacht"); - - b.Navigation("StartSchacht"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.HasOne("Shared.Domain.Auftraggeber", "Auftraggeber") - .WithMany() - .HasForeignKey("AuftraggeberId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Auftraggeber"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.HasOne("Shared.Domain.Projekt", "Projekt") - .WithMany("Schaechte") - .HasForeignKey("ProjektId"); - - b.Navigation("Projekt"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Navigation("Kanaele"); - - b.Navigation("Schaechte"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/20230331095322_SchachtRefProject.cs b/SewerStammGen.EntityFramework/Migrations/20230331095322_SchachtRefProject.cs deleted file mode 100644 index 1c358b0..0000000 --- a/SewerStammGen.EntityFramework/Migrations/20230331095322_SchachtRefProject.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - /// - public partial class SchachtRefProject : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - - } - } -} diff --git a/SewerStammGen.EntityFramework/Migrations/SewerStammGenDbContextModelSnapshot.cs b/SewerStammGen.EntityFramework/Migrations/SewerStammGenDbContextModelSnapshot.cs deleted file mode 100644 index 9d4342c..0000000 --- a/SewerStammGen.EntityFramework/Migrations/SewerStammGenDbContextModelSnapshot.cs +++ /dev/null @@ -1,219 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using SewerStammGen.EntityFramework; - -#nullable disable - -namespace SewerStammGen.EntityFramework.Migrations -{ - [DbContext(typeof(SewerStammGenDbContext))] - partial class SewerStammGenDbContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.4") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Shared.Domain.Auftraggeber", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Ansprechpartner") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Ort") - .HasColumnType("text"); - - b.Property("Postleitzahl") - .HasColumnType("text"); - - b.Property("Strasse") - .HasColumnType("text"); - - b.Property("Telefonnummer") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Auftraggebers", (string)null); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DN") - .HasColumnType("integer"); - - b.Property("EndSchachtId") - .HasColumnType("integer"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("Haltungslaenge") - .HasColumnType("numeric"); - - b.Property("Material") - .HasColumnType("text"); - - b.Property("Objektbezeichnung") - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("StartSchachtId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("EndSchachtId"); - - b.HasIndex("ProjektId"); - - b.HasIndex("StartSchachtId"); - - b.ToTable("Kanaele", (string)null); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("AuftraggeberId") - .HasColumnType("integer"); - - b.Property("Erstelldatum") - .HasColumnType("text"); - - b.Property("ExportType") - .HasColumnType("integer"); - - b.Property("Kodierungssystem") - .HasColumnType("integer"); - - b.Property("Ort") - .HasColumnType("text"); - - b.Property("Projektname") - .HasColumnType("text"); - - b.Property("Strasse") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("AuftraggeberId"); - - b.ToTable("Projekte", (string)null); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DeckelHoehe") - .HasColumnType("decimal(18,4)"); - - b.Property("Entwaesserung") - .HasColumnType("integer"); - - b.Property("HochWert") - .HasColumnType("decimal(18,4)"); - - b.Property("Objektbezeichnung") - .HasColumnType("text"); - - b.Property("ProjektId") - .HasColumnType("integer"); - - b.Property("RechtsWert") - .HasColumnType("decimal(18,4)"); - - b.Property("SohlHoehe") - .HasColumnType("decimal(18,4)"); - - b.HasKey("Id"); - - b.HasIndex("ProjektId"); - - b.ToTable("Schaechte", (string)null); - }); - - modelBuilder.Entity("Shared.Domain.Kanal", b => - { - b.HasOne("Shared.Domain.Schacht", "EndSchacht") - .WithMany() - .HasForeignKey("EndSchachtId"); - - b.HasOne("Shared.Domain.Projekt", null) - .WithMany("Kanaele") - .HasForeignKey("ProjektId"); - - b.HasOne("Shared.Domain.Schacht", "StartSchacht") - .WithMany() - .HasForeignKey("StartSchachtId"); - - b.Navigation("EndSchacht"); - - b.Navigation("StartSchacht"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.HasOne("Shared.Domain.Auftraggeber", "Auftraggeber") - .WithMany() - .HasForeignKey("AuftraggeberId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Auftraggeber"); - }); - - modelBuilder.Entity("Shared.Domain.Schacht", b => - { - b.HasOne("Shared.Domain.Projekt", "Projekt") - .WithMany("Schaechte") - .HasForeignKey("ProjektId"); - - b.Navigation("Projekt"); - }); - - modelBuilder.Entity("Shared.Domain.Projekt", b => - { - b.Navigation("Kanaele"); - - b.Navigation("Schaechte"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/SewerStammGen.EntityFramework/Services/Common/NonQueryDataService.cs b/SewerStammGen.EntityFramework/Services/Common/NonQueryDataService.cs deleted file mode 100644 index d8ccf6b..0000000 --- a/SewerStammGen.EntityFramework/Services/Common/NonQueryDataService.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.ChangeTracking; -using Shared.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.EntityFramework.Services.Common -{ - class NonQueryDataService where T: DBObject - { - private readonly SewerStammGenDbContextFactory _contextFactory; - - public NonQueryDataService(SewerStammGenDbContextFactory contextFactory) - { - _contextFactory = contextFactory; - } - public async Task Create(T entity) - { - using SewerStammGenDbContext context = _contextFactory.CreateDbContext(); - EntityEntry createdEntity = await context.Set().AddAsync(entity); - await context.SaveChangesAsync(); - return createdEntity.Entity; - } - - public T CreateNonAsync(T entity) - { - using SewerStammGenDbContext context = _contextFactory.CreateDbContext(); - EntityEntry createdEntity = context.Set().Add(entity); - context.SaveChanges(); - return createdEntity.Entity; - } - - public async Task Delete(int id) - { - using SewerStammGenDbContext context = _contextFactory.CreateDbContext(); - T? entity = await context.Set().FirstOrDefaultAsync((e) => e.Id == id); - if (entity == null) return false; - context.Set().Remove(entity); - await context.SaveChangesAsync(); - return true; - } - public async Task Update(int id, T entity) - { - using SewerStammGenDbContext context = _contextFactory.CreateDbContext(); - entity.Id = id; - - context.Set().Update(entity); - await context.SaveChangesAsync(); - return entity; - } - - } -} diff --git a/SewerStammGen.EntityFramework/Services/GenericDataService.cs b/SewerStammGen.EntityFramework/Services/GenericDataService.cs deleted file mode 100644 index 69752a3..0000000 --- a/SewerStammGen.EntityFramework/Services/GenericDataService.cs +++ /dev/null @@ -1,67 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using SewerStammGen.EntityFramework.Services.Common; -using Shared.Contracts; -using Shared.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.EntityFramework.Services -{ - public class GenericDataService : IDataService where T : DBObject - { - private readonly SewerStammGenDbContextFactory _contextFactory; - private readonly NonQueryDataService _nonQueryDataService; - - public GenericDataService(SewerStammGenDbContextFactory contextFactory) - { - _contextFactory = contextFactory; - _nonQueryDataService = new NonQueryDataService(contextFactory); - } - - public async Task Create(T entity) - { - return await _nonQueryDataService.Create(entity); - } - - public T CreateNonAsync(T entity) - { - return _nonQueryDataService.CreateNonAsync(entity); - } - - public async Task Delete(int id) - { - return await (_nonQueryDataService.Delete(id)); - } - - public async Task Get(int id) - { - using(SewerStammGenDbContext context = _contextFactory.CreateDbContext()) - { - T entity = await context.Set().FirstOrDefaultAsync((e) => e.Id == id); - return entity; - } - } - - public async Task> GetAll() - { - using (SewerStammGenDbContext context = _contextFactory.CreateDbContext()) - { - IEnumerable entities = await context.Set().ToListAsync(); - return entities; - } - } - - public async Task Update(int id, T entity) - { - return await _nonQueryDataService.Update(id, entity); - } - - T IDataService.CreateNonAsync(T entity) - { - return _nonQueryDataService.CreateNonAsync(entity); - } - } -} diff --git a/SewerStammGen.EntityFramework/Services/HaltungDataService.cs b/SewerStammGen.EntityFramework/Services/HaltungDataService.cs deleted file mode 100644 index c6fd5fd..0000000 --- a/SewerStammGen.EntityFramework/Services/HaltungDataService.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using SewerStammGen.EntityFramework.Services.Common; -using SewerStammGen.Shared.Contracts; -using Shared.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.EntityFramework.Services -{ - public class HaltungDataService : IHaltungDataService - { - private readonly SewerStammGenDbContextFactory _contextFactory; - private readonly NonQueryDataService _nonQueryDataService; - - public HaltungDataService(SewerStammGenDbContextFactory contextFactory) - { - _contextFactory = contextFactory; - _nonQueryDataService = new NonQueryDataService(contextFactory); - } - public async Task Create(Kanal entity) - { - return await _nonQueryDataService.Create(entity); - } - - public Kanal CreateNonAsync(Kanal entity) - { - throw new NotImplementedException(); - } - - public Task Delete(int id) - { - throw new NotImplementedException(); - } - - public async Task Get(int id) - { - using (SewerStammGenDbContext context = _contextFactory.CreateDbContext()) - { - Kanal entity = await context.Set() - .Include("StartSchacht") - .Include("EndSchacht") - .Include("Projekt") - .FirstOrDefaultAsync((e) => e.Id == id); - return entity; - } - } - - public async Task> GetAll(int projektID) - { - using (SewerStammGenDbContext context = _contextFactory.CreateDbContext()) - { - IEnumerable entities = await context.Set().Where(x => x.Projekt.Id.Equals(projektID)).ToListAsync(); - return entities; - } - } - - public Task> GetAll() - { - throw new NotImplementedException(); - } - - public async Task Update(int id, Kanal entity) - { - return await _nonQueryDataService.Update(id, entity); - } - } -} diff --git a/SewerStammGen.EntityFramework/Services/SchachtDataService.cs b/SewerStammGen.EntityFramework/Services/SchachtDataService.cs deleted file mode 100644 index 3388f73..0000000 --- a/SewerStammGen.EntityFramework/Services/SchachtDataService.cs +++ /dev/null @@ -1,72 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using SewerStammGen.EntityFramework.Services.Common; -using SewerStammGen.Shared.Contracts; -using Shared.Domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.EntityFramework.Services -{ - public class SchachtDataService : ISchachtDataService - { - private readonly SewerStammGenDbContextFactory _contextFactory; - private readonly NonQueryDataService _nonQueryDataService; - - public SchachtDataService(SewerStammGenDbContextFactory contextFactory) - { - _contextFactory = contextFactory; - _nonQueryDataService = new NonQueryDataService(contextFactory); - } - - public async Task Create(Schacht entity) - { - return await _nonQueryDataService.Create(entity); - } - - public Schacht CreateNonAsync(Schacht entity) - { - throw new NotImplementedException(); - } - - public Task Delete(int id) - { - throw new NotImplementedException(); - } - - public Task Get(int id) - { - throw new NotImplementedException(); - } - - public async Task> GetAll(int projektID) - { - using (SewerStammGenDbContext context = _contextFactory.CreateDbContext()) - { - IEnumerable entities = await context.Set().Where(x => x.Projekt.Id.Equals(projektID)).ToListAsync(); - return entities; - } - } - - public Task> GetAll() - { - throw new NotImplementedException(); - } - - public async Task GetSchachtByNameAndProjekt(string name, int projektID) - { - using(SewerStammGenDbContext context = _contextFactory.CreateDbContext()) - { - Schacht entity = await context.Set().Where(x => x.Projekt.Id.Equals(projektID) && x.Objektbezeichnung.Equals(name)).FirstOrDefaultAsync(); - return entity; - } - } - - public async Task Update(int id, Schacht entity) - { - return await _nonQueryDataService.Update(id, entity); - } - } -} diff --git a/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj b/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj deleted file mode 100644 index c12d619..0000000 --- a/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net7.0 - enable - enable - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - diff --git a/SewerStammGen.EntityFramework/SewerStammGenDbContext.cs b/SewerStammGen.EntityFramework/SewerStammGenDbContext.cs deleted file mode 100644 index 86bdb05..0000000 --- a/SewerStammGen.EntityFramework/SewerStammGenDbContext.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Shared.Domain; - -namespace SewerStammGen.EntityFramework -{ - public class SewerStammGenDbContext : DbContext - { - public SewerStammGenDbContext(DbContextOptions options) : base(options) { } - - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - base.OnModelCreating(modelBuilder); - } - - public DbSet? Schaechte { get; set; } - public DbSet? Projekte { get; set; } - public DbSet? Kanaele { get; set; } - public DbSet? Auftraggebers { get; set; } - } -} \ No newline at end of file diff --git a/SewerStammGen.EntityFramework/SewerStammGenDbContextFactory.cs b/SewerStammGen.EntityFramework/SewerStammGenDbContextFactory.cs deleted file mode 100644 index 0e3621e..0000000 --- a/SewerStammGen.EntityFramework/SewerStammGenDbContextFactory.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Design; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.EntityFramework -{ - public class SewerStammGenDbContextFactory : IDesignTimeDbContextFactory - { - private readonly Action _configureDbContext; - - public SewerStammGenDbContextFactory() { } - - public SewerStammGenDbContextFactory(Action configureDbContext) - { - _configureDbContext = configureDbContext; - } - - public SewerStammGenDbContext CreateDbContext() - { - DbContextOptionsBuilder? options = new(); - _configureDbContext( options ); - return new SewerStammGenDbContext(options.Options); - } - - public SewerStammGenDbContext CreateDbContext(string[] args) - { - var options = new DbContextOptionsBuilder(); - options.UseNpgsql("Host = localhost; Database = SewerGen; Username = SewerGen; Password = SewerGen"); - SewerStammGenDbContext result = new(options.Options); - return result; - } - } -} diff --git a/Shared/Contracts/IAuftraggeberDataService.cs b/SewerStammGen.Shared/Contracts/IAuftraggeberDataService.cs similarity index 100% rename from Shared/Contracts/IAuftraggeberDataService.cs rename to SewerStammGen.Shared/Contracts/IAuftraggeberDataService.cs diff --git a/Shared/Contracts/IDataService.cs b/SewerStammGen.Shared/Contracts/IDataService.cs similarity index 100% rename from Shared/Contracts/IDataService.cs rename to SewerStammGen.Shared/Contracts/IDataService.cs diff --git a/Shared/Contracts/IExport.cs b/SewerStammGen.Shared/Contracts/IExport.cs similarity index 100% rename from Shared/Contracts/IExport.cs rename to SewerStammGen.Shared/Contracts/IExport.cs diff --git a/Shared/Contracts/IImport.cs b/SewerStammGen.Shared/Contracts/IImport.cs similarity index 100% rename from Shared/Contracts/IImport.cs rename to SewerStammGen.Shared/Contracts/IImport.cs diff --git a/Shared/Contracts/IProjektDataService.cs b/SewerStammGen.Shared/Contracts/IProjektDataService.cs similarity index 100% rename from Shared/Contracts/IProjektDataService.cs rename to SewerStammGen.Shared/Contracts/IProjektDataService.cs diff --git a/Shared/Contracts/ISchachtDataService.cs b/SewerStammGen.Shared/Contracts/ISchachtDataService.cs similarity index 100% rename from Shared/Contracts/ISchachtDataService.cs rename to SewerStammGen.Shared/Contracts/ISchachtDataService.cs diff --git a/Shared/Domain/Auftraggeber.cs b/SewerStammGen.Shared/Domain/Auftraggeber.cs similarity index 100% rename from Shared/Domain/Auftraggeber.cs rename to SewerStammGen.Shared/Domain/Auftraggeber.cs diff --git a/Shared/Domain/DBObject.cs b/SewerStammGen.Shared/Domain/DBObject.cs similarity index 100% rename from Shared/Domain/DBObject.cs rename to SewerStammGen.Shared/Domain/DBObject.cs diff --git a/Shared/Domain/Kanal.cs b/SewerStammGen.Shared/Domain/Kanal.cs similarity index 100% rename from Shared/Domain/Kanal.cs rename to SewerStammGen.Shared/Domain/Kanal.cs diff --git a/Shared/Domain/Projekt.cs b/SewerStammGen.Shared/Domain/Projekt.cs similarity index 100% rename from Shared/Domain/Projekt.cs rename to SewerStammGen.Shared/Domain/Projekt.cs diff --git a/Shared/Domain/Schacht.cs b/SewerStammGen.Shared/Domain/Schacht.cs similarity index 100% rename from Shared/Domain/Schacht.cs rename to SewerStammGen.Shared/Domain/Schacht.cs diff --git a/Shared/Enum/EExportType.cs b/SewerStammGen.Shared/Enum/EExportType.cs similarity index 100% rename from Shared/Enum/EExportType.cs rename to SewerStammGen.Shared/Enum/EExportType.cs diff --git a/Shared/Enum/EKodierungssystem.cs b/SewerStammGen.Shared/Enum/EKodierungssystem.cs similarity index 100% rename from Shared/Enum/EKodierungssystem.cs rename to SewerStammGen.Shared/Enum/EKodierungssystem.cs diff --git a/Shared/SewerStammGen.Shared.csproj b/SewerStammGen.Shared/SewerStammGen.Shared.csproj similarity index 66% rename from Shared/SewerStammGen.Shared.csproj rename to SewerStammGen.Shared/SewerStammGen.Shared.csproj index 87d31f0..10599db 100644 --- a/Shared/SewerStammGen.Shared.csproj +++ b/SewerStammGen.Shared/SewerStammGen.Shared.csproj @@ -7,7 +7,9 @@ - + + + diff --git a/SewerStammGen/App.xaml b/SewerStammGen.WPF/App.xaml similarity index 100% rename from SewerStammGen/App.xaml rename to SewerStammGen.WPF/App.xaml diff --git a/SewerStammGen/App.xaml.cs b/SewerStammGen.WPF/App.xaml.cs similarity index 100% rename from SewerStammGen/App.xaml.cs rename to SewerStammGen.WPF/App.xaml.cs diff --git a/SewerStammGen/AssemblyInfo.cs b/SewerStammGen.WPF/AssemblyInfo.cs similarity index 100% rename from SewerStammGen/AssemblyInfo.cs rename to SewerStammGen.WPF/AssemblyInfo.cs diff --git a/SewerStammGen/Commands/AsyncCommandBase.cs b/SewerStammGen.WPF/Commands/AsyncCommandBase.cs similarity index 100% rename from SewerStammGen/Commands/AsyncCommandBase.cs rename to SewerStammGen.WPF/Commands/AsyncCommandBase.cs diff --git a/SewerStammGen/Commands/HaltungAddCommand.cs b/SewerStammGen.WPF/Commands/HaltungAddCommand.cs similarity index 100% rename from SewerStammGen/Commands/HaltungAddCommand.cs rename to SewerStammGen.WPF/Commands/HaltungAddCommand.cs diff --git a/SewerStammGen/Commands/HaltungEditCommand.cs b/SewerStammGen.WPF/Commands/HaltungEditCommand.cs similarity index 100% rename from SewerStammGen/Commands/HaltungEditCommand.cs rename to SewerStammGen.WPF/Commands/HaltungEditCommand.cs diff --git a/SewerStammGen/Commands/HaltungEditSaveCommand.cs b/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs similarity index 100% rename from SewerStammGen/Commands/HaltungEditSaveCommand.cs rename to SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs diff --git a/SewerStammGen/Commands/ProjektAddCommand.cs b/SewerStammGen.WPF/Commands/ProjektAddCommand.cs similarity index 100% rename from SewerStammGen/Commands/ProjektAddCommand.cs rename to SewerStammGen.WPF/Commands/ProjektAddCommand.cs diff --git a/SewerStammGen/Commands/ProjektEditCommand.cs b/SewerStammGen.WPF/Commands/ProjektEditCommand.cs similarity index 100% rename from SewerStammGen/Commands/ProjektEditCommand.cs rename to SewerStammGen.WPF/Commands/ProjektEditCommand.cs diff --git a/SewerStammGen/Commands/ProjektSelectCommand.cs b/SewerStammGen.WPF/Commands/ProjektSelectCommand.cs similarity index 100% rename from SewerStammGen/Commands/ProjektSelectCommand.cs rename to SewerStammGen.WPF/Commands/ProjektSelectCommand.cs diff --git a/SewerStammGen/Commands/SchachtAddCommand.cs b/SewerStammGen.WPF/Commands/SchachtAddCommand.cs similarity index 100% rename from SewerStammGen/Commands/SchachtAddCommand.cs rename to SewerStammGen.WPF/Commands/SchachtAddCommand.cs diff --git a/SewerStammGen/Commands/SchachtDeleteCommand.cs b/SewerStammGen.WPF/Commands/SchachtDeleteCommand.cs similarity index 100% rename from SewerStammGen/Commands/SchachtDeleteCommand.cs rename to SewerStammGen.WPF/Commands/SchachtDeleteCommand.cs diff --git a/SewerStammGen/Commands/SchachtEditCommand.cs b/SewerStammGen.WPF/Commands/SchachtEditCommand.cs similarity index 100% rename from SewerStammGen/Commands/SchachtEditCommand.cs rename to SewerStammGen.WPF/Commands/SchachtEditCommand.cs diff --git a/SewerStammGen/Commands/UpdateCurrentViewModelCommand.cs b/SewerStammGen.WPF/Commands/UpdateCurrentViewModelCommand.cs similarity index 100% rename from SewerStammGen/Commands/UpdateCurrentViewModelCommand.cs rename to SewerStammGen.WPF/Commands/UpdateCurrentViewModelCommand.cs diff --git a/SewerStammGen/Enum/EMainWindowViewType.cs b/SewerStammGen.WPF/Enum/EMainWindowViewType.cs similarity index 100% rename from SewerStammGen/Enum/EMainWindowViewType.cs rename to SewerStammGen.WPF/Enum/EMainWindowViewType.cs diff --git a/SewerStammGen/HostBuilders/AddConfigurationHostBuilderExtensions.cs b/SewerStammGen.WPF/HostBuilders/AddConfigurationHostBuilderExtensions.cs similarity index 100% rename from SewerStammGen/HostBuilders/AddConfigurationHostBuilderExtensions.cs rename to SewerStammGen.WPF/HostBuilders/AddConfigurationHostBuilderExtensions.cs diff --git a/SewerStammGen/HostBuilders/AddDBContextHostBuilderExtensions.cs b/SewerStammGen.WPF/HostBuilders/AddDBContextHostBuilderExtensions.cs similarity index 100% rename from SewerStammGen/HostBuilders/AddDBContextHostBuilderExtensions.cs rename to SewerStammGen.WPF/HostBuilders/AddDBContextHostBuilderExtensions.cs diff --git a/SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs b/SewerStammGen.WPF/HostBuilders/AddServicesHostBuilderExtensions.cs similarity index 100% rename from SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs rename to SewerStammGen.WPF/HostBuilders/AddServicesHostBuilderExtensions.cs diff --git a/SewerStammGen/HostBuilders/AddStoresHostBuilderExtensions.cs b/SewerStammGen.WPF/HostBuilders/AddStoresHostBuilderExtensions.cs similarity index 100% rename from SewerStammGen/HostBuilders/AddStoresHostBuilderExtensions.cs rename to SewerStammGen.WPF/HostBuilders/AddStoresHostBuilderExtensions.cs diff --git a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/SewerStammGen.WPF/HostBuilders/AddViewModelsHostBuilderExtensions.cs similarity index 100% rename from SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs rename to SewerStammGen.WPF/HostBuilders/AddViewModelsHostBuilderExtensions.cs diff --git a/SewerStammGen/Interface/IViewModelAbstractFactory.cs b/SewerStammGen.WPF/Interface/IViewModelAbstractFactory.cs similarity index 100% rename from SewerStammGen/Interface/IViewModelAbstractFactory.cs rename to SewerStammGen.WPF/Interface/IViewModelAbstractFactory.cs diff --git a/SewerStammGen/Interface/Navigator/IMainWindowNavigator.cs b/SewerStammGen.WPF/Interface/Navigator/IMainWindowNavigator.cs similarity index 100% rename from SewerStammGen/Interface/Navigator/IMainWindowNavigator.cs rename to SewerStammGen.WPF/Interface/Navigator/IMainWindowNavigator.cs diff --git a/SewerStammGen/Interface/Navigator/INavigator.cs b/SewerStammGen.WPF/Interface/Navigator/INavigator.cs similarity index 100% rename from SewerStammGen/Interface/Navigator/INavigator.cs rename to SewerStammGen.WPF/Interface/Navigator/INavigator.cs diff --git a/SewerStammGen/Interface/Navigator/IRenavigator.cs b/SewerStammGen.WPF/Interface/Navigator/IRenavigator.cs similarity index 100% rename from SewerStammGen/Interface/Navigator/IRenavigator.cs rename to SewerStammGen.WPF/Interface/Navigator/IRenavigator.cs diff --git a/SewerStammGen/MainWindow.xaml b/SewerStammGen.WPF/MainWindow.xaml similarity index 100% rename from SewerStammGen/MainWindow.xaml rename to SewerStammGen.WPF/MainWindow.xaml diff --git a/SewerStammGen/MainWindow.xaml.cs b/SewerStammGen.WPF/MainWindow.xaml.cs similarity index 100% rename from SewerStammGen/MainWindow.xaml.cs rename to SewerStammGen.WPF/MainWindow.xaml.cs diff --git a/SewerStammGen/SewerStammGen.WPF.csproj b/SewerStammGen.WPF/SewerStammGen.WPF.csproj similarity index 92% rename from SewerStammGen/SewerStammGen.WPF.csproj rename to SewerStammGen.WPF/SewerStammGen.WPF.csproj index 6259f6b..b233da8 100644 --- a/SewerStammGen/SewerStammGen.WPF.csproj +++ b/SewerStammGen.WPF/SewerStammGen.WPF.csproj @@ -20,7 +20,7 @@ - + diff --git a/SewerStammGen/SewerStammGen.WPF.csproj.user b/SewerStammGen.WPF/SewerStammGen.WPF.csproj.user similarity index 100% rename from SewerStammGen/SewerStammGen.WPF.csproj.user rename to SewerStammGen.WPF/SewerStammGen.WPF.csproj.user diff --git a/SewerStammGen/ViewModel/BaseViewModel.cs b/SewerStammGen.WPF/ViewModel/BaseViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/BaseViewModel.cs rename to SewerStammGen.WPF/ViewModel/BaseViewModel.cs diff --git a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs b/SewerStammGen.WPF/ViewModel/Factories/MainWindowViewModelFactory.cs similarity index 100% rename from SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs rename to SewerStammGen.WPF/ViewModel/Factories/MainWindowViewModelFactory.cs diff --git a/SewerStammGen/ViewModel/Haltung/HaltungEditViewModel.cs b/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/Haltung/HaltungEditViewModel.cs rename to SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs diff --git a/SewerStammGen/ViewModel/Haltung/HaltungListViewModel.cs b/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/Haltung/HaltungListViewModel.cs rename to SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs diff --git a/SewerStammGen/ViewModel/Haltung/TextBoxFilterAction.cs b/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs similarity index 100% rename from SewerStammGen/ViewModel/Haltung/TextBoxFilterAction.cs rename to SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs diff --git a/SewerStammGen/ViewModel/HomeViewModel.cs b/SewerStammGen.WPF/ViewModel/HomeViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/HomeViewModel.cs rename to SewerStammGen.WPF/ViewModel/HomeViewModel.cs diff --git a/SewerStammGen/ViewModel/MainWindowViewModel.cs b/SewerStammGen.WPF/ViewModel/MainWindowViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/MainWindowViewModel.cs rename to SewerStammGen.WPF/ViewModel/MainWindowViewModel.cs diff --git a/SewerStammGen/ViewModel/ObservableObject.cs b/SewerStammGen.WPF/ViewModel/ObservableObject.cs similarity index 100% rename from SewerStammGen/ViewModel/ObservableObject.cs rename to SewerStammGen.WPF/ViewModel/ObservableObject.cs diff --git a/SewerStammGen/ViewModel/Projekt/ProjektEditViewModel.cs b/SewerStammGen.WPF/ViewModel/Projekt/ProjektEditViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/Projekt/ProjektEditViewModel.cs rename to SewerStammGen.WPF/ViewModel/Projekt/ProjektEditViewModel.cs diff --git a/SewerStammGen/ViewModel/Projekt/ProjektListViewModel.cs b/SewerStammGen.WPF/ViewModel/Projekt/ProjektListViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/Projekt/ProjektListViewModel.cs rename to SewerStammGen.WPF/ViewModel/Projekt/ProjektListViewModel.cs diff --git a/SewerStammGen/ViewModel/RelayCommand.cs b/SewerStammGen.WPF/ViewModel/RelayCommand.cs similarity index 100% rename from SewerStammGen/ViewModel/RelayCommand.cs rename to SewerStammGen.WPF/ViewModel/RelayCommand.cs diff --git a/SewerStammGen/ViewModel/Schacht/ManholeEditViewModel.cs b/SewerStammGen.WPF/ViewModel/Schacht/ManholeEditViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/Schacht/ManholeEditViewModel.cs rename to SewerStammGen.WPF/ViewModel/Schacht/ManholeEditViewModel.cs diff --git a/SewerStammGen/ViewModel/Schacht/ManholeListViewModel.cs b/SewerStammGen.WPF/ViewModel/Schacht/ManholeListViewModel.cs similarity index 100% rename from SewerStammGen/ViewModel/Schacht/ManholeListViewModel.cs rename to SewerStammGen.WPF/ViewModel/Schacht/ManholeListViewModel.cs diff --git a/SewerStammGen/ViewModel/State/ActualState.cs b/SewerStammGen.WPF/ViewModel/State/ActualState.cs similarity index 100% rename from SewerStammGen/ViewModel/State/ActualState.cs rename to SewerStammGen.WPF/ViewModel/State/ActualState.cs diff --git a/SewerStammGen/ViewModel/State/IActualState.cs b/SewerStammGen.WPF/ViewModel/State/IActualState.cs similarity index 100% rename from SewerStammGen/ViewModel/State/IActualState.cs rename to SewerStammGen.WPF/ViewModel/State/IActualState.cs diff --git a/SewerStammGen/ViewModel/State/Navigation/MainWindowNavigator.cs b/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs similarity index 100% rename from SewerStammGen/ViewModel/State/Navigation/MainWindowNavigator.cs rename to SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs diff --git a/SewerStammGen/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs b/SewerStammGen.WPF/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs similarity index 100% rename from SewerStammGen/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs rename to SewerStammGen.WPF/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml b/SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml similarity index 100% rename from SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml rename to SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml.cs b/SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml.cs similarity index 100% rename from SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml.cs rename to SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml.cs diff --git a/SewerStammGen/Views/Converters/EqualValueToParameterConverter.cs b/SewerStammGen.WPF/Views/Converters/EqualValueToParameterConverter.cs similarity index 100% rename from SewerStammGen/Views/Converters/EqualValueToParameterConverter.cs rename to SewerStammGen.WPF/Views/Converters/EqualValueToParameterConverter.cs diff --git a/SewerStammGen/Views/Haltung/HaltungEditView.xaml b/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml similarity index 100% rename from SewerStammGen/Views/Haltung/HaltungEditView.xaml rename to SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml diff --git a/SewerStammGen/Views/Haltung/HaltungEditView.xaml.cs b/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml.cs similarity index 100% rename from SewerStammGen/Views/Haltung/HaltungEditView.xaml.cs rename to SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml.cs diff --git a/SewerStammGen/Views/Haltung/HaltungListView.xaml b/SewerStammGen.WPF/Views/Haltung/HaltungListView.xaml similarity index 100% rename from SewerStammGen/Views/Haltung/HaltungListView.xaml rename to SewerStammGen.WPF/Views/Haltung/HaltungListView.xaml diff --git a/SewerStammGen/Views/Haltung/HaltungListView.xaml.cs b/SewerStammGen.WPF/Views/Haltung/HaltungListView.xaml.cs similarity index 100% rename from SewerStammGen/Views/Haltung/HaltungListView.xaml.cs rename to SewerStammGen.WPF/Views/Haltung/HaltungListView.xaml.cs diff --git a/SewerStammGen/Views/HomeView.xaml b/SewerStammGen.WPF/Views/HomeView.xaml similarity index 100% rename from SewerStammGen/Views/HomeView.xaml rename to SewerStammGen.WPF/Views/HomeView.xaml diff --git a/SewerStammGen/Views/HomeView.xaml.cs b/SewerStammGen.WPF/Views/HomeView.xaml.cs similarity index 100% rename from SewerStammGen/Views/HomeView.xaml.cs rename to SewerStammGen.WPF/Views/HomeView.xaml.cs diff --git a/SewerStammGen/Views/Projekt/ProjektEditView.xaml b/SewerStammGen.WPF/Views/Projekt/ProjektEditView.xaml similarity index 100% rename from SewerStammGen/Views/Projekt/ProjektEditView.xaml rename to SewerStammGen.WPF/Views/Projekt/ProjektEditView.xaml diff --git a/SewerStammGen/Views/Projekt/ProjektEditView.xaml.cs b/SewerStammGen.WPF/Views/Projekt/ProjektEditView.xaml.cs similarity index 100% rename from SewerStammGen/Views/Projekt/ProjektEditView.xaml.cs rename to SewerStammGen.WPF/Views/Projekt/ProjektEditView.xaml.cs diff --git a/SewerStammGen/Views/Projekt/ProjektListView.xaml b/SewerStammGen.WPF/Views/Projekt/ProjektListView.xaml similarity index 100% rename from SewerStammGen/Views/Projekt/ProjektListView.xaml rename to SewerStammGen.WPF/Views/Projekt/ProjektListView.xaml diff --git a/SewerStammGen/Views/Projekt/ProjektListView.xaml.cs b/SewerStammGen.WPF/Views/Projekt/ProjektListView.xaml.cs similarity index 100% rename from SewerStammGen/Views/Projekt/ProjektListView.xaml.cs rename to SewerStammGen.WPF/Views/Projekt/ProjektListView.xaml.cs diff --git a/SewerStammGen/Views/Schacht/SchachtEditView.xaml b/SewerStammGen.WPF/Views/Schacht/SchachtEditView.xaml similarity index 100% rename from SewerStammGen/Views/Schacht/SchachtEditView.xaml rename to SewerStammGen.WPF/Views/Schacht/SchachtEditView.xaml diff --git a/SewerStammGen/Views/Schacht/SchachtEditView.xaml.cs b/SewerStammGen.WPF/Views/Schacht/SchachtEditView.xaml.cs similarity index 100% rename from SewerStammGen/Views/Schacht/SchachtEditView.xaml.cs rename to SewerStammGen.WPF/Views/Schacht/SchachtEditView.xaml.cs diff --git a/SewerStammGen/Views/Schacht/SchachtListView.xaml b/SewerStammGen.WPF/Views/Schacht/SchachtListView.xaml similarity index 100% rename from SewerStammGen/Views/Schacht/SchachtListView.xaml rename to SewerStammGen.WPF/Views/Schacht/SchachtListView.xaml diff --git a/SewerStammGen/Views/Schacht/SchachtListView.xaml.cs b/SewerStammGen.WPF/Views/Schacht/SchachtListView.xaml.cs similarity index 100% rename from SewerStammGen/Views/Schacht/SchachtListView.xaml.cs rename to SewerStammGen.WPF/Views/Schacht/SchachtListView.xaml.cs diff --git a/SewerStammGen/Views/UCNormXML.xaml b/SewerStammGen.WPF/Views/UCNormXML.xaml similarity index 100% rename from SewerStammGen/Views/UCNormXML.xaml rename to SewerStammGen.WPF/Views/UCNormXML.xaml diff --git a/SewerStammGen/Views/UCNormXML.xaml.cs b/SewerStammGen.WPF/Views/UCNormXML.xaml.cs similarity index 100% rename from SewerStammGen/Views/UCNormXML.xaml.cs rename to SewerStammGen.WPF/Views/UCNormXML.xaml.cs diff --git a/SewerStammGen/Views/styles/my_controls.xaml b/SewerStammGen.WPF/Views/styles/my_controls.xaml similarity index 100% rename from SewerStammGen/Views/styles/my_controls.xaml rename to SewerStammGen.WPF/Views/styles/my_controls.xaml diff --git a/SewerStammGen/appsettings.json b/SewerStammGen.WPF/appsettings.json similarity index 100% rename from SewerStammGen/appsettings.json rename to SewerStammGen.WPF/appsettings.json diff --git a/Stammdatengenerator.sln b/Stammdatengenerator.sln index 4b1a21c..15919f4 100644 --- a/Stammdatengenerator.sln +++ b/Stammdatengenerator.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.5.33502.453 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.WPF", "SewerStammGen\SewerStammGen.WPF.csproj", "{7052AE7B-9E3C-4C04-9756-7488D21512C1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.WPF", "SewerStammGen.WPF\SewerStammGen.WPF.csproj", "{7052AE7B-9E3C-4C04-9756-7488D21512C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.Shared", "Shared\SewerStammGen.Shared.csproj", "{3A47BD31-36C2-45C4-9609-D0D9D92A993B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.Shared", "SewerStammGen.Shared\SewerStammGen.Shared.csproj", "{3A47BD31-36C2-45C4-9609-D0D9D92A993B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SewerStammGen.DAL", "SewerStammGen.DAL\SewerStammGen.DAL.csproj", "{7D983D7C-84C2-4FD8-B2CE-B13529036CB5}" EndProject