Husky/DaSaSo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Model geupdated

Browse Source
This commit is contained in:
HuskyTeufel
2021-10-06 19:52:32 +02:00
parent b48c012c18
commit cae9f38227
21 changed files with 1104 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DaSaSo.Domain/DesignModel/SewerObjectsToStreet.cs
View File

@@ -11,6 +11,7 @@ namespace DaSaSo.Domain.DesignModel
{
public string Streetname { get; set; }
public string CountryName { get; set; }
public bool IsSelected { get; set; }
public IEnumerable<SewerObject> SewerObjects { get; set; }
}

7
DaSaSo.Domain/Model/SewerDamage.cs
View File

@@ -23,13 +23,16 @@
CleanedHD = 1,
CleanedMechanisch = 2,
CleanedRoboter = 4,
FaekalienFrei = 8
FaekalienFrei = 8,
WaterBaried = 16,
PermitNeeded = 32,
STVO = 64
}
public class SewerDamage : DomainObject
{
public SewerObject SewerObject { get; set; }
public decimal Distance { get; set; }
public EDamageType DamageType { get; set; }
public EPreparationType PreparationType { get; set; }
}
}

4
DaSaSo.Domain/Model/SewerObject.cs
View File

@@ -7,7 +7,9 @@ namespace DaSaSo.Domain.Model
public class SewerObject : DomainObject
{
public Buildingsite BuildingSite { get; set; }
public string SanNummer { get; set; }
public string StreetName { get; set; }
public string Hausnummer { get; set; }
public string ObjektName { get; set; }
public SewerPoint PunktOben { get; set; }
public EPointType PunktObenType { get; set; }
@@ -28,6 +30,8 @@ namespace DaSaSo.Domain.Model
[NotMapped]
public bool IsSelected { get; set; }
[NotMapped]
public bool IsChanged { get; set; } = false;
}
}

8
DaSaSo.Domain/Model/SewerRehabilation.cs
View File

@@ -13,12 +13,6 @@ namespace DaSaSo.Domain.Model
public decimal TemperatureOutdoors { get; set; }
public decimal TemperatureSewer { get; set; }
public string Weather { get; set; }
public bool CleanedHD { get; set; }
public bool CleanedMechanisch { get; set; }
public bool CleanedRoborter { get; set; }
public bool WaterBaried { get; set; }
public bool PermitNeeded { get; set; }
public bool STVO { get; set; }
public EPreparationType PreparationType { get; set; }
}
}

397
DaSaSo.EntityFramework/Migrations/20211005060234_DeletedPrepartionFromDamage.Designer.cs generated Normal file
View File

@@ -0,0 +1,397 @@
// <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("20211005060234_DeletedPrepartionFromDamage")]
partial class DeletedPrepartionFromDamage
{
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<string>("ContactPerson")
.HasColumnType("text");
b.Property<string>("Country")
.HasColumnType("text");
b.Property<int?>("ProjectId")
.HasColumnType("integer");
b.HasKey("Id");
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<DateTime>("Date")
.HasColumnType("timestamp with time zone");
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<DateTime>("Date")
.HasColumnType("timestamp with time zone");
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>("PermitNeeded")
.HasColumnType("boolean");
b.Property<bool>("Preliner")
.HasColumnType("boolean");
b.Property<int>("PreparationType")
.HasColumnType("integer");
b.Property<bool>("STVO")
.HasColumnType("boolean");
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<bool>("WaterBaried")
.HasColumnType("boolean");
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<int?>("ClientId")
.HasColumnType("integer");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("Projektnummer")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("ClientId");
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>("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<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.Project", "Project")
.WithMany("BuildingSites")
.HasForeignKey("ProjectId");
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.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")
.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.Client", b =>
{
b.Navigation("Projects");
});
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
}
}
}

70
DaSaSo.EntityFramework/Migrations/20211005060234_DeletedPrepartionFromDamage.cs Normal file
View File

@@ -0,0 +1,70 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DaSaSo.EntityFramework.Migrations
{
public partial class DeletedPrepartionFromDamage : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PreparationType",
table: "SewerDamages");
migrationBuilder.DropColumn(
name: "CleanedHD",
table: "PipeLiners");
migrationBuilder.DropColumn(
name: "CleanedMechanisch",
table: "PipeLiners");
migrationBuilder.DropColumn(
name: "CleanedRoborter",
table: "PipeLiners");
migrationBuilder.AddColumn<int>(
name: "PreparationType",
table: "PipeLiners",
type: "integer",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PreparationType",
table: "PipeLiners");
migrationBuilder.AddColumn<int>(
name: "PreparationType",
table: "SewerDamages",
type: "integer",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<bool>(
name: "CleanedHD",
table: "PipeLiners",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "CleanedMechanisch",
table: "PipeLiners",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "CleanedRoborter",
table: "PipeLiners",
type: "boolean",
nullable: false,
defaultValue: false);
}
}
}

394
DaSaSo.EntityFramework/Migrations/20211005082652_AddHousenumbers.Designer.cs generated Normal file
View File

@@ -0,0 +1,394 @@
// <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("20211005082652_AddHousenumbers")]
partial class AddHousenumbers
{
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<string>("ContactPerson")
.HasColumnType("text");
b.Property<string>("Country")
.HasColumnType("text");
b.Property<int?>("ProjectId")
.HasColumnType("integer");
b.HasKey("Id");
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<DateTime>("Date")
.HasColumnType("timestamp with time zone");
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<DateTime>("Date")
.HasColumnType("timestamp with time zone");
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<int?>("ClientId")
.HasColumnType("integer");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("Projektnummer")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("ClientId");
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.Project", "Project")
.WithMany("BuildingSites")
.HasForeignKey("ProjectId");
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.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")
.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.Client", b =>
{
b.Navigation("Projects");
});
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
}
}
}

68
DaSaSo.EntityFramework/Migrations/20211005082652_AddHousenumbers.cs Normal file
View File

@@ -0,0 +1,68 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DaSaSo.EntityFramework.Migrations
{
public partial class AddHousenumbers : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PermitNeeded",
table: "PipeLiners");
migrationBuilder.DropColumn(
name: "STVO",
table: "PipeLiners");
migrationBuilder.DropColumn(
name: "WaterBaried",
table: "PipeLiners");
migrationBuilder.AddColumn<string>(
name: "Hausnummer",
table: "SewerObjects",
type: "text",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "SanNummer",
table: "SewerObjects",
type: "text",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Hausnummer",
table: "SewerObjects");
migrationBuilder.DropColumn(
name: "SanNummer",
table: "SewerObjects");
migrationBuilder.AddColumn<bool>(
name: "PermitNeeded",
table: "PipeLiners",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "STVO",
table: "PipeLiners",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "WaterBaried",
table: "PipeLiners",
type: "boolean",
nullable: false,
defaultValue: false);
}
}
}

28
DaSaSo.EntityFramework/Migrations/DaSaSoDbContextModelSnapshot.cs
View File

@@ -119,15 +119,6 @@ namespace DaSaSo.EntityFramework.Migrations
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<bool>("CleanedHD")
.HasColumnType("boolean");
b.Property<bool>("CleanedMechanisch")
.HasColumnType("boolean");
b.Property<bool>("CleanedRoborter")
.HasColumnType("boolean");
b.Property<bool>("ClosedEnd")
.HasColumnType("boolean");
@@ -146,14 +137,11 @@ namespace DaSaSo.EntityFramework.Migrations
b.Property<string>("Operator")
.HasColumnType("text");
b.Property<bool>("PermitNeeded")
.HasColumnType("boolean");
b.Property<bool>("Preliner")
.HasColumnType("boolean");
b.Property<bool>("STVO")
.HasColumnType("boolean");
b.Property<int>("PreparationType")
.HasColumnType("integer");
b.Property<decimal>("TemperaturAssembly")
.HasColumnType("numeric");
@@ -167,9 +155,6 @@ namespace DaSaSo.EntityFramework.Migrations
b.Property<decimal>("TemperatureSewer")
.HasColumnType("numeric");
b.Property<bool>("WaterBaried")
.HasColumnType("boolean");
b.Property<string>("Weather")
.HasColumnType("text");
@@ -218,9 +203,6 @@ namespace DaSaSo.EntityFramework.Migrations
b.Property<decimal>("Distance")
.HasColumnType("numeric");
b.Property<int>("PreparationType")
.HasColumnType("integer");
b.Property<int?>("SewerObjectId")
.HasColumnType("integer");
@@ -248,6 +230,9 @@ namespace DaSaSo.EntityFramework.Migrations
b.Property<int>("DN")
.HasColumnType("integer");
b.Property<string>("Hausnummer")
.HasColumnType("text");
b.Property<string>("Material")
.HasColumnType("text");
@@ -272,6 +257,9 @@ namespace DaSaSo.EntityFramework.Migrations
b.Property<int>("PunktUntenType")
.HasColumnType("integer");
b.Property<string>("SanNummer")
.HasColumnType("text");
b.Property<bool>("SewerActivated")
.HasColumnType("boolean");

3
DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
View File

@@ -36,11 +36,14 @@ namespace DaSaSo.ViewModel.Commands
_sewerObjectService = sewerObjectService;
_renavigator = renavigator;
_navigator = navigator;
}
public override async Task ExecuteAsync(object? parameter)
{
Trace.WriteLine(_actualProject.AktuellSewerObject.IsChanged);
_navigator.CurrentViewModel = null;
_renavigator.Renavigate();
}

22
DaSaSo.ViewModel/SewerDamageEditViewModel.cs
View File

@@ -16,7 +16,7 @@ namespace DaSaSo.ViewModel
private SewerDamage? _damage;
public SewerDamageControllViewModel damageControllViewModel { get; set; }
public SewerPreperationControllViewModel preperationControllViewModel { get; set; }
//public SewerPreperationControllViewModel preperationControllViewModel { get; set; }
public IRelayCommand Berechne { get; set; }
private string? _entfernung;
@@ -26,6 +26,7 @@ namespace DaSaSo.ViewModel
set
{
_entfernung = value;
_damage.SewerObject.IsChanged = true;
OnPropertyChanged();
}
}
@@ -46,7 +47,7 @@ namespace DaSaSo.ViewModel
Damage = actualProject.AktuellSewerDamage;
damageControllViewModel = new SewerDamageControllViewModel(Damage.DamageType);
preperationControllViewModel = new SewerPreperationControllViewModel(Damage.PreparationType);
//preperationControllViewModel = new SewerPreperationControllViewModel(Damage.PreparationType);
Entfernung = Damage.Distance.ToString();
@@ -67,10 +68,21 @@ namespace DaSaSo.ViewModel
public override void Dispose()
{
// Alle Werte Speichern, form wurde geändert (Noch nicht in DB!)
Damage.DamageType = damageControllViewModel.CalculateDamageFlags();
Damage.PreparationType = preperationControllViewModel.CalculatePreparationFlags();
EDamageType newDamage = damageControllViewModel.CalculateDamageFlags();
//EPreparationType newPrepartion = preperationControllViewModel.CalculatePreparationFlags();
if(Damage.DamageType != newDamage)
{
Damage.DamageType = newDamage;
Damage.SewerObject.IsChanged = true;
}
/* if(Damage.PreparationType != newPrepartion)
{
Damage.PreparationType = newPrepartion;
Damage.SewerObject.IsChanged = true;
}
*/
damageControllViewModel.Dispose();
preperationControllViewModel.Dispose();
//preperationControllViewModel.Dispose();
base.Dispose();
}

30
DaSaSo.ViewModel/SewerStammdatenViewModel.cs
View File

@@ -36,6 +36,30 @@ namespace DaSaSo.ViewModel
}
}
}
public string Hausnummer
{
get => Model.Hausnummer;
set
{
if(Model.Hausnummer != value)
{
Model.Hausnummer = value;
OnPropertyChanged();
}
}
}
public string Sanierungsid
{
get => Model.SanNummer;
set
{
if(Model.SanNummer != value)
{
Model.SanNummer = value;
OnPropertyChanged();
}
}
}
public string Oberepunkt
{
@@ -155,6 +179,12 @@ namespace DaSaSo.ViewModel
Model = _actualProject.AktuellSewerObject;
SaveCommand = new SaveSewerStammdatenCommand(this, dataService, sewerpointService);
this.PropertyChanged += SewerStammdatenViewModel_PropertyChanged;
}
private void SewerStammdatenViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
{
Model.IsChanged = true;
}
~SewerStammdatenViewModel()

12
DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
View File

@@ -43,6 +43,12 @@
<Compile Update="View\SewerObject\Controls\SewerDamagePreparation.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\Pipeliner.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\SewerDamageEditView.xaml.cs">
<SubType>Code</SubType>
</Compile>
@@ -99,6 +105,12 @@
<Page Update="View\SewerObject\Controls\SewerDamagePreparation.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\Controls\SewerRehabilation.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\Pipeliner.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\SewerDamageEditView.xaml">
<SubType>Designer</SubType>
</Page>

1
DaSaSo.Wpf/Sampledata/SewerDamageListSampleData.cs
View File

@@ -16,7 +16,6 @@ namespace DaSaSo.Wpf.Sampledata
Damages.Add(new SewerDamage()
{
DamageType = EDamageType.Bruch | EDamageType.EinrageneStutzen,
PreparationType = EPreparationType.CleanedHD | EPreparationType.CleanedRoboter,
Distance = 12.5m
});

3
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
View File

@@ -20,6 +20,9 @@
<CheckBox Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
<CheckBox Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
<CheckBox Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
<CheckBox Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" />
<CheckBox Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" />
<CheckBox Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" />
</StackPanel>
</Border>
</Grid>

22
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml Normal file
View File

@@ -0,0 +1,22 @@
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.Controls.SewerRehabilation"
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.SewerObject.Controls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<local:SewerDamagePreparation />
<StackPanel Grid.Column="1">
<Label Content="Operator" />
<Label Content="Datum" />
<Label Content="Temperatur Aussen" />
<Label Content="Temperatur Kanal" />
</StackPanel>
</Grid>
</UserControl>

28
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml.cs Normal file
View File

@@ -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.SewerObject.Controls
{
/// <summary>
/// Interaction logic for SewerRehabilation.xaml
/// </summary>
public partial class SewerRehabilation : UserControl
{
public SewerRehabilation()
{
InitializeComponent();
}
}
}

8
DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml
View File

@@ -8,10 +8,12 @@
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<StackPanel>
<Label Content="Operator" />
<Label Content="Datum" />
<Label Content="Geschlossene Ende" />
<Label Content="Liner-Charge" />
<Label Content="Lagerung Temperatur" />
<Label Content="Temperatur beim Einbau" />
<Label Content="Einbaudruck" />
<Label Content="Preliner verwendet?" />
</StackPanel>
</Grid>

2
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
View File

@@ -17,7 +17,7 @@
<RowDefinition />
</Grid.RowDefinitions>
<selfControls:SewerDamage Grid.Column="0" Grid.Row="0" DataContext="{Binding damageControllViewModel}" Margin="3" />
<selfControls:SewerDamagePreparation Grid.Column="1" Grid.Row="0" DataContext="{Binding preperationControllViewModel}" Margin="3" />
<!--<selfControls:SewerDamagePreparation Grid.Column="1" Grid.Row="0" DataContext="{Binding preperationControllViewModel}" Margin="3" />-->
<Grid Grid.Row="1" Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition />

34
DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml
View File

@@ -27,19 +27,22 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Haltungsname" Margin="20" />
<Label Grid.Column="0" Grid.Row="1" Content="Punkt Oben" Margin="20" />
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Unten" Margin="20" />
<Label Grid.Column="0" Grid.Row="3" Content="Durchmesser" Margin="20" />
<Label Grid.Column="0" Grid.Row="4" Content="Material" Margin="20" />
<Label Grid.Column="0" Grid.Row="5" Content="Leitungslänge" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Haltungsname }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Oberepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Unterepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Durchmesser }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Material }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Leitungslength }" Margin="20" />
<Label Grid.Column="0" Grid.Row="0" Content="Sanierung ID" Margin="20" />
<Label Grid.Column="0" Grid.Row="1" Content="Haltungsname" Margin="20" />
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Oben" Margin="20" />
<Label Grid.Column="0" Grid.Row="3" Content="Punkt Unten" Margin="20" />
<Label Grid.Column="0" Grid.Row="4" Content="Durchmesser" Margin="20" />
<Label Grid.Column="0" Grid.Row="5" Content="Material" Margin="20" />
<Label Grid.Column="0" Grid.Row="6" Content="Leitungslänge" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Sanierungsid}" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Haltungsname }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Oberepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Unterepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Durchmesser }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Material }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="6" Text="{Binding Leitungslength }" Margin="20" />
</Grid>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
@@ -49,11 +52,14 @@
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Strasse" Margin="20" />
<Label Grid.Row="1" Grid.Column="0" Content="Ort" Margin="20" />
<Label Grid.Row="1" Grid.Column="0" Content="Hausnummer" Margin="20" />
<Label Grid.Row="2" Grid.Column="0" Content="Ort" Margin="20" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Strasse}" Margin="20"/>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Hausnummer}" Margin="20" />
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
</Grid>
<Button Grid.Row="1" Grid.ColumnSpan="2" FontSize="20" Content="Speichern" Command="{Binding SaveCommand}" />
</Grid>

17
DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml
View File

@@ -26,8 +26,21 @@
<DataTemplate DataType="{x:Type model:SewerObject}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding ObjektName}" />
<TextBlock Text="{Binding Material}" />
<TextBlock Text="SanID [" />
<TextBlock Text="{Binding SanNummer}" Foreground="Red" />
<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}">