Compare commits
14 Commits
sewerdamag
...
ClientsNot
| Author | SHA1 | Date | |
|---|---|---|---|
|
1b4911e6aa | ||
|
|
13b4be5f5a | ||
|
|
ee46751fa6 | ||
|
|
d4da9fd0da | ||
|
|
b4a896f5bf | ||
|
|
e2e7fbc9c4 | ||
|
|
6cf888c5e3 | ||
|
|
3b97a912bc | ||
|
|
ba51c3bde6 | ||
|
|
895a5b7f0d | ||
|
|
adbbc0e528 | ||
|
|
4ed6826f62 | ||
|
|
b48007095e | ||
|
|
790792174d |
@@ -8,6 +8,7 @@
|
|||||||
Projects,
|
Projects,
|
||||||
Buildingsites,
|
Buildingsites,
|
||||||
SewerObjects,
|
SewerObjects,
|
||||||
SewerMainMenu
|
SewerMainMenu,
|
||||||
|
Impregnierung
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ namespace DaSaSo.Domain.Model
|
|||||||
{
|
{
|
||||||
public class Buildingsite : DomainObject
|
public class Buildingsite : DomainObject
|
||||||
{
|
{
|
||||||
|
public Client Client { get; set; }
|
||||||
public Project Project { get; set; }
|
public Project Project { get; set; }
|
||||||
public string BuildingSiteNumber { get; set; }
|
public string BuildingSiteNumber { get; set; }
|
||||||
public string Country { get; set; }
|
public string Country { get; set; }
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace DaSaSo.Domain.Model
|
|||||||
public string Country { get; set; }
|
public string Country { get; set; }
|
||||||
public string Street { get; set; }
|
public string Street { get; set; }
|
||||||
public string Postcode { get; set; }
|
public string Postcode { get; set; }
|
||||||
public ICollection<Project> Projects { get; set; } = new List<Project>();
|
//public ICollection<Project> Projects { get; set; } = new List<Project>();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace DaSaSo.Domain.Model
|
|||||||
public string Number { get; set; }
|
public string Number { get; set; }
|
||||||
public decimal Linerlength { get; set; }
|
public decimal Linerlength { get; set; }
|
||||||
public bool IsAvaible { get; set; }
|
public bool IsAvaible { get; set; }
|
||||||
public DateTime Date { get; set; }
|
public DateOnly Date { get; set; }
|
||||||
public string LinerNumber { get; set; }
|
public string LinerNumber { get; set; }
|
||||||
public decimal WallThickness { get; set; }
|
public decimal WallThickness { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace DaSaSo.Domain.Model
|
|||||||
{
|
{
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string Projektnummer { get; set; }
|
public string Projektnummer { get; set; }
|
||||||
public Client Client { get; set; }
|
//public Client Client { get; set; }
|
||||||
public ICollection<Buildingsite> BuildingSites { get; set; } = new List<Buildingsite>();
|
public ICollection<Buildingsite> BuildingSites { get; set; } = new List<Buildingsite>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace DaSaSo.Domain.Model
|
|||||||
public abstract class SewerRehabilation : DomainObject
|
public abstract class SewerRehabilation : DomainObject
|
||||||
{
|
{
|
||||||
public string Operator { get; set; }
|
public string Operator { get; set; }
|
||||||
public DateTime Date { get; set; }
|
public DateOnly Date { get; set; }
|
||||||
public decimal TemperatureOutdoors { get; set; }
|
public decimal TemperatureOutdoors { get; set; }
|
||||||
public decimal TemperatureSewer { get; set; }
|
public decimal TemperatureSewer { get; set; }
|
||||||
public string Weather { get; set; }
|
public string Weather { get; set; }
|
||||||
|
|||||||
@@ -9,6 +9,6 @@ namespace DaSaSo.Domain.Services.ProjectServices
|
|||||||
{
|
{
|
||||||
public interface IProjectService
|
public interface IProjectService
|
||||||
{
|
{
|
||||||
Task<Project> CreateProject(Client Auftraggeber);
|
Task<Project> CreateProject();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,16 +16,18 @@ namespace DaSaSo.Domain.Services.ProjectServices
|
|||||||
_clientService = clientService;
|
_clientService = clientService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Project> CreateProject(Client Auftraggeber)
|
public async Task<Project> CreateProject()
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
Project project = new Project()
|
Project project = new Project()
|
||||||
{
|
{
|
||||||
Client = Auftraggeber
|
Client = Auftraggeber
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
/*Auftraggeber.Projects.Add(project);
|
||||||
|
await _clientService.Update(Auftraggeber.Id, Auftraggeber);*/
|
||||||
|
|
||||||
Auftraggeber.Projects.Add(project);
|
return new Project();
|
||||||
await _clientService.Update(Auftraggeber.Id, Auftraggeber);
|
|
||||||
return project;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,4 +19,8 @@
|
|||||||
<ProjectReference Include="..\DaSaSo.Domain\DaSaSo.Domain.csproj" />
|
<ProjectReference Include="..\DaSaSo.Domain\DaSaSo.Domain.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Migrations\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,187 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210912175956_InitialCommit")]
|
|
||||||
partial class InitialCommit
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("BuildingSiteNumber")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("ContactPerson")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Country")
|
|
||||||
.IsRequired()
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("Country")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Firstname")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("LastName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Postcode")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("Clients");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("ClientId");
|
|
||||||
|
|
||||||
b.ToTable("Projects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("BuildingSiteId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<int>("DN")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("ObjektName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointFrom")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointTo")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<decimal>("SewerLength")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<string>("StreetName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("BuildingSiteId");
|
|
||||||
|
|
||||||
b.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Project", null)
|
|
||||||
.WithMany("BuildingSites")
|
|
||||||
.HasForeignKey("ProjectId");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Client", "Client")
|
|
||||||
.WithMany("Projects")
|
|
||||||
.HasForeignKey("ClientId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
b.Navigation("Client");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
|
|
||||||
.WithMany("SewerObjects")
|
|
||||||
.HasForeignKey("BuildingSiteId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
b.Navigation("BuildingSite");
|
|
||||||
});
|
|
||||||
|
|
||||||
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");
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class InitialCommit : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "Clients",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
Firstname = table.Column<string>(type: "text", nullable: false),
|
|
||||||
LastName = table.Column<string>(type: "text", nullable: false),
|
|
||||||
Country = table.Column<string>(type: "text", nullable: false),
|
|
||||||
Postcode = table.Column<string>(type: "text", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_Clients", x => x.Id);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "Projects",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
Name = table.Column<string>(type: "text", nullable: false),
|
|
||||||
ClientId = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_Projects", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_Projects_Clients_ClientId",
|
|
||||||
column: x => x.ClientId,
|
|
||||||
principalTable: "Clients",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "Buildingsites",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
BuildingSiteNumber = table.Column<string>(type: "text", nullable: false),
|
|
||||||
Country = table.Column<string>(type: "text", nullable: false),
|
|
||||||
ContactPerson = table.Column<string>(type: "text", nullable: false),
|
|
||||||
ProjectId = table.Column<int>(type: "integer", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_Buildingsites", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_Buildingsites_Projects_ProjectId",
|
|
||||||
column: x => x.ProjectId,
|
|
||||||
principalTable: "Projects",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "SewerObjects",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
BuildingSiteId = table.Column<int>(type: "integer", nullable: false),
|
|
||||||
StreetName = table.Column<string>(type: "text", nullable: false),
|
|
||||||
ObjektName = table.Column<string>(type: "text", nullable: false),
|
|
||||||
PointFrom = table.Column<string>(type: "text", nullable: false),
|
|
||||||
PointTo = table.Column<string>(type: "text", nullable: false),
|
|
||||||
DN = table.Column<int>(type: "integer", nullable: false),
|
|
||||||
SewerLength = table.Column<decimal>(type: "numeric", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_SewerObjects", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_SewerObjects_Buildingsites_BuildingSiteId",
|
|
||||||
column: x => x.BuildingSiteId,
|
|
||||||
principalTable: "Buildingsites",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_Buildingsites_ProjectId",
|
|
||||||
table: "Buildingsites",
|
|
||||||
column: "ProjectId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_Projects_ClientId",
|
|
||||||
table: "Projects",
|
|
||||||
column: "ClientId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_SewerObjects_BuildingSiteId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "BuildingSiteId");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "Buildingsites");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "Projects");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "Clients");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,191 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210913113208_StreetAdded")]
|
|
||||||
partial class StreetAdded
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("BuildingSiteNumber")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("ContactPerson")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Country")
|
|
||||||
.IsRequired()
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("Country")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Firstname")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("LastName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Postcode")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("Street")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("Clients");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("ClientId");
|
|
||||||
|
|
||||||
b.ToTable("Projects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("BuildingSiteId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<int>("DN")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("ObjektName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointFrom")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointTo")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<decimal>("SewerLength")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<string>("StreetName")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("BuildingSiteId");
|
|
||||||
|
|
||||||
b.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Project", null)
|
|
||||||
.WithMany("BuildingSites")
|
|
||||||
.HasForeignKey("ProjectId");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Client", "Client")
|
|
||||||
.WithMany("Projects")
|
|
||||||
.HasForeignKey("ClientId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
b.Navigation("Client");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
|
|
||||||
.WithMany("SewerObjects")
|
|
||||||
.HasForeignKey("BuildingSiteId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
b.Navigation("BuildingSite");
|
|
||||||
});
|
|
||||||
|
|
||||||
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");
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class StreetAdded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "Street",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "Street",
|
|
||||||
table: "Clients");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,176 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210915174236_ProjectReferenzAdded")]
|
|
||||||
partial class ProjectReferenzAdded
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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.Project", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("ClientId");
|
|
||||||
|
|
||||||
b.ToTable("Projects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("BuildingSiteId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<int>("DN")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("ObjektName")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointFrom")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointTo")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<decimal>("SewerLength")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<string>("StreetName")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("BuildingSiteId");
|
|
||||||
|
|
||||||
b.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
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.Project", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Client", "Client")
|
|
||||||
.WithMany("Projects")
|
|
||||||
.HasForeignKey("ClientId");
|
|
||||||
|
|
||||||
b.Navigation("Client");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
|
|
||||||
.WithMany("SewerObjects")
|
|
||||||
.HasForeignKey("BuildingSiteId");
|
|
||||||
|
|
||||||
b.Navigation("BuildingSite");
|
|
||||||
});
|
|
||||||
|
|
||||||
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");
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,331 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class ProjectReferenzAdded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_Projects_Clients_ClientId",
|
|
||||||
table: "Projects");
|
|
||||||
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_Buildingsites_BuildingSiteId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "StreetName",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "PointTo",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "PointFrom",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "ObjektName",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<int>(
|
|
||||||
name: "BuildingSiteId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(int),
|
|
||||||
oldType: "integer");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Name",
|
|
||||||
table: "Projects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<int>(
|
|
||||||
name: "ClientId",
|
|
||||||
table: "Projects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(int),
|
|
||||||
oldType: "integer");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Street",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Postcode",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "LastName",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Firstname",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Country",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Country",
|
|
||||||
table: "Buildingsites",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "ContactPerson",
|
|
||||||
table: "Buildingsites",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "BuildingSiteNumber",
|
|
||||||
table: "Buildingsites",
|
|
||||||
type: "text",
|
|
||||||
nullable: true,
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_Projects_Clients_ClientId",
|
|
||||||
table: "Projects",
|
|
||||||
column: "ClientId",
|
|
||||||
principalTable: "Clients",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_Buildingsites_BuildingSiteId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "BuildingSiteId",
|
|
||||||
principalTable: "Buildingsites",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_Projects_Clients_ClientId",
|
|
||||||
table: "Projects");
|
|
||||||
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_Buildingsites_BuildingSiteId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "StreetName",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "PointTo",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "PointFrom",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "ObjektName",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<int>(
|
|
||||||
name: "BuildingSiteId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: 0,
|
|
||||||
oldClrType: typeof(int),
|
|
||||||
oldType: "integer",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Name",
|
|
||||||
table: "Projects",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<int>(
|
|
||||||
name: "ClientId",
|
|
||||||
table: "Projects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: 0,
|
|
||||||
oldClrType: typeof(int),
|
|
||||||
oldType: "integer",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Street",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Postcode",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "LastName",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Firstname",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Country",
|
|
||||||
table: "Clients",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "Country",
|
|
||||||
table: "Buildingsites",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "ContactPerson",
|
|
||||||
table: "Buildingsites",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<string>(
|
|
||||||
name: "BuildingSiteNumber",
|
|
||||||
table: "Buildingsites",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "",
|
|
||||||
oldClrType: typeof(string),
|
|
||||||
oldType: "text",
|
|
||||||
oldNullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_Projects_Clients_ClientId",
|
|
||||||
table: "Projects",
|
|
||||||
column: "ClientId",
|
|
||||||
principalTable: "Clients",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_Buildingsites_BuildingSiteId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "BuildingSiteId",
|
|
||||||
principalTable: "Buildingsites",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210916075225_SewerDamageAdded")]
|
|
||||||
partial class SewerDamageAdded
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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.Project", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DamageType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<decimal>("Distance")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<int>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<int?>("SewerObjectId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("SewerObjectId");
|
|
||||||
|
|
||||||
b.ToTable("SewerDamages");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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<string>("PointFrom")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointTo")
|
|
||||||
.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.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
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.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.SewerObjects", "SewerObject")
|
|
||||||
.WithMany("SewerDamages")
|
|
||||||
.HasForeignKey("SewerObjectId");
|
|
||||||
|
|
||||||
b.Navigation("SewerObject");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
|
|
||||||
.WithMany("SewerObjects")
|
|
||||||
.HasForeignKey("BuildingSiteId");
|
|
||||||
|
|
||||||
b.Navigation("BuildingSite");
|
|
||||||
});
|
|
||||||
|
|
||||||
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.SewerObjects", b =>
|
|
||||||
{
|
|
||||||
b.Navigation("SewerDamages");
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class SewerDamageAdded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "BuildingsiteBarier",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "boolean",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: false);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "Material",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "PermitNeeded",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "boolean",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: false);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "SewerActivated",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "boolean",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: false);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "SewerCleaned",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "boolean",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: false);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "WaterBarrier",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "boolean",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: false);
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "SewerDamages",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
SewerObjectId = table.Column<int>(type: "integer", nullable: true),
|
|
||||||
Distance = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
DamageType = table.Column<int>(type: "integer", nullable: false),
|
|
||||||
PreparationType = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_SewerDamages", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_SewerDamages_SewerObjects_SewerObjectId",
|
|
||||||
column: x => x.SewerObjectId,
|
|
||||||
principalTable: "SewerObjects",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_SewerDamages_SewerObjectId",
|
|
||||||
table: "SewerDamages",
|
|
||||||
column: "SewerObjectId");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "SewerDamages");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "BuildingsiteBarier",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "Material",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PermitNeeded",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "SewerActivated",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "SewerCleaned",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "WaterBarrier",
|
|
||||||
table: "SewerObjects");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210916135239_SewerObjectsAdded")]
|
|
||||||
partial class SewerObjectsAdded
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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.Project", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DamageType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<decimal>("Distance")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<int>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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<string>("PointFrom")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.Property<string>("PointTo")
|
|
||||||
.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.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
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.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.Navigation("BuildingSite");
|
|
||||||
});
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class SewerObjectsAdded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,271 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210920062903_transfertoenum")]
|
|
||||||
partial class transfertoenum
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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.Project", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DamageType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<decimal>("Distance")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<int>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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?>("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("PunktObenId");
|
|
||||||
|
|
||||||
b.HasIndex("PunktUntenId");
|
|
||||||
|
|
||||||
b.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerPoint", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("Objektnummer")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("SewerPoint");
|
|
||||||
});
|
|
||||||
|
|
||||||
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.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.SewerPoint", "PunktOben")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PunktObenId");
|
|
||||||
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktUnten")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PunktUntenId");
|
|
||||||
|
|
||||||
b.Navigation("BuildingSite");
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,134 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class transfertoenum : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PointFrom",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PointTo",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<int>(
|
|
||||||
name: "PunktObenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<int>(
|
|
||||||
name: "PunktObenType",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: 0);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<int>(
|
|
||||||
name: "PunktUntenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<int>(
|
|
||||||
name: "PunktUntenType",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: 0);
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "SewerPoint",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
Objektnummer = table.Column<string>(type: "text", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_SewerPoint", x => x.Id);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_SewerObjects_PunktObenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktObenId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_SewerObjects_PunktUntenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktUntenId");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktObenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktObenId",
|
|
||||||
principalTable: "SewerPoint",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktUntenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktUntenId",
|
|
||||||
principalTable: "SewerPoint",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktObenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktUntenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "SewerPoint");
|
|
||||||
|
|
||||||
migrationBuilder.DropIndex(
|
|
||||||
name: "IX_SewerObjects_PunktObenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropIndex(
|
|
||||||
name: "IX_SewerObjects_PunktUntenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PunktObenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PunktObenType",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PunktUntenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PunktUntenType",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "PointFrom",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "PointTo",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,381 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210921145350_Lineradded")]
|
|
||||||
partial class Lineradded
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DN")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
|
||||||
.HasColumnType("timestamp without 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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedHD")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedMechanisch")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedRoborter")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("ClosedEnd")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
|
||||||
.HasColumnType("timestamp without 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<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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DamageType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<decimal>("Distance")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<int>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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?>("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("PunktObenId");
|
|
||||||
|
|
||||||
b.HasIndex("PunktUntenId");
|
|
||||||
|
|
||||||
b.ToTable("SewerObjects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.SewerPoint", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("Objektnummer")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("SewerPoint");
|
|
||||||
});
|
|
||||||
|
|
||||||
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.SewerPoint", "PunktOben")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PunktObenId");
|
|
||||||
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktUnten")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("PunktUntenId");
|
|
||||||
|
|
||||||
b.Navigation("BuildingSite");
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class Lineradded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "Impregnations",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
DN = table.Column<int>(type: "integer", nullable: false),
|
|
||||||
Number = table.Column<string>(type: "text", nullable: true),
|
|
||||||
Linerlength = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
IsAvaible = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
Date = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
|
|
||||||
LinerNumber = table.Column<string>(type: "text", nullable: true),
|
|
||||||
WallThickness = table.Column<decimal>(type: "numeric", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_Impregnations", x => x.Id);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "PipeLiners",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "integer", nullable: false)
|
|
||||||
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
|
||||||
InversionPressure = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
ImpregnationId = table.Column<int>(type: "integer", nullable: true),
|
|
||||||
ClosedEnd = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
Preliner = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
TemperaturAssembly = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
TemperaturStorage = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
LinerLength = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
Operator = table.Column<string>(type: "text", nullable: true),
|
|
||||||
Date = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
|
|
||||||
TemperatureOutdoors = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
TemperatureSewer = table.Column<decimal>(type: "numeric", nullable: false),
|
|
||||||
Weather = table.Column<string>(type: "text", nullable: true),
|
|
||||||
CleanedHD = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
CleanedMechanisch = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
CleanedRoborter = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
WaterBaried = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
PermitNeeded = table.Column<bool>(type: "boolean", nullable: false),
|
|
||||||
STVO = table.Column<bool>(type: "boolean", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_PipeLiners", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_PipeLiners_Impregnations_ImpregnationId",
|
|
||||||
column: x => x.ImpregnationId,
|
|
||||||
principalTable: "Impregnations",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_PipeLiners_ImpregnationId",
|
|
||||||
table: "PipeLiners",
|
|
||||||
column: "ImpregnationId");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "PipeLiners");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "Impregnations");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,392 +0,0 @@
|
|||||||
// <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;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
|
||||||
[Migration("20210921145447_LineraddedToSewer")]
|
|
||||||
partial class LineraddedToSewer
|
|
||||||
{
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder
|
|
||||||
.HasAnnotation("Relational:MaxIdentifierLength", 63)
|
|
||||||
.HasAnnotation("ProductVersion", "6.0.0-preview.7.21378.4")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DN")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
|
||||||
.HasColumnType("timestamp without 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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedHD")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedMechanisch")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedRoborter")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("ClosedEnd")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
|
||||||
.HasColumnType("timestamp without 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<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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<int>("DamageType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<decimal>("Distance")
|
|
||||||
.HasColumnType("numeric");
|
|
||||||
|
|
||||||
b.Property<int>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
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")
|
|
||||||
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
|
|
||||||
|
|
||||||
b.Property<string>("Objektnummer")
|
|
||||||
.HasColumnType("text");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.ToTable("SewerPoint");
|
|
||||||
});
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class LineraddedToSewer : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<int>(
|
|
||||||
name: "PipeLinerId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
type: "integer",
|
|
||||||
nullable: true);
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_SewerObjects_PipeLinerId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PipeLinerId");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_PipeLiners_PipeLinerId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PipeLinerId",
|
|
||||||
principalTable: "PipeLiners",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Restrict);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_PipeLiners_PipeLinerId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropIndex(
|
|
||||||
name: "IX_SewerObjects_PipeLinerId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "PipeLinerId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,403 +0,0 @@
|
|||||||
// <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("20210928140403_SewerPointsAdded")]
|
|
||||||
partial class SewerPointsAdded
|
|
||||||
{
|
|
||||||
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>("CleanedHD")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedMechanisch")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedRoborter")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
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<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.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>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class SewerPointsAdded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktObenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktUntenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropPrimaryKey(
|
|
||||||
name: "PK_SewerPoint",
|
|
||||||
table: "SewerPoint");
|
|
||||||
|
|
||||||
migrationBuilder.RenameTable(
|
|
||||||
name: "SewerPoint",
|
|
||||||
newName: "SewerPoints");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<DateTime>(
|
|
||||||
name: "Date",
|
|
||||||
table: "PipeLiners",
|
|
||||||
type: "timestamp with time zone",
|
|
||||||
nullable: false,
|
|
||||||
oldClrType: typeof(DateTime),
|
|
||||||
oldType: "timestamp without time zone");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<DateTime>(
|
|
||||||
name: "Date",
|
|
||||||
table: "Impregnations",
|
|
||||||
type: "timestamp with time zone",
|
|
||||||
nullable: false,
|
|
||||||
oldClrType: typeof(DateTime),
|
|
||||||
oldType: "timestamp without time zone");
|
|
||||||
|
|
||||||
migrationBuilder.AddPrimaryKey(
|
|
||||||
name: "PK_SewerPoints",
|
|
||||||
table: "SewerPoints",
|
|
||||||
column: "Id");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoints_PunktObenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktObenId",
|
|
||||||
principalTable: "SewerPoints",
|
|
||||||
principalColumn: "Id");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoints_PunktUntenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktUntenId",
|
|
||||||
principalTable: "SewerPoints",
|
|
||||||
principalColumn: "Id");
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoints_PunktObenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoints_PunktUntenId",
|
|
||||||
table: "SewerObjects");
|
|
||||||
|
|
||||||
migrationBuilder.DropPrimaryKey(
|
|
||||||
name: "PK_SewerPoints",
|
|
||||||
table: "SewerPoints");
|
|
||||||
|
|
||||||
migrationBuilder.RenameTable(
|
|
||||||
name: "SewerPoints",
|
|
||||||
newName: "SewerPoint");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<DateTime>(
|
|
||||||
name: "Date",
|
|
||||||
table: "PipeLiners",
|
|
||||||
type: "timestamp without time zone",
|
|
||||||
nullable: false,
|
|
||||||
oldClrType: typeof(DateTime),
|
|
||||||
oldType: "timestamp with time zone");
|
|
||||||
|
|
||||||
migrationBuilder.AlterColumn<DateTime>(
|
|
||||||
name: "Date",
|
|
||||||
table: "Impregnations",
|
|
||||||
type: "timestamp without time zone",
|
|
||||||
nullable: false,
|
|
||||||
oldClrType: typeof(DateTime),
|
|
||||||
oldType: "timestamp with time zone");
|
|
||||||
|
|
||||||
migrationBuilder.AddPrimaryKey(
|
|
||||||
name: "PK_SewerPoint",
|
|
||||||
table: "SewerPoint",
|
|
||||||
column: "Id");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktObenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktObenId",
|
|
||||||
principalTable: "SewerPoint",
|
|
||||||
principalColumn: "Id");
|
|
||||||
|
|
||||||
migrationBuilder.AddForeignKey(
|
|
||||||
name: "FK_SewerObjects_SewerPoint_PunktUntenId",
|
|
||||||
table: "SewerObjects",
|
|
||||||
column: "PunktUntenId",
|
|
||||||
principalTable: "SewerPoint",
|
|
||||||
principalColumn: "Id");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,406 +0,0 @@
|
|||||||
// <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("20210928153745_ProjectNumberAdded")]
|
|
||||||
partial class ProjectNumberAdded
|
|
||||||
{
|
|
||||||
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>("CleanedHD")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedMechanisch")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("CleanedRoborter")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
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<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>("PreparationType")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace DaSaSo.EntityFramework.Migrations
|
|
||||||
{
|
|
||||||
public partial class ProjectNumberAdded : Migration
|
|
||||||
{
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "Projektnummer",
|
|
||||||
table: "Projects",
|
|
||||||
type: "text",
|
|
||||||
nullable: true);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "Projektnummer",
|
|
||||||
table: "Projects");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|||||||
namespace DaSaSo.EntityFramework.Migrations
|
namespace DaSaSo.EntityFramework.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
[DbContext(typeof(DaSaSoDbContext))]
|
||||||
[Migration("20211005082652_AddHousenumbers")]
|
[Migration("20211009183922_Initial")]
|
||||||
partial class AddHousenumbers
|
partial class Initial
|
||||||
{
|
{
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
{
|
{
|
||||||
271
DaSaSo.EntityFramework/Migrations/20211009183922_Initial.cs
Normal file
271
DaSaSo.EntityFramework/Migrations/20211009183922_Initial.cs
Normal file
@@ -0,0 +1,271 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace DaSaSo.EntityFramework.Migrations
|
||||||
|
{
|
||||||
|
public partial class Initial : Migration
|
||||||
|
{
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Clients",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
Firstname = table.Column<string>(type: "text", nullable: true),
|
||||||
|
LastName = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Country = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Street = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Postcode = table.Column<string>(type: "text", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Clients", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Impregnations",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
DN = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
Number = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Linerlength = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
IsAvaible = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
Date = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||||
|
LinerNumber = table.Column<string>(type: "text", nullable: true),
|
||||||
|
WallThickness = table.Column<decimal>(type: "numeric", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Impregnations", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SewerPoints",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
Objektnummer = table.Column<string>(type: "text", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SewerPoints", x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Projects",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
Name = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Projektnummer = table.Column<string>(type: "text", nullable: true),
|
||||||
|
ClientId = table.Column<int>(type: "integer", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Projects", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Projects_Clients_ClientId",
|
||||||
|
column: x => x.ClientId,
|
||||||
|
principalTable: "Clients",
|
||||||
|
principalColumn: "Id");
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "PipeLiners",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
InversionPressure = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
ImpregnationId = table.Column<int>(type: "integer", nullable: true),
|
||||||
|
ClosedEnd = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
Preliner = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
TemperaturAssembly = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
TemperaturStorage = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
LinerLength = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
Operator = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Date = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
|
||||||
|
TemperatureOutdoors = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
TemperatureSewer = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
Weather = table.Column<string>(type: "text", nullable: true),
|
||||||
|
PreparationType = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_PipeLiners", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_PipeLiners_Impregnations_ImpregnationId",
|
||||||
|
column: x => x.ImpregnationId,
|
||||||
|
principalTable: "Impregnations",
|
||||||
|
principalColumn: "Id");
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "Buildingsites",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
ProjectId = table.Column<int>(type: "integer", nullable: true),
|
||||||
|
BuildingSiteNumber = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Country = table.Column<string>(type: "text", nullable: true),
|
||||||
|
ContactPerson = table.Column<string>(type: "text", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_Buildingsites", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_Buildingsites_Projects_ProjectId",
|
||||||
|
column: x => x.ProjectId,
|
||||||
|
principalTable: "Projects",
|
||||||
|
principalColumn: "Id");
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SewerObjects",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
BuildingSiteId = table.Column<int>(type: "integer", nullable: true),
|
||||||
|
SanNummer = table.Column<string>(type: "text", nullable: true),
|
||||||
|
StreetName = table.Column<string>(type: "text", nullable: true),
|
||||||
|
Hausnummer = table.Column<string>(type: "text", nullable: true),
|
||||||
|
ObjektName = table.Column<string>(type: "text", nullable: true),
|
||||||
|
PunktObenId = table.Column<int>(type: "integer", nullable: true),
|
||||||
|
PunktObenType = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
PunktUntenId = table.Column<int>(type: "integer", nullable: true),
|
||||||
|
PunktUntenType = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
Material = table.Column<string>(type: "text", nullable: true),
|
||||||
|
DN = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
SewerLength = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
SewerActivated = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
SewerCleaned = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
WaterBarrier = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
PermitNeeded = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
BuildingsiteBarier = table.Column<bool>(type: "boolean", nullable: false),
|
||||||
|
PipeLinerId = table.Column<int>(type: "integer", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SewerObjects", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SewerObjects_Buildingsites_BuildingSiteId",
|
||||||
|
column: x => x.BuildingSiteId,
|
||||||
|
principalTable: "Buildingsites",
|
||||||
|
principalColumn: "Id");
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SewerObjects_PipeLiners_PipeLinerId",
|
||||||
|
column: x => x.PipeLinerId,
|
||||||
|
principalTable: "PipeLiners",
|
||||||
|
principalColumn: "Id");
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SewerObjects_SewerPoints_PunktObenId",
|
||||||
|
column: x => x.PunktObenId,
|
||||||
|
principalTable: "SewerPoints",
|
||||||
|
principalColumn: "Id");
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SewerObjects_SewerPoints_PunktUntenId",
|
||||||
|
column: x => x.PunktUntenId,
|
||||||
|
principalTable: "SewerPoints",
|
||||||
|
principalColumn: "Id");
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "SewerDamages",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
Id = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
|
||||||
|
SewerObjectId = table.Column<int>(type: "integer", nullable: true),
|
||||||
|
Distance = table.Column<decimal>(type: "numeric", nullable: false),
|
||||||
|
DamageType = table.Column<int>(type: "integer", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("PK_SewerDamages", x => x.Id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "FK_SewerDamages_SewerObjects_SewerObjectId",
|
||||||
|
column: x => x.SewerObjectId,
|
||||||
|
principalTable: "SewerObjects",
|
||||||
|
principalColumn: "Id");
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Buildingsites_ProjectId",
|
||||||
|
table: "Buildingsites",
|
||||||
|
column: "ProjectId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_PipeLiners_ImpregnationId",
|
||||||
|
table: "PipeLiners",
|
||||||
|
column: "ImpregnationId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Projects_ClientId",
|
||||||
|
table: "Projects",
|
||||||
|
column: "ClientId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SewerDamages_SewerObjectId",
|
||||||
|
table: "SewerDamages",
|
||||||
|
column: "SewerObjectId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SewerObjects_BuildingSiteId",
|
||||||
|
table: "SewerObjects",
|
||||||
|
column: "BuildingSiteId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SewerObjects_PipeLinerId",
|
||||||
|
table: "SewerObjects",
|
||||||
|
column: "PipeLinerId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SewerObjects_PunktObenId",
|
||||||
|
table: "SewerObjects",
|
||||||
|
column: "PunktObenId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_SewerObjects_PunktUntenId",
|
||||||
|
table: "SewerObjects",
|
||||||
|
column: "PunktUntenId");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SewerDamages");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SewerObjects");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Buildingsites");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "PipeLiners");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "SewerPoints");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Projects");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Impregnations");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "Clients");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
|||||||
namespace DaSaSo.EntityFramework.Migrations
|
namespace DaSaSo.EntityFramework.Migrations
|
||||||
{
|
{
|
||||||
[DbContext(typeof(DaSaSoDbContext))]
|
[DbContext(typeof(DaSaSoDbContext))]
|
||||||
[Migration("20211005060234_DeletedPrepartionFromDamage")]
|
[Migration("20211101090936_RemoveClientAsDomain")]
|
||||||
partial class DeletedPrepartionFromDamage
|
partial class RemoveClientAsDomain
|
||||||
{
|
{
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||||
{
|
{
|
||||||
@@ -35,6 +35,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<string>("BuildingSiteNumber")
|
b.Property<string>("BuildingSiteNumber")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int?>("ClientId")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.Property<string>("ContactPerson")
|
b.Property<string>("ContactPerson")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
@@ -46,6 +49,8 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ClientId");
|
||||||
|
|
||||||
b.HasIndex("ProjectId");
|
b.HasIndex("ProjectId");
|
||||||
|
|
||||||
b.ToTable("Buildingsites");
|
b.ToTable("Buildingsites");
|
||||||
@@ -90,8 +95,8 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<int>("DN")
|
b.Property<int>("DN")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
b.Property<DateOnly>("Date")
|
||||||
.HasColumnType("timestamp with time zone");
|
.HasColumnType("date");
|
||||||
|
|
||||||
b.Property<bool>("IsAvaible")
|
b.Property<bool>("IsAvaible")
|
||||||
.HasColumnType("boolean");
|
.HasColumnType("boolean");
|
||||||
@@ -124,8 +129,8 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<bool>("ClosedEnd")
|
b.Property<bool>("ClosedEnd")
|
||||||
.HasColumnType("boolean");
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
b.Property<DateOnly>("Date")
|
||||||
.HasColumnType("timestamp with time zone");
|
.HasColumnType("date");
|
||||||
|
|
||||||
b.Property<int?>("ImpregnationId")
|
b.Property<int?>("ImpregnationId")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
@@ -139,18 +144,12 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<string>("Operator")
|
b.Property<string>("Operator")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
b.Property<bool>("PermitNeeded")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<bool>("Preliner")
|
b.Property<bool>("Preliner")
|
||||||
.HasColumnType("boolean");
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
b.Property<int>("PreparationType")
|
b.Property<int>("PreparationType")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.Property<bool>("STVO")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<decimal>("TemperaturAssembly")
|
b.Property<decimal>("TemperaturAssembly")
|
||||||
.HasColumnType("numeric");
|
.HasColumnType("numeric");
|
||||||
|
|
||||||
@@ -163,9 +162,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<decimal>("TemperatureSewer")
|
b.Property<decimal>("TemperatureSewer")
|
||||||
.HasColumnType("numeric");
|
.HasColumnType("numeric");
|
||||||
|
|
||||||
b.Property<bool>("WaterBaried")
|
|
||||||
.HasColumnType("boolean");
|
|
||||||
|
|
||||||
b.Property<string>("Weather")
|
b.Property<string>("Weather")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
@@ -184,9 +180,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
b.Property<string>("Name")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
@@ -195,8 +188,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
b.HasIndex("ClientId");
|
|
||||||
|
|
||||||
b.ToTable("Projects");
|
b.ToTable("Projects");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -241,6 +232,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<int>("DN")
|
b.Property<int>("DN")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("Hausnummer")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
b.Property<string>("Material")
|
b.Property<string>("Material")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
@@ -265,6 +259,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<int>("PunktUntenType")
|
b.Property<int>("PunktUntenType")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
|
|
||||||
|
b.Property<string>("SanNummer")
|
||||||
|
.HasColumnType("text");
|
||||||
|
|
||||||
b.Property<bool>("SewerActivated")
|
b.Property<bool>("SewerActivated")
|
||||||
.HasColumnType("boolean");
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
@@ -311,10 +308,16 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("DaSaSo.Domain.Model.Client", "Client")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ClientId");
|
||||||
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Project", "Project")
|
b.HasOne("DaSaSo.Domain.Model.Project", "Project")
|
||||||
.WithMany("BuildingSites")
|
.WithMany("BuildingSites")
|
||||||
.HasForeignKey("ProjectId");
|
.HasForeignKey("ProjectId");
|
||||||
|
|
||||||
|
b.Navigation("Client");
|
||||||
|
|
||||||
b.Navigation("Project");
|
b.Navigation("Project");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -327,15 +330,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Navigation("Impregnation");
|
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 =>
|
modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
|
b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
|
||||||
@@ -377,11 +371,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Navigation("SewerObjects");
|
b.Navigation("SewerObjects");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
|
|
||||||
{
|
|
||||||
b.Navigation("Projects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("BuildingSites");
|
b.Navigation("BuildingSites");
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace DaSaSo.EntityFramework.Migrations
|
||||||
|
{
|
||||||
|
public partial class RemoveClientAsDomain : Migration
|
||||||
|
{
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_Projects_Clients_ClientId",
|
||||||
|
table: "Projects");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_Projects_ClientId",
|
||||||
|
table: "Projects");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ClientId",
|
||||||
|
table: "Projects");
|
||||||
|
|
||||||
|
migrationBuilder.AlterColumn<DateOnly>(
|
||||||
|
name: "Date",
|
||||||
|
table: "Impregnations",
|
||||||
|
type: "date",
|
||||||
|
nullable: false,
|
||||||
|
oldClrType: typeof(DateTime),
|
||||||
|
oldType: "timestamp with time zone");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "ClientId",
|
||||||
|
table: "Buildingsites",
|
||||||
|
type: "integer",
|
||||||
|
nullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Buildingsites_ClientId",
|
||||||
|
table: "Buildingsites",
|
||||||
|
column: "ClientId");
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_Buildingsites_Clients_ClientId",
|
||||||
|
table: "Buildingsites",
|
||||||
|
column: "ClientId",
|
||||||
|
principalTable: "Clients",
|
||||||
|
principalColumn: "Id");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_Buildingsites_Clients_ClientId",
|
||||||
|
table: "Buildingsites");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_Buildingsites_ClientId",
|
||||||
|
table: "Buildingsites");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "ClientId",
|
||||||
|
table: "Buildingsites");
|
||||||
|
|
||||||
|
migrationBuilder.AddColumn<int>(
|
||||||
|
name: "ClientId",
|
||||||
|
table: "Projects",
|
||||||
|
type: "integer",
|
||||||
|
nullable: true);
|
||||||
|
|
||||||
|
migrationBuilder.AlterColumn<DateTime>(
|
||||||
|
name: "Date",
|
||||||
|
table: "Impregnations",
|
||||||
|
type: "timestamp with time zone",
|
||||||
|
nullable: false,
|
||||||
|
oldClrType: typeof(DateOnly),
|
||||||
|
oldType: "date");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_Projects_ClientId",
|
||||||
|
table: "Projects",
|
||||||
|
column: "ClientId");
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_Projects_Clients_ClientId",
|
||||||
|
table: "Projects",
|
||||||
|
column: "ClientId",
|
||||||
|
principalTable: "Clients",
|
||||||
|
principalColumn: "Id");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,6 +33,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<string>("BuildingSiteNumber")
|
b.Property<string>("BuildingSiteNumber")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
|
b.Property<int?>("ClientId")
|
||||||
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.Property<string>("ContactPerson")
|
b.Property<string>("ContactPerson")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
@@ -44,6 +47,8 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ClientId");
|
||||||
|
|
||||||
b.HasIndex("ProjectId");
|
b.HasIndex("ProjectId");
|
||||||
|
|
||||||
b.ToTable("Buildingsites");
|
b.ToTable("Buildingsites");
|
||||||
@@ -88,8 +93,8 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<int>("DN")
|
b.Property<int>("DN")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
b.Property<DateOnly>("Date")
|
||||||
.HasColumnType("timestamp with time zone");
|
.HasColumnType("date");
|
||||||
|
|
||||||
b.Property<bool>("IsAvaible")
|
b.Property<bool>("IsAvaible")
|
||||||
.HasColumnType("boolean");
|
.HasColumnType("boolean");
|
||||||
@@ -122,8 +127,8 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Property<bool>("ClosedEnd")
|
b.Property<bool>("ClosedEnd")
|
||||||
.HasColumnType("boolean");
|
.HasColumnType("boolean");
|
||||||
|
|
||||||
b.Property<DateTime>("Date")
|
b.Property<DateOnly>("Date")
|
||||||
.HasColumnType("timestamp with time zone");
|
.HasColumnType("date");
|
||||||
|
|
||||||
b.Property<int?>("ImpregnationId")
|
b.Property<int?>("ImpregnationId")
|
||||||
.HasColumnType("integer");
|
.HasColumnType("integer");
|
||||||
@@ -173,9 +178,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||||
|
|
||||||
b.Property<int?>("ClientId")
|
|
||||||
.HasColumnType("integer");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
b.Property<string>("Name")
|
||||||
.HasColumnType("text");
|
.HasColumnType("text");
|
||||||
|
|
||||||
@@ -184,8 +186,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
b.HasIndex("ClientId");
|
|
||||||
|
|
||||||
b.ToTable("Projects");
|
b.ToTable("Projects");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -306,10 +306,16 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("DaSaSo.Domain.Model.Client", "Client")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ClientId");
|
||||||
|
|
||||||
b.HasOne("DaSaSo.Domain.Model.Project", "Project")
|
b.HasOne("DaSaSo.Domain.Model.Project", "Project")
|
||||||
.WithMany("BuildingSites")
|
.WithMany("BuildingSites")
|
||||||
.HasForeignKey("ProjectId");
|
.HasForeignKey("ProjectId");
|
||||||
|
|
||||||
|
b.Navigation("Client");
|
||||||
|
|
||||||
b.Navigation("Project");
|
b.Navigation("Project");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -322,15 +328,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Navigation("Impregnation");
|
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 =>
|
modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
|
b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
|
||||||
@@ -372,11 +369,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
|||||||
b.Navigation("SewerObjects");
|
b.Navigation("SewerObjects");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
|
|
||||||
{
|
|
||||||
b.Navigation("Projects");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
|
||||||
{
|
{
|
||||||
b.Navigation("BuildingSites");
|
b.Navigation("BuildingSites");
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace DaSaSo.EntityFramework.Services
|
|||||||
public async Task<Client> Get(int id)
|
public async Task<Client> Get(int id)
|
||||||
{
|
{
|
||||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||||
Client entity = await context.Clients.Include(a => a.Projects).FirstOrDefaultAsync((e) => e.Id == id);
|
Client entity = await context.Clients.FirstOrDefaultAsync((e) => e.Id == id);
|
||||||
|
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|||||||
56
DaSaSo.EntityFramework/Services/ImpregnationDataService.cs
Normal file
56
DaSaSo.EntityFramework/Services/ImpregnationDataService.cs
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.Domain.Services;
|
||||||
|
using DaSaSo.EntityFramework.Services.Common;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace DaSaSo.EntityFramework.Services
|
||||||
|
{
|
||||||
|
public class ImpregnationDataService : IDataService<Impregnation>
|
||||||
|
{
|
||||||
|
private readonly DaSaSoDbContextFactory _contextFactory;
|
||||||
|
private readonly NonQueryDataService<Impregnation> _nonQueryDataService;
|
||||||
|
|
||||||
|
public ImpregnationDataService(DaSaSoDbContextFactory contextFactory)
|
||||||
|
{
|
||||||
|
_contextFactory = contextFactory;
|
||||||
|
_nonQueryDataService = new NonQueryDataService<Impregnation>(contextFactory);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Impregnation> Create(Impregnation entity)
|
||||||
|
{
|
||||||
|
return await _nonQueryDataService.Create(entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Impregnation CreateNonAsync(Impregnation entity)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<bool> Delete(int id)
|
||||||
|
{
|
||||||
|
return await _nonQueryDataService.Delete(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<Impregnation> Get(int id)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<IEnumerable<Impregnation>> GetAll()
|
||||||
|
{
|
||||||
|
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||||
|
IEnumerable<Impregnation> entities = await context.Impregnations.ToListAsync();
|
||||||
|
return entities;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<Impregnation> Update(int id, Impregnation entity)
|
||||||
|
{
|
||||||
|
return _nonQueryDataService.Update(id, entity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,22 +41,16 @@ namespace DaSaSo.EntityFramework.Services
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<IEnumerable<Project>> GetAllByClient(Client client)
|
|
||||||
|
public async Task<IEnumerable<Project>> GetAll()
|
||||||
{
|
{
|
||||||
// Get Clientid
|
|
||||||
int id = client.Id;
|
|
||||||
using(DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
using(DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||||
{
|
{
|
||||||
IEnumerable<Project> entities = await context.Projects.Where(x => x.Client.Id == id).ToListAsync();
|
IEnumerable<Project> entities = await context.Projects.ToListAsync();
|
||||||
return entities;
|
return entities;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<IEnumerable<Project>> GetAll()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<Project> Update(int id, Project entity)
|
public async Task<Project> Update(int id, Project entity)
|
||||||
{
|
{
|
||||||
return await _nonQueryDataService.Update(id, entity);
|
return await _nonQueryDataService.Update(id, entity);
|
||||||
|
|||||||
@@ -45,6 +45,8 @@ namespace DaSaSo.EntityFramework.Services
|
|||||||
.Include("PunktOben")
|
.Include("PunktOben")
|
||||||
.Include("PunktUnten")
|
.Include("PunktUnten")
|
||||||
.Include("SewerDamages")
|
.Include("SewerDamages")
|
||||||
|
.Include("PipeLiner")
|
||||||
|
.Include("PipeLiner.Impregnation")
|
||||||
.FirstOrDefaultAsync((e) => e.Id == id);
|
.FirstOrDefaultAsync((e) => e.Id == id);
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,12 +69,12 @@ namespace DaSaSo.ViewModel
|
|||||||
_renavigator = renavigator;
|
_renavigator = renavigator;
|
||||||
_model = actualProject.AktuellBaustelle;
|
_model = actualProject.AktuellBaustelle;
|
||||||
|
|
||||||
SaveBuildingsiteCommand = new RelayCommand(SaveBuildingsite);
|
SaveBuildingsiteCommand = new RelayCommand(SaveBuildingsiteAsync);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SaveBuildingsite()
|
private async void SaveBuildingsiteAsync()
|
||||||
{
|
{
|
||||||
_buildingsiteService.Update(Model.Id, Model);
|
await _buildingsiteService.Update(Model.Id, Model);
|
||||||
_renavigator.Renavigate();
|
_renavigator.Renavigate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ namespace DaSaSo.ViewModel
|
|||||||
private readonly IDataService<Client> _dataService;
|
private readonly IDataService<Client> _dataService;
|
||||||
bool _isLoading = true;
|
bool _isLoading = true;
|
||||||
|
|
||||||
public ICommand SelectCommand { get; set; }
|
|
||||||
public ICommand EditCommand { get; set; }
|
public ICommand EditCommand { get; set; }
|
||||||
public ICommand AddNewClientCommand { get; set; }
|
public ICommand AddNewClientCommand { get; set; }
|
||||||
|
|
||||||
@@ -63,7 +62,7 @@ namespace DaSaSo.ViewModel
|
|||||||
_dataService = dataService;
|
_dataService = dataService;
|
||||||
|
|
||||||
LoadClient();
|
LoadClient();
|
||||||
SelectCommand = new SelectClientCommand(dataService,actualProject, this);
|
|
||||||
EditCommand = new EditClientCommand(_dataService,actualProject, editRenavigator, this);
|
EditCommand = new EditClientCommand(_dataService,actualProject, editRenavigator, this);
|
||||||
AddNewClientCommand = new AddClientCommand(_dataService, actualProject, editRenavigator, this);
|
AddNewClientCommand = new AddClientCommand(_dataService, actualProject, editRenavigator, this);
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,12 @@ namespace DaSaSo.ViewModel.Commands
|
|||||||
private readonly IActualProject actualProject;
|
private readonly IActualProject actualProject;
|
||||||
private readonly IRenavigator addedNavigator;
|
private readonly IRenavigator addedNavigator;
|
||||||
|
|
||||||
|
|
||||||
public AddDamageCommand(IActualProject actualProject, IRenavigator addedNavigator)
|
public AddDamageCommand(IActualProject actualProject, IRenavigator addedNavigator)
|
||||||
{
|
{
|
||||||
this.actualProject = actualProject;
|
this.actualProject = actualProject;
|
||||||
this.addedNavigator = addedNavigator;
|
this.addedNavigator = addedNavigator;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override async Task ExecuteAsync(object? parameter)
|
public override async Task ExecuteAsync(object? parameter)
|
||||||
@@ -26,7 +28,9 @@ namespace DaSaSo.ViewModel.Commands
|
|||||||
//newSewerDamage.SewerObject = actualProject.AktuellSewerObject; // Führt zur Exception, dass EF versucht doppelte einträge vorzunehmen
|
//newSewerDamage.SewerObject = actualProject.AktuellSewerObject; // Führt zur Exception, dass EF versucht doppelte einträge vorzunehmen
|
||||||
|
|
||||||
actualProject.AktuellSewerObject.SewerDamages.Add(newSewerDamage);
|
actualProject.AktuellSewerObject.SewerDamages.Add(newSewerDamage);
|
||||||
actualProject.SetSewerDamage(actualProject.AktuellSewerObject.SewerDamages.Last());
|
SewerDamage? lastInsertedDamage = actualProject.AktuellSewerObject.SewerDamages.Last();
|
||||||
|
lastInsertedDamage.SewerObject = actualProject.AktuellSewerObject;
|
||||||
|
actualProject.SetSewerDamage(lastInsertedDamage);
|
||||||
|
|
||||||
|
|
||||||
//addedNavigator.Renavigate(); // Bug führt zur generellen umnavigation...
|
//addedNavigator.Renavigate(); // Bug führt zur generellen umnavigation...
|
||||||
|
|||||||
28
DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs
Normal file
28
DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.Domain.Services;
|
||||||
|
using DaSaSo.ViewModel.Interface;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace DaSaSo.ViewModel.Commands
|
||||||
|
{
|
||||||
|
internal class AddImpregnationCommand : AsyncCommandBase
|
||||||
|
{
|
||||||
|
private IDataService<Impregnation> impregnationService;
|
||||||
|
private IRenavigator editRenavigator;
|
||||||
|
|
||||||
|
public AddImpregnationCommand(IDataService<Impregnation> impregnationService, IRenavigator editRenavigator)
|
||||||
|
{
|
||||||
|
this.impregnationService = impregnationService;
|
||||||
|
this.editRenavigator = editRenavigator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Task ExecuteAsync(object? parameter)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,7 +29,7 @@ namespace DaSaSo.ViewModel.Commands
|
|||||||
|
|
||||||
public override async Task ExecuteAsync(object? parameter)
|
public override async Task ExecuteAsync(object? parameter)
|
||||||
{
|
{
|
||||||
Project pro = await _projectService.CreateProject(_actualProject.AktuellClient);
|
Project pro = await _projectService.CreateProject();
|
||||||
_actualProject.SetProject(pro);
|
_actualProject.SetProject(pro);
|
||||||
_renavigator.Renavigate();
|
_renavigator.Renavigate();
|
||||||
|
|
||||||
|
|||||||
37
DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs
Normal file
37
DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.Domain.Services;
|
||||||
|
using DaSaSo.ViewModel.Interface;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace DaSaSo.ViewModel.Commands
|
||||||
|
{
|
||||||
|
internal class EditImpregnationCommand : AsyncCommandBase
|
||||||
|
{
|
||||||
|
private IDataService<Impregnation> _impregnationService;
|
||||||
|
private ImpregnierungListViewModel _impregnierungListViewModel;
|
||||||
|
private IRenavigator _editRenavigator;
|
||||||
|
private IActualProject _actualProject;
|
||||||
|
|
||||||
|
public EditImpregnationCommand(
|
||||||
|
IDataService<Impregnation> impregnationService,
|
||||||
|
ImpregnierungListViewModel impregnierungListViewModel,
|
||||||
|
IActualProject actualProject,
|
||||||
|
IRenavigator editRenavigator)
|
||||||
|
{
|
||||||
|
_impregnationService = impregnationService;
|
||||||
|
_impregnierungListViewModel = impregnierungListViewModel;
|
||||||
|
_actualProject = actualProject;
|
||||||
|
_editRenavigator = editRenavigator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task ExecuteAsync(object? parameter)
|
||||||
|
{
|
||||||
|
_actualProject.SetImpregnation(_impregnierungListViewModel.SelectedImpregnation);
|
||||||
|
_editRenavigator.Renavigate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
28
DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs
Normal file
28
DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.Domain.Services;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace DaSaSo.ViewModel.Commands
|
||||||
|
{
|
||||||
|
internal class SaveImpregnationCommand : AsyncCommandBase
|
||||||
|
{
|
||||||
|
private IDataService<Impregnation> _impregnationService;
|
||||||
|
private ImpregnierungEditViewModel _impregnationEditViewModel;
|
||||||
|
|
||||||
|
public SaveImpregnationCommand(ImpregnierungEditViewModel impregnierungEditViewModel, IDataService<Impregnation> dataService)
|
||||||
|
{
|
||||||
|
_impregnationService = dataService;
|
||||||
|
_impregnationEditViewModel = impregnierungEditViewModel;
|
||||||
|
}
|
||||||
|
public override async Task ExecuteAsync(object? parameter)
|
||||||
|
{
|
||||||
|
_impregnationEditViewModel.Model = await _impregnationService.Update(_impregnationEditViewModel.Model.Id, _impregnationEditViewModel.Model);
|
||||||
|
Trace.WriteLine("Daten gespeichert");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,9 @@ namespace DaSaSo.ViewModel.Controls
|
|||||||
public bool Mechanisch { get; set; }
|
public bool Mechanisch { get; set; }
|
||||||
public bool Roboter { get; set; }
|
public bool Roboter { get; set; }
|
||||||
public bool Faekalienfrei { get; set; }
|
public bool Faekalienfrei { get; set; }
|
||||||
|
public bool Genehmigung { get; set; }
|
||||||
|
public bool WaterBaried { get; set; }
|
||||||
|
public bool STVO { get; set; }
|
||||||
|
|
||||||
public SewerPreperationControllViewModel(EPreparationType preparationType)
|
public SewerPreperationControllViewModel(EPreparationType preparationType)
|
||||||
{
|
{
|
||||||
@@ -20,6 +23,9 @@ namespace DaSaSo.ViewModel.Controls
|
|||||||
Mechanisch = preparationType.HasFlag(EPreparationType.CleanedMechanisch);
|
Mechanisch = preparationType.HasFlag(EPreparationType.CleanedMechanisch);
|
||||||
Roboter = preparationType.HasFlag(EPreparationType.CleanedRoboter);
|
Roboter = preparationType.HasFlag(EPreparationType.CleanedRoboter);
|
||||||
Faekalienfrei = preparationType.HasFlag(EPreparationType.FaekalienFrei);
|
Faekalienfrei = preparationType.HasFlag(EPreparationType.FaekalienFrei);
|
||||||
|
Genehmigung = preparationType.HasFlag(EPreparationType.PermitNeeded);
|
||||||
|
WaterBaried = preparationType.HasFlag(EPreparationType.WaterBaried);
|
||||||
|
STVO = preparationType.HasFlag(EPreparationType.STVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
public EPreparationType CalculatePreparationFlags()
|
public EPreparationType CalculatePreparationFlags()
|
||||||
@@ -29,6 +35,9 @@ namespace DaSaSo.ViewModel.Controls
|
|||||||
if (Mechanisch) result |= EPreparationType.CleanedMechanisch;
|
if (Mechanisch) result |= EPreparationType.CleanedMechanisch;
|
||||||
if (Roboter) result |= EPreparationType.CleanedRoboter;
|
if (Roboter) result |= EPreparationType.CleanedRoboter;
|
||||||
if (Faekalienfrei) result |= EPreparationType.FaekalienFrei;
|
if (Faekalienfrei) result |= EPreparationType.FaekalienFrei;
|
||||||
|
if (Genehmigung) result |= EPreparationType.PermitNeeded;
|
||||||
|
if (WaterBaried) result |= EPreparationType.WaterBaried;
|
||||||
|
if (STVO) result |= EPreparationType.STVO;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace DaSaSo.ViewModel.Controls
|
||||||
|
{
|
||||||
|
public class SewerRhebalationControllViewModel : BaseViewModel
|
||||||
|
{
|
||||||
|
public string Bediener
|
||||||
|
{
|
||||||
|
get => model.Operator;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(model.Operator != value)
|
||||||
|
{
|
||||||
|
model.Operator = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal TemperaturAussen
|
||||||
|
{
|
||||||
|
get => model.TemperatureOutdoors;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(model.TemperatureOutdoors != value)
|
||||||
|
{
|
||||||
|
model.TemperatureOutdoors = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal TemperaturSewer
|
||||||
|
{
|
||||||
|
get => model.TemperatureSewer;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(model.TemperatureSewer != value)
|
||||||
|
{
|
||||||
|
model.TemperatureSewer = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public string Weather
|
||||||
|
{
|
||||||
|
get => model.Weather;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(model.Weather != value)
|
||||||
|
{
|
||||||
|
model.Weather = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private DateTime _date;
|
||||||
|
public DateTime Datum
|
||||||
|
{
|
||||||
|
get => _date;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(_date != value)
|
||||||
|
{
|
||||||
|
_date = value;
|
||||||
|
model.Date = DateOnly.FromDateTime(_date);
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public SewerPreperationControllViewModel SewerPreperationControllViewModel { get; set; }
|
||||||
|
|
||||||
|
private PipeLiner model;
|
||||||
|
|
||||||
|
public SewerRhebalationControllViewModel(PipeLiner model)
|
||||||
|
{
|
||||||
|
this.model = model;
|
||||||
|
SewerPreperationControllViewModel = new SewerPreperationControllViewModel(model.PreparationType);
|
||||||
|
_date = model.Date.ToDateTime(new TimeOnly(0));
|
||||||
|
}
|
||||||
|
public override void Dispose()
|
||||||
|
{
|
||||||
|
model.PreparationType = SewerPreperationControllViewModel.CalculatePreparationFlags();
|
||||||
|
base.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ namespace DaSaSo.ViewModel.Factories
|
|||||||
private CreateViewModel<BuildingsiteListViewModel> _createBuildingsiteListViewModel;
|
private CreateViewModel<BuildingsiteListViewModel> _createBuildingsiteListViewModel;
|
||||||
private CreateViewModel<SewerObjectListViewModel> _createSewerObjectListViewModel;
|
private CreateViewModel<SewerObjectListViewModel> _createSewerObjectListViewModel;
|
||||||
private CreateViewModel<SewerMainListViewModel> _createSewerMainMenuListViewModel;
|
private CreateViewModel<SewerMainListViewModel> _createSewerMainMenuListViewModel;
|
||||||
|
private CreateViewModel<ImpregnierungListViewModel> _createImpregnierungListViewModel;
|
||||||
|
|
||||||
public MainWindowViewModelFactory(
|
public MainWindowViewModelFactory(
|
||||||
CreateViewModel<HomeViewModel> createHomeViewModel,
|
CreateViewModel<HomeViewModel> createHomeViewModel,
|
||||||
@@ -21,7 +22,8 @@ namespace DaSaSo.ViewModel.Factories
|
|||||||
CreateViewModel<ProjectListViewModel> createProjektListViewModel,
|
CreateViewModel<ProjectListViewModel> createProjektListViewModel,
|
||||||
CreateViewModel<BuildingsiteListViewModel> createBuildingsiteListViewModel,
|
CreateViewModel<BuildingsiteListViewModel> createBuildingsiteListViewModel,
|
||||||
CreateViewModel<SewerObjectListViewModel> createSewerObjectListViewModel,
|
CreateViewModel<SewerObjectListViewModel> createSewerObjectListViewModel,
|
||||||
CreateViewModel<SewerMainListViewModel> createSewerMainMenuListViewModel
|
CreateViewModel<SewerMainListViewModel> createSewerMainMenuListViewModel,
|
||||||
|
CreateViewModel<ImpregnierungListViewModel> createImpregnierungListViewModel
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_createHomeViewModel = createHomeViewModel;
|
_createHomeViewModel = createHomeViewModel;
|
||||||
@@ -31,6 +33,8 @@ namespace DaSaSo.ViewModel.Factories
|
|||||||
_createBuildingsiteListViewModel = createBuildingsiteListViewModel;
|
_createBuildingsiteListViewModel = createBuildingsiteListViewModel;
|
||||||
_createSewerObjectListViewModel = createSewerObjectListViewModel;
|
_createSewerObjectListViewModel = createSewerObjectListViewModel;
|
||||||
_createSewerMainMenuListViewModel = createSewerMainMenuListViewModel;
|
_createSewerMainMenuListViewModel = createSewerMainMenuListViewModel;
|
||||||
|
_createImpregnierungListViewModel = createImpregnierungListViewModel;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public BaseViewModel CreateViewModel(EMainWindowViewType viewType)
|
public BaseViewModel CreateViewModel(EMainWindowViewType viewType)
|
||||||
@@ -52,6 +56,9 @@ namespace DaSaSo.ViewModel.Factories
|
|||||||
return _createSewerObjectListViewModel();
|
return _createSewerObjectListViewModel();
|
||||||
case EMainWindowViewType.SewerMainMenu:
|
case EMainWindowViewType.SewerMainMenu:
|
||||||
return _createSewerMainMenuListViewModel();
|
return _createSewerMainMenuListViewModel();
|
||||||
|
case EMainWindowViewType.Impregnierung:
|
||||||
|
return _createImpregnierungListViewModel();
|
||||||
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
throw new ArgumentException("The Viewtype does not have a ViewModel.", "viewType");
|
throw new ArgumentException("The Viewtype does not have a ViewModel.", "viewType");
|
||||||
|
|||||||
67
DaSaSo.ViewModel/ImpregnierungEditViewModel.cs
Normal file
67
DaSaSo.ViewModel/ImpregnierungEditViewModel.cs
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.Domain.Services;
|
||||||
|
using DaSaSo.ViewModel.Commands;
|
||||||
|
using DaSaSo.ViewModel.Interface;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Input;
|
||||||
|
|
||||||
|
namespace DaSaSo.ViewModel
|
||||||
|
{
|
||||||
|
public class ImpregnierungEditViewModel : BaseViewModel
|
||||||
|
{
|
||||||
|
private Impregnation _model;
|
||||||
|
public ICommand SaveImpregnation { get; set; }
|
||||||
|
public Impregnation Model { get => _model; set => _model = value; }
|
||||||
|
|
||||||
|
public int DN
|
||||||
|
{
|
||||||
|
get => _model.DN;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_model.DN = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public string LinerCharge
|
||||||
|
{
|
||||||
|
get => _model.LinerNumber;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_model.LinerNumber = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal Wandstärke
|
||||||
|
{
|
||||||
|
get => _model.WallThickness;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_model.WallThickness = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal LinerLänge
|
||||||
|
{
|
||||||
|
get => _model.Linerlength;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_model.Linerlength = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public string Imprägniernummer
|
||||||
|
{
|
||||||
|
get => _model.Number;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
_model.Number = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ImpregnierungEditViewModel(IActualProject actualProject, IDataService<Impregnation> dataservice)
|
||||||
|
{
|
||||||
|
_model = actualProject.AktuellImpregnation;
|
||||||
|
SaveImpregnation = new SaveImpregnationCommand(this,dataservice);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
85
DaSaSo.ViewModel/ImpregnierungListViewModel.cs
Normal file
85
DaSaSo.ViewModel/ImpregnierungListViewModel.cs
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.Domain.Services;
|
||||||
|
using DaSaSo.ViewModel.Commands;
|
||||||
|
using DaSaSo.ViewModel.Interface;
|
||||||
|
using Microsoft.Toolkit.Mvvm.Input;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Input;
|
||||||
|
|
||||||
|
namespace DaSaSo.ViewModel
|
||||||
|
{
|
||||||
|
public class ImpregnierungListViewModel : BaseViewModel
|
||||||
|
{
|
||||||
|
public ObservableCollection<Impregnation> Impregnations { get; }
|
||||||
|
private readonly IDataService<Impregnation> _impregnationService;
|
||||||
|
private Impregnation? _selectedImpregnation = null;
|
||||||
|
public Impregnation? SelectedImpregnation
|
||||||
|
{
|
||||||
|
get => _selectedImpregnation;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(_selectedImpregnation != value)
|
||||||
|
{
|
||||||
|
_selectedImpregnation = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public ICommand EditImpregnationCommand { get; set; }
|
||||||
|
public ICommand AddImpregnationCommand { get; set; }
|
||||||
|
bool _isLoading;
|
||||||
|
|
||||||
|
public bool IsLoading {
|
||||||
|
get => _isLoading;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(_isLoading != value)
|
||||||
|
{
|
||||||
|
_isLoading = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ImpregnierungListViewModel(IDataService<Impregnation> impregnationService,IActualProject actualProject, IRenavigator editRenavigator)
|
||||||
|
{
|
||||||
|
IsLoading = true;
|
||||||
|
Impregnations = new ObservableCollection<Impregnation>();
|
||||||
|
_impregnationService = impregnationService;
|
||||||
|
AddImpregnationCommand = new RelayCommand(() =>
|
||||||
|
{
|
||||||
|
Impregnation newImpregnation = new Impregnation()
|
||||||
|
{
|
||||||
|
Number = "Neu bitte Editieren!"
|
||||||
|
};
|
||||||
|
SelectedImpregnation = newImpregnation;
|
||||||
|
Impregnations.Add(newImpregnation);
|
||||||
|
OnPropertyChanged("Impregnations");
|
||||||
|
});
|
||||||
|
|
||||||
|
//AddImpregnationCommand = //new AddImpregnationCommand(_impregnationService, editRenavigator);
|
||||||
|
EditImpregnationCommand = new EditImpregnationCommand(_impregnationService, this,actualProject, editRenavigator);
|
||||||
|
LoadImpregnations();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void LoadImpregnations()
|
||||||
|
{
|
||||||
|
var impregList = await _impregnationService.GetAll();
|
||||||
|
InitCollection(Impregnations, impregList);
|
||||||
|
IsLoading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitCollection(ObservableCollection<Impregnation> target, IEnumerable<Impregnation> source)
|
||||||
|
{
|
||||||
|
target.Clear();
|
||||||
|
foreach (var i in source)
|
||||||
|
target.Add(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,12 +19,14 @@ namespace DaSaSo.ViewModel.Interface
|
|||||||
Buildingsite AktuellBaustelle { get; }
|
Buildingsite AktuellBaustelle { get; }
|
||||||
SewerObject AktuellSewerObject { get; }
|
SewerObject AktuellSewerObject { get; }
|
||||||
SewerDamage AktuellSewerDamage { get; }
|
SewerDamage AktuellSewerDamage { get; }
|
||||||
|
Impregnation AktuellImpregnation { get; }
|
||||||
|
|
||||||
void SetClient(Client client, bool notification = true);
|
void SetClient(Client client, bool notification = true);
|
||||||
void SetProject(Project project, bool notification = true);
|
void SetProject(Project project, bool notification = true);
|
||||||
void SetBuildingSite(Buildingsite buildingsite);
|
void SetBuildingSite(Buildingsite buildingsite);
|
||||||
void SetSewerObject(SewerObject sewerObject, bool notification = true);
|
void SetSewerObject(SewerObject sewerObject, bool notification = true);
|
||||||
void SetSewerDamage(SewerDamage sewerDamage, bool notification = true);
|
void SetSewerDamage(SewerDamage sewerDamage, bool notification = true);
|
||||||
|
void SetImpregnation(Impregnation impregnation, bool notification = true);
|
||||||
void ResetProject();
|
void ResetProject();
|
||||||
void ResetBuildingSite();
|
void ResetBuildingSite();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,9 +56,10 @@ namespace DaSaSo.ViewModel
|
|||||||
LoadProjecte();
|
LoadProjecte();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadProjecte()
|
public async void LoadProjecte()
|
||||||
{
|
{
|
||||||
InitCollection(Projekte, actualProject.AktuellClient.Projects);
|
var projects = await genericDataService.GetAll();
|
||||||
|
InitCollection(Projekte, projects);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void InitCollection(ObservableCollection<Project> target, IEnumerable<Project> source)
|
private void InitCollection(ObservableCollection<Project> target, IEnumerable<Project> source)
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace DaSaSo.ViewModel
|
|||||||
private IActualProject ActualProject { get; set; }
|
private IActualProject ActualProject { get; set; }
|
||||||
public ICommand UpdateCurrentSewerViewModelCommand { get; }
|
public ICommand UpdateCurrentSewerViewModelCommand { get; }
|
||||||
public ICommand CloseCommand { get; set; }
|
public ICommand CloseCommand { get; set; }
|
||||||
public ICommand SchadenCommand { get; set; }
|
// public ICommand SchadenCommand { get; set; }
|
||||||
public ICommand Schlauchliner { get; set; }
|
public ICommand Schlauchliner { get; set; }
|
||||||
public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel;
|
public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
using System;
|
using DaSaSo.Domain.Model;
|
||||||
|
using DaSaSo.ViewModel.Controls;
|
||||||
|
using DaSaSo.ViewModel.Interface;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -8,5 +12,113 @@ namespace DaSaSo.ViewModel
|
|||||||
{
|
{
|
||||||
public class SewerPipeLinerViewModel : BaseViewModel
|
public class SewerPipeLinerViewModel : BaseViewModel
|
||||||
{
|
{
|
||||||
|
private SewerRhebalationControllViewModel _sewerRhebalationControllViewModel;
|
||||||
|
private PipeLiner _model;
|
||||||
|
|
||||||
|
public PipeLiner Model
|
||||||
|
{
|
||||||
|
get => _model;
|
||||||
|
set => _model = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Operator
|
||||||
|
{
|
||||||
|
get => Model.Operator;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(Model.Operator != value)
|
||||||
|
{
|
||||||
|
Model.Operator = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public bool ClosedEnd
|
||||||
|
{
|
||||||
|
get => Model.ClosedEnd;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(Model.ClosedEnd != value)
|
||||||
|
{
|
||||||
|
Model.ClosedEnd = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public bool Preliner
|
||||||
|
{
|
||||||
|
get => Model.Preliner;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(Model.Preliner != value)
|
||||||
|
{
|
||||||
|
Model.Preliner = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal EinbauTemperatur
|
||||||
|
{
|
||||||
|
get => Model.TemperaturAssembly;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(Model.TemperaturAssembly != value)
|
||||||
|
{
|
||||||
|
Model.TemperaturAssembly = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal LagerungTemperatur
|
||||||
|
{
|
||||||
|
get => Model.TemperaturStorage;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (Model.TemperaturStorage != value)
|
||||||
|
{
|
||||||
|
Model.TemperaturStorage = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public decimal EinbauDruck
|
||||||
|
{
|
||||||
|
get => Model.InversionPressure;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if(Model.InversionPressure != value)
|
||||||
|
{
|
||||||
|
Model.InversionPressure = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public SewerRhebalationControllViewModel SewerRhebalationControllViewModel
|
||||||
|
{
|
||||||
|
get => _sewerRhebalationControllViewModel;
|
||||||
|
set => _sewerRhebalationControllViewModel = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SewerPipeLinerViewModel(IActualProject actualProject)
|
||||||
|
{
|
||||||
|
|
||||||
|
if(actualProject.AktuellSewerObject.PipeLiner == null)
|
||||||
|
{
|
||||||
|
actualProject.AktuellSewerObject.PipeLiner = new PipeLiner();
|
||||||
|
}
|
||||||
|
Model = actualProject.AktuellSewerObject.PipeLiner;
|
||||||
|
SewerRhebalationControllViewModel = new SewerRhebalationControllViewModel(Model);
|
||||||
|
|
||||||
|
}
|
||||||
|
public override void Dispose()
|
||||||
|
{
|
||||||
|
// Todo Calculate SewerPreperation
|
||||||
|
//EPreparationType preparationFlags = SewerPreperationControllViewModel.CalculatePreparationFlags();
|
||||||
|
//Model.PreparationType = preparationFlags;
|
||||||
|
//SewerPreperationControllViewModel.Dispose();
|
||||||
|
//Debugger.Break();
|
||||||
|
SewerRhebalationControllViewModel.Dispose();
|
||||||
|
base.Dispose();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ namespace DaSaSo.ViewModel.State.ActualState
|
|||||||
public Buildingsite? AktuellBaustelle { get; private set; }
|
public Buildingsite? AktuellBaustelle { get; private set; }
|
||||||
public Project? AktuellProjekt { get; private set; }
|
public Project? AktuellProjekt { get; private set; }
|
||||||
public SewerObject? AktuellSewerObject { get; private set; }
|
public SewerObject? AktuellSewerObject { get; private set; }
|
||||||
|
|
||||||
public SewerDamage? AktuellSewerDamage { get; private set; }
|
public SewerDamage? AktuellSewerDamage { get; private set; }
|
||||||
|
public Impregnation? AktuellImpregnation { get; private set; }
|
||||||
|
|
||||||
|
|
||||||
#region events
|
#region events
|
||||||
@@ -57,7 +57,6 @@ namespace DaSaSo.ViewModel.State.ActualState
|
|||||||
|
|
||||||
public void SetProject(Project project, bool notification = true)
|
public void SetProject(Project project, bool notification = true)
|
||||||
{
|
{
|
||||||
|
|
||||||
AktuellProjekt = project;
|
AktuellProjekt = project;
|
||||||
if(notification)
|
if(notification)
|
||||||
OnProjectChanged();
|
OnProjectChanged();
|
||||||
@@ -76,7 +75,12 @@ namespace DaSaSo.ViewModel.State.ActualState
|
|||||||
OnSewerObjectChanged();
|
OnSewerObjectChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetImpregnation(Impregnation impregnation, bool notification = true)
|
||||||
|
{
|
||||||
|
AktuellImpregnation = impregnation;
|
||||||
|
if (notification)
|
||||||
|
return; // TODO notification wird aktuell nicht benötigt
|
||||||
|
}
|
||||||
public void ResetProject()
|
public void ResetProject()
|
||||||
{
|
{
|
||||||
SetProject(null);
|
SetProject(null);
|
||||||
|
|||||||
@@ -37,10 +37,10 @@ namespace DaSaSo.ViewModel
|
|||||||
|
|
||||||
private string _clientname = "";
|
private string _clientname = "";
|
||||||
private string _projektname = "";
|
private string _projektname = "";
|
||||||
|
private string _projektnummer = "";
|
||||||
private string _buildingsitename = "";
|
private string _buildingsitename = "";
|
||||||
private readonly RegistryKey? registry;
|
private RegistryKey? registry;
|
||||||
const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
|
const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
|
||||||
public bool CanSelectProject { get => _actualProject.AktuellClient != null; }
|
|
||||||
public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; }
|
public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; }
|
||||||
public bool CanSelectSewerObjects { get => _actualProject.AktuellBaustelle != null; }
|
public bool CanSelectSewerObjects { get => _actualProject.AktuellBaustelle != null; }
|
||||||
|
|
||||||
@@ -73,6 +73,18 @@ namespace DaSaSo.ViewModel
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public string Projektnummer
|
||||||
|
{
|
||||||
|
get => _projektnummer;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (_projektnummer != value)
|
||||||
|
{
|
||||||
|
_projektnummer = value;
|
||||||
|
OnPropertyChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
public string Buildingsitename
|
public string Buildingsitename
|
||||||
{
|
{
|
||||||
get => _buildingsitename;
|
get => _buildingsitename;
|
||||||
@@ -124,7 +136,6 @@ namespace DaSaSo.ViewModel
|
|||||||
UpdateCurrentViewModelCommand = new UpdateCurrentViewModelCommand(navigator, viewModelFactory);
|
UpdateCurrentViewModelCommand = new UpdateCurrentViewModelCommand(navigator, viewModelFactory);
|
||||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Home);
|
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Home);
|
||||||
_actualProject = actualProject;
|
_actualProject = actualProject;
|
||||||
_actualProject.ClientChanged += ActualProject_ClientChanged;
|
|
||||||
_actualProject.ProjectChanged += ActualProject_ProjectChanged;
|
_actualProject.ProjectChanged += ActualProject_ProjectChanged;
|
||||||
_actualProject.BuildingSiteChanged += ActualProject_BuildingSiteChanged;
|
_actualProject.BuildingSiteChanged += ActualProject_BuildingSiteChanged;
|
||||||
_actualProject.SewerObjectChanged += ActualProject_SewerObjectChanged;
|
_actualProject.SewerObjectChanged += ActualProject_SewerObjectChanged;
|
||||||
@@ -177,7 +188,7 @@ namespace DaSaSo.ViewModel
|
|||||||
|
|
||||||
private void InitRegistry()
|
private void InitRegistry()
|
||||||
{
|
{
|
||||||
Registry.CurrentUser.CreateSubKey("Software\\Cosysda\\DaSaSo");
|
registry = Registry.CurrentUser.CreateSubKey("Software\\Cosysda\\DaSaSo");
|
||||||
LadeRegistry();
|
LadeRegistry();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,16 +214,9 @@ namespace DaSaSo.ViewModel
|
|||||||
{
|
{
|
||||||
SaveInRegistry("lastproject", _actualProject.AktuellProjekt.Id.ToString());
|
SaveInRegistry("lastproject", _actualProject.AktuellProjekt.Id.ToString());
|
||||||
Projektname = _actualProject.AktuellProjekt.Name;
|
Projektname = _actualProject.AktuellProjekt.Name;
|
||||||
|
Projektnummer = _actualProject.AktuellProjekt.Projektnummer;
|
||||||
OnPropertyChanged(nameof(CanSelectBuildingSite));
|
OnPropertyChanged(nameof(CanSelectBuildingSite));
|
||||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Buildingsites);
|
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Buildingsites);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ActualProject_ClientChanged(object? sender, EventArgs e)
|
|
||||||
{
|
|
||||||
SaveInRegistry("lastclient", _actualProject.AktuellClient.Id.ToString());
|
|
||||||
ClientName = _actualProject.AktuellClient.Firstname;
|
|
||||||
OnPropertyChanged(nameof(CanSelectProject));
|
|
||||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Projects);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,119 +41,7 @@ namespace DaSaSo.Wpf
|
|||||||
.AddDBContext();
|
.AddDBContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* return Host.CreateDefaultBuilder(args)
|
|
||||||
.ConfigureAppConfiguration(c=>
|
|
||||||
{
|
|
||||||
c.AddJsonFile("appsettings.json");
|
|
||||||
c.AddEnvironmentVariables();
|
|
||||||
})
|
|
||||||
.ConfigureServices((context, services) =>
|
|
||||||
{
|
|
||||||
|
|
||||||
string connectionString = context.Configuration.GetConnectionString("default");
|
|
||||||
|
|
||||||
services.AddDbContext<DaSaSoDbContext>(o => o.UseSqlServer(connectionString));
|
|
||||||
services.AddSingleton<DaSaSoDbContextFactory>(new DaSaSoDbContextFactory(connectionString));
|
|
||||||
|
|
||||||
services.AddSingleton<IDataService<Client>, ClientDataService>();
|
|
||||||
services.AddSingleton<IDataService<Project>, ProjectDataService>();
|
|
||||||
services.AddSingleton<IDataService<Buildingsite>, BuildingsiteDataService>();
|
|
||||||
services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
|
|
||||||
services.AddSingleton<ClientListViewModel>();
|
|
||||||
services.AddSingleton<IProjectService, ProjectService>();
|
|
||||||
services.AddSingleton<IBuildingsiteService, BuildingsiteService>();
|
|
||||||
services.AddSingleton<ISewerObjectService, SewerObjectService>();
|
|
||||||
|
|
||||||
|
|
||||||
services.AddSingleton<IViewModelAbstractFactory, MainWindowViewModelFactory>();
|
|
||||||
services.AddSingleton<IViewModelSewerMainFactory, SewerWindowViewModelFactory>();
|
|
||||||
services.AddSingleton<CreateViewModel<ClientEditViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new ClientEditViewModel(
|
|
||||||
services.GetRequiredService<IDataService<Client>>(),
|
|
||||||
services.GetRequiredService<IActualProject>(),
|
|
||||||
new ViewModelDelegateRenavigator(
|
|
||||||
services.GetRequiredService<IMainWindowNavigator>()
|
|
||||||
));
|
|
||||||
});
|
|
||||||
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new HomeViewModel();
|
|
||||||
});
|
|
||||||
services.AddSingleton<CreateViewModel<SewerStammdatenViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new SewerStammdatenViewModel(
|
|
||||||
services.GetRequiredService<IActualProject>()
|
|
||||||
);
|
|
||||||
});
|
|
||||||
services.AddSingleton<CreateViewModel<SewerDamageListViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new SewerDamageListViewModel();
|
|
||||||
});
|
|
||||||
|
|
||||||
services.AddSingleton<CreateViewModel<ClientListViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new ClientListViewModel(
|
|
||||||
services.GetRequiredService<IDataService<Client>>(),
|
|
||||||
services.GetRequiredService<IActualProject>(),
|
|
||||||
new ViewModelDelegateRenavigator(
|
|
||||||
services.GetRequiredService<IMainWindowNavigator>()
|
|
||||||
));
|
|
||||||
});
|
|
||||||
services.AddSingleton<CreateViewModel<SewerMainListViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new SewerMainListViewModel(
|
|
||||||
services.GetRequiredService<IDataService<SewerObject>>(),
|
|
||||||
services.GetRequiredService<ISewerMainNavigator>(),
|
|
||||||
services.GetRequiredService<IActualProject>(),
|
|
||||||
services.GetRequiredService<IViewModelSewerMainFactory>(),
|
|
||||||
new ViewModelDelegateRenavigator(
|
|
||||||
services.GetRequiredService<IMainWindowNavigator>()
|
|
||||||
),
|
|
||||||
services.GetRequiredService<ISewerObjectService>()
|
|
||||||
);
|
|
||||||
});
|
|
||||||
services.AddSingleton<CreateViewModel<ProjectListViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new ProjectListViewModel(
|
|
||||||
services.GetRequiredService<IDataService<Project>>(),
|
|
||||||
services.GetRequiredService<IActualProject>(),
|
|
||||||
new ViewModelDelegateRenavigator(
|
|
||||||
services.GetRequiredService<IMainWindowNavigator>()),
|
|
||||||
services.GetRequiredService<IProjectService>()
|
|
||||||
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
services.AddSingleton<CreateViewModel<BuildingsiteListViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new BuildingsiteListViewModel(
|
|
||||||
services.GetRequiredService<IDataService<Buildingsite>>(),
|
|
||||||
services.GetRequiredService<IActualProject>(),
|
|
||||||
new ViewModelDelegateRenavigator(
|
|
||||||
services.GetRequiredService<IMainWindowNavigator>()),
|
|
||||||
services.GetRequiredService<IBuildingsiteService>()
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
services.AddSingleton<CreateViewModel<SewerObjectListViewModel>>(services =>
|
|
||||||
{
|
|
||||||
return () => new SewerObjectListViewModel(
|
|
||||||
services.GetRequiredService<IDataService<SewerObject>>(),
|
|
||||||
services.GetRequiredService<IActualProject>(),
|
|
||||||
services.GetRequiredService<ISewerObjectService>()
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
//services.AddSingleton<INavigator, Navigator>();
|
|
||||||
services.AddScoped<IActualProject, ActualProject>();
|
|
||||||
services.AddScoped<IMainWindowNavigator, MainWindowNavigator>();
|
|
||||||
services.AddScoped<ISewerMainNavigator, SewerMainNavigator>();
|
|
||||||
|
|
||||||
services.AddScoped<MainWindowViewModel>();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
protected override void OnStartup(StartupEventArgs e)
|
protected override void OnStartup(StartupEventArgs e)
|
||||||
{
|
{
|
||||||
Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
|
Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
|
||||||
@@ -165,6 +53,7 @@ namespace DaSaSo.Wpf
|
|||||||
using (DaSaSoDbContext context = contextFactory.CreateDbContext())
|
using (DaSaSoDbContext context = contextFactory.CreateDbContext())
|
||||||
{
|
{
|
||||||
context.Database.Migrate();
|
context.Database.Migrate();
|
||||||
|
|
||||||
}
|
}
|
||||||
MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService<MainWindowViewModel>() };
|
MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService<MainWindowViewModel>() };
|
||||||
window.Show();
|
window.Show();
|
||||||
@@ -176,7 +65,7 @@ namespace DaSaSo.Wpf
|
|||||||
|
|
||||||
protected override async void OnExit(ExitEventArgs e)
|
protected override async void OnExit(ExitEventArgs e)
|
||||||
{
|
{
|
||||||
_host.StopAsync();
|
await _host.StopAsync();
|
||||||
_host.Dispose();
|
_host.Dispose();
|
||||||
base.OnExit(e);
|
base.OnExit(e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
|
xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
|
||||||
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="300" d:DesignWidth="200">
|
d:DesignHeight="375" d:DesignWidth="200">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
<converters:EqualValueToParameterConverter x:Key="EqualValueToParameterConverter" />
|
<converters:EqualValueToParameterConverter x:Key="EqualValueToParameterConverter" />
|
||||||
<converters:EqualValueToBooleanConverter x:Key="EqualValueToBooleanConverter" />
|
<converters:EqualValueToBooleanConverter x:Key="EqualValueToBooleanConverter" />
|
||||||
@@ -21,13 +21,14 @@
|
|||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<RadioButton Grid.Row="0" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ClientListViewModel}}" Content="Kunden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="True" CommandParameter="{x:Static nav:EMainWindowViewType.Clients}"/>
|
<RadioButton Grid.Row="0" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ProjectListViewModel}}" Content="Projekte" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EMainWindowViewType.Projects}" />
|
||||||
<RadioButton Grid.Row="1" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ProjectListViewModel}}" Content="Projekte" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectProject}" CommandParameter="{x:Static nav:EMainWindowViewType.Projects}" />
|
<RadioButton Grid.Row="1" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:BuildingsiteListViewModel}}" Content="Baustellen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectBuildingSite}" CommandParameter="{x:Static nav:EMainWindowViewType.Buildingsites}" />
|
||||||
<RadioButton Grid.Row="2" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:BuildingsiteListViewModel}}" Content="Baustellen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectBuildingSite}" CommandParameter="{x:Static nav:EMainWindowViewType.Buildingsites}" />
|
<RadioButton Grid.Row="2" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:SewerObjectListViewModel}}" Content="Objekten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectSewerObjects}" CommandParameter="{x:Static nav:EMainWindowViewType.SewerObjects}" />
|
||||||
<RadioButton Grid.Row="3" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:SewerObjectListViewModel}}" Content="Objekten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectSewerObjects}" CommandParameter="{x:Static nav:EMainWindowViewType.SewerObjects}" />
|
<RadioButton Grid.Row="3" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ClientListViewModel}}" Content="Kunden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="True" CommandParameter="{x:Static nav:EMainWindowViewType.Clients}"/>
|
||||||
|
<RadioButton Grid.Row="4" IsChecked="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToParameterConverter}, ConverterParameter={x:Type viewmodel:ImpregnierungListViewModel}}" Content="Imprägnierungen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EMainWindowViewType.Impregnierung}" />
|
||||||
<Border Grid.RowSpan="4" Background="LightBlue" Visibility="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToBooleanConverter}, ConverterParameter={x:Type viewmodel:SewerMainListViewModel}}" d:Visibility="Hidden">
|
<Border Grid.RowSpan="5" Background="LightBlue" Visibility="{Binding CurrentViewModel, Mode=OneWay, Converter={StaticResource EqualValueToBooleanConverter}, ConverterParameter={x:Type viewmodel:SewerMainListViewModel}}" d:Visibility="Hidden">
|
||||||
<TextBlock Foreground="WhiteSmoke" FontSize="18" Text="Editing Sewer" />
|
<TextBlock Foreground="WhiteSmoke" FontSize="18" Text="Editing Sewer" />
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -28,6 +28,12 @@
|
|||||||
<Compile Update="View\HomeView.xaml.cs">
|
<Compile Update="View\HomeView.xaml.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Update="View\Impregnation\ImpregnationEditView.xaml.cs">
|
||||||
|
<SubType>Code</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Update="View\Impregnation\ImpregnationListView.xaml.cs">
|
||||||
|
<SubType>Code</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Update="View\Project\ProjectEditView.xaml.cs">
|
<Compile Update="View\Project\ProjectEditView.xaml.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -90,6 +96,12 @@
|
|||||||
<Page Update="View\HomeView.xaml">
|
<Page Update="View\HomeView.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Update="View\Impregnation\ImpregnationEditView.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</Page>
|
||||||
|
<Page Update="View\Impregnation\ImpregnationListView.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</Page>
|
||||||
<Page Update="View\Project\ProjectEditView.xaml">
|
<Page Update="View\Project\ProjectEditView.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
|
|||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -20,6 +21,7 @@ namespace DaSaSo.Wpf.HostBuilders
|
|||||||
string connectionString = "";
|
string connectionString = "";
|
||||||
Action<DbContextOptionsBuilder> configureDbContext = null;
|
Action<DbContextOptionsBuilder> configureDbContext = null;
|
||||||
string databaseToUse = context.Configuration.GetConnectionString("databaseToUse");
|
string databaseToUse = context.Configuration.GetConnectionString("databaseToUse");
|
||||||
|
Trace.WriteLine(databaseToUse);
|
||||||
if(databaseToUse.Equals("default"))
|
if(databaseToUse.Equals("default"))
|
||||||
{
|
{
|
||||||
connectionString = context.Configuration.GetConnectionString("default");
|
connectionString = context.Configuration.GetConnectionString("default");
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ namespace DaSaSo.Wpf.HostBuilders
|
|||||||
services.AddTransient<IDataService<Buildingsite>, BuildingsiteDataService>();
|
services.AddTransient<IDataService<Buildingsite>, BuildingsiteDataService>();
|
||||||
services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
|
services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
|
||||||
services.AddSingleton<IDataService<SewerPoint>, SewerpointDataService>();
|
services.AddSingleton<IDataService<SewerPoint>, SewerpointDataService>();
|
||||||
|
services.AddSingleton<IDataService<Impregnation>, ImpregnationDataService>();
|
||||||
services.AddSingleton<IProjectService, ProjectService>();
|
services.AddSingleton<IProjectService, ProjectService>();
|
||||||
services.AddSingleton<IBuildingsiteService, BuildingsiteService>();
|
services.AddSingleton<IBuildingsiteService, BuildingsiteService>();
|
||||||
services.AddSingleton<ISewerObjectService, SewerObjectService>();
|
services.AddSingleton<ISewerObjectService, SewerObjectService>();
|
||||||
|
|||||||
@@ -40,6 +40,8 @@ namespace DaSaSo.Wpf.HostBuilders
|
|||||||
services.AddSingleton<ViewModelDelegateRenavigator<SewerObjectListViewModel>>();
|
services.AddSingleton<ViewModelDelegateRenavigator<SewerObjectListViewModel>>();
|
||||||
services.AddTransient<ViewModelDelegateRenavigator<SewerDamageEditViewModel>>();
|
services.AddTransient<ViewModelDelegateRenavigator<SewerDamageEditViewModel>>();
|
||||||
|
|
||||||
|
services.AddSingleton<ViewModelDelegateRenavigator<ImpregnierungEditViewModel>>();
|
||||||
|
|
||||||
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
|
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
|
||||||
{
|
{
|
||||||
return () => new HomeViewModel();
|
return () => new HomeViewModel();
|
||||||
@@ -66,6 +68,23 @@ namespace DaSaSo.Wpf.HostBuilders
|
|||||||
{
|
{
|
||||||
return () => new HomeViewModel();
|
return () => new HomeViewModel();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
services.AddSingleton<CreateViewModel<ImpregnierungListViewModel>>(services =>
|
||||||
|
{
|
||||||
|
return () => new ImpregnierungListViewModel(
|
||||||
|
services.GetRequiredService<IDataService<Impregnation>>(),
|
||||||
|
services.GetRequiredService<IActualProject>(),
|
||||||
|
services.GetRequiredService<ViewModelDelegateRenavigator<ImpregnierungEditViewModel>>()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
services.AddTransient<CreateViewModel<ImpregnierungEditViewModel>>(services =>
|
||||||
|
{
|
||||||
|
return () => new ImpregnierungEditViewModel(
|
||||||
|
services.GetRequiredService<IActualProject>(),
|
||||||
|
services.GetRequiredService<IDataService<Impregnation>>()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
services.AddTransient<CreateViewModel<SewerStammdatenViewModel>>(services =>
|
services.AddTransient<CreateViewModel<SewerStammdatenViewModel>>(services =>
|
||||||
{
|
{
|
||||||
return () => new SewerStammdatenViewModel(
|
return () => new SewerStammdatenViewModel(
|
||||||
@@ -90,7 +109,9 @@ namespace DaSaSo.Wpf.HostBuilders
|
|||||||
});
|
});
|
||||||
services.AddTransient<CreateViewModel<SewerPipeLinerViewModel>>(services =>
|
services.AddTransient<CreateViewModel<SewerPipeLinerViewModel>>(services =>
|
||||||
{
|
{
|
||||||
return () => new SewerPipeLinerViewModel();
|
return () => new SewerPipeLinerViewModel(
|
||||||
|
services.GetRequiredService<IActualProject>()
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
services.AddTransient<CreateViewModel<ClientListViewModel>>(services =>
|
services.AddTransient<CreateViewModel<ClientListViewModel>>(services =>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Text="Kundenliste" />
|
<TextBlock Text="Kundenliste" />
|
||||||
<ListView Margin="20" ItemsSource="{Binding Clients}" DisplayMemberPath="Firstname" SelectedItem="{Binding SelectedClient, Mode=TwoWay}"/>
|
<ListView Margin="20" ItemsSource="{Binding Clients}" DisplayMemberPath="Firstname" SelectedItem="{Binding SelectedClient, Mode=TwoWay}"/>
|
||||||
<Button Content="Kunde auswählen" Command="{Binding SelectCommand}" />
|
|
||||||
<Button Content="Kunde Editieren" Command="{Binding EditCommand}"/>
|
<Button Content="Kunde Editieren" Command="{Binding EditCommand}"/>
|
||||||
<Button Content="Kunde Hinzufügen" Command="{Binding AddNewClientCommand}" />
|
<Button Content="Kunde Hinzufügen" Command="{Binding AddNewClientCommand}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
42
DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml
Normal file
42
DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
<UserControl x:Class="DaSaSo.Wpf.View.Impregnation.ImpregnationEditView"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungEditViewModel}"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
d:DesignHeight="450" d:DesignWidth="800">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition />
|
||||||
|
<ColumnDefinition />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Label Grid.Column="0" Grid.Row="0" Content="Imprägniernummer" />
|
||||||
|
<Label Grid.Column="0" Grid.Row="1" Content="Linercharge" />
|
||||||
|
<Label Grid.Column="0" Grid.Row="2" Content="Liner Länge" />
|
||||||
|
<Label Grid.Column="0" Grid.Row="3" Content="Durchmesser" />
|
||||||
|
<Label Grid.Column="0" Grid.Row="4" Content="Wandstärke" />
|
||||||
|
<Label Grid.Column="0" Grid.Row="5" Content="Datum" />
|
||||||
|
<Label Grid.Column="0" Grid.Row="6" Content="Vorhanden" />
|
||||||
|
|
||||||
|
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Imprägniernummer}" />
|
||||||
|
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding LinerCharge}" />
|
||||||
|
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding LinerLänge}" />
|
||||||
|
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding DN}" />
|
||||||
|
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Wandstärke}" />
|
||||||
|
<TextBox Grid.Column="1" Grid.Row="5" Text="" />
|
||||||
|
<CheckBox Grid.Column="1" Grid.Row="6" Content="Ja" Style="{StaticResource checkBoxCircleSmall}"/>
|
||||||
|
|
||||||
|
<Button Grid.Row="7" Grid.ColumnSpan="2" Content="Speichern" Command="{Binding SaveImpregnation}" />
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
28
DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml.cs
Normal file
28
DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml.cs
Normal 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.Impregnation
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interaction logic for ImpregnationEditView.xaml
|
||||||
|
/// </summary>
|
||||||
|
public partial class ImpregnationEditView : UserControl
|
||||||
|
{
|
||||||
|
public ImpregnationEditView()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
23
DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml
Normal file
23
DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
<UserControl x:Class="DaSaSo.Wpf.View.Impregnation.ImpregnationListView"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungListViewModel}"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
d:DesignHeight="450" d:DesignWidth="800">
|
||||||
|
<UserControl.Resources>
|
||||||
|
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
||||||
|
</UserControl.Resources>
|
||||||
|
<Grid>
|
||||||
|
<StackPanel>
|
||||||
|
<TextBlock Text="Imprägnierungen" />
|
||||||
|
<ListView ItemsSource="{Binding Impregnations}" DisplayMemberPath="Number" SelectedItem="{Binding SelectedImpregnation, Mode=TwoWay}" />
|
||||||
|
<Button Content="Editieren" Command="{Binding EditImpregnationCommand}" CommandParameter="{Binding SelectedImpregnation}" />
|
||||||
|
<Button Content="Neue Hinzufügen" Command="{Binding AddImpregnationCommand}" />
|
||||||
|
</StackPanel>
|
||||||
|
<Border Background="Gray" d:Visibility="Hidden" Visibility="{Binding IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
|
||||||
|
<TextBlock Foreground="White" FontSize="40" Text="Loading" />
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</UserControl>
|
||||||
28
DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml.cs
Normal file
28
DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml.cs
Normal 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.Impregnation
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interaction logic for ImpregnationListView.xaml
|
||||||
|
/// </summary>
|
||||||
|
public partial class ImpregnationListView : UserControl
|
||||||
|
{
|
||||||
|
public ImpregnationListView()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,11 +18,11 @@
|
|||||||
<StackPanel>
|
<StackPanel>
|
||||||
<CheckBox Margin="5" Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" />
|
<CheckBox Margin="5" Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" />
|
||||||
<CheckBox Margin="5" Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
|
<CheckBox Margin="5" Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
|
||||||
<CheckBox Margin="5" Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
|
<CheckBox Margin="5" Content="Mit Roboter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
|
||||||
<CheckBox Margin="5" Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
|
<CheckBox Margin="5" Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
|
||||||
<CheckBox Margin="5" Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" />
|
<CheckBox Margin="5" Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Genehmigung}" />
|
||||||
<CheckBox Margin="5" Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" />
|
<CheckBox Margin="5" Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding WaterBaried}" />
|
||||||
<CheckBox Margin="5" Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" />
|
<CheckBox Margin="5" Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding STVO}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls"
|
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="450" d:DesignWidth="800">
|
d:DesignHeight="450" d:DesignWidth="800">
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border>
|
<Border>
|
||||||
<local:SewerDamagePreparation />
|
<local:SewerDamagePreparation DataContext="{Binding SewerPreperationControllViewModel}" />
|
||||||
</Border>
|
</Border>
|
||||||
<Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
|
<Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
|
||||||
<Grid Grid.Column="1" Background="LightBlue">
|
<Grid Grid.Column="1" Background="LightBlue">
|
||||||
@@ -21,21 +21,23 @@
|
|||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
|
<RowDefinition Height="auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="0" Content="Operator" />
|
<Label Margin="5" Grid.Column="0" Grid.Row="0" Content="Operator" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="1" Content="Datum" />
|
<Label Margin="5" Grid.Column="0" Grid.Row="1" Content="Datum" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
|
<Label Margin="5" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="3" Content="Temperatur Kanal" />
|
<Label Margin="5" Grid.Column="0" Grid.Row="3" Content="Temperatur Kanal" />
|
||||||
|
<Label Margin="5" Grid.Column="0" Grid.Row="4" Content="Wetter" />
|
||||||
|
|
||||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="20" />
|
<TextBox Grid.Column="1" Grid.Row="0" Margin="5" Text="{Binding Bediener}" />
|
||||||
<!--<TextBox Grid.Column="1" Grid.Row="1" Margin="20" />-->
|
<DatePicker Grid.Column="1" Grid.Row="1" Margin="5" SelectedDate="{Binding Datum}" />
|
||||||
<DatePicker Grid.Column="1" Grid.Row="1" Margin="20" />
|
<TextBox Grid.Column="1" Grid.Row="2" Margin="5" Text="{Binding TemperaturAussen}" />
|
||||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="20" />
|
<TextBox Grid.Column="1" Grid.Row="3" Margin="5" Text="{Binding TemperaturSewer}" />
|
||||||
<TextBox Grid.Column="1" Grid.Row="3" Margin="20" />
|
<TextBox Grid.Column="1" Grid.Row="4" Margin="5" Text="{Binding Weather}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -4,16 +4,15 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject"
|
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject"
|
||||||
xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls"
|
xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d" d:DesignWidth="800" Height="722">
|
||||||
d:DesignHeight="450" d:DesignWidth="800">
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Border Grid.Row="0">
|
<Border Grid.Row="0">
|
||||||
<controls:SewerRehabilation />
|
<controls:SewerRehabilation DataContext="{Binding SewerRhebalationControllViewModel}" />
|
||||||
</Border>
|
</Border>
|
||||||
<Border BorderBrush="Black" BorderThickness="2" Grid.Row="1">
|
<Border BorderBrush="Black" BorderThickness="2" Grid.Row="1">
|
||||||
<Grid Background="LightBlue">
|
<Grid Background="LightBlue">
|
||||||
@@ -25,24 +24,24 @@
|
|||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition Height="auto" />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition />
|
<RowDefinition Height="auto" />
|
||||||
<RowDefinition />
|
<RowDefinition Height="auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
|
<Label Margin="10" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
|
<Label Margin="10" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
|
<Label Margin="10" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
|
<Label Margin="10" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
|
<Label Margin="10" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
|
||||||
<Label Margin="20" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
|
<Label Margin="10" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
|
||||||
|
|
||||||
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="20" Content="Ja" />
|
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="10" Content="Ja" IsChecked="{Binding ClosedEnd}" />
|
||||||
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="20" Content="Ja" />
|
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="10" Content="Ja" IsChecked="{Binding Preliner}" />
|
||||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="20" />
|
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="10" />
|
||||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="20" />
|
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="10" Text="{Binding LagerungTemperatur}" />
|
||||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="20" />
|
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="10" Text="{Binding EinbauTemperatur}" />
|
||||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="20" />
|
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="10" Text="{Binding EinbauDruck}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -31,16 +31,10 @@
|
|||||||
<TextBlock Text="] Hausnummer [" />
|
<TextBlock Text="] Hausnummer [" />
|
||||||
<TextBlock Text="{Binding Hausnummer}" Foreground="Red" />
|
<TextBlock Text="{Binding Hausnummer}" Foreground="Red" />
|
||||||
<TextBlock Text="] Haltung [" />
|
<TextBlock Text="] Haltung [" />
|
||||||
<!--<TextBlock Text="[" />-->
|
|
||||||
<TextBlock Foreground="Blue" Text="{Binding ObjektName}" />
|
<TextBlock Foreground="Blue" Text="{Binding ObjektName}" />
|
||||||
<TextBlock Text="] DN [" />
|
<TextBlock Text="] DN [" />
|
||||||
<TextBlock Text="{Binding DN}" Foreground="Blue" />
|
<TextBlock Text="{Binding DN}" Foreground="Blue" />
|
||||||
<TextBlock Text="]" />
|
<TextBlock Text="]" />
|
||||||
<!--
|
|
||||||
<TextBlock Text="] Material [" />
|
|
||||||
<TextBlock Text="{Binding Material}" Foreground="Blue" />
|
|
||||||
<TextBlock Text="]" />
|
|
||||||
-->
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
<Style TargetType="{x:Type TreeViewItem}">
|
<Style TargetType="{x:Type TreeViewItem}">
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
xmlns:BuildingsiteViews="clr-namespace:DaSaSo.Wpf.View.Buildingsites"
|
xmlns:BuildingsiteViews="clr-namespace:DaSaSo.Wpf.View.Buildingsites"
|
||||||
xmlns:SewerObjectViews="clr-namespace:DaSaSo.Wpf.View.SewerObjecte"
|
xmlns:SewerObjectViews="clr-namespace:DaSaSo.Wpf.View.SewerObjecte"
|
||||||
xmlns:SewerObjectView="clr-namespace:DaSaSo.Wpf.View.SewerObject"
|
xmlns:SewerObjectView="clr-namespace:DaSaSo.Wpf.View.SewerObject"
|
||||||
|
xmlns:ImpregnationViews="clr-namespace:DaSaSo.Wpf.View.Impregnation"
|
||||||
xmlns:controls="clr-namespace:DaSaSo.Wpf.Controls"
|
xmlns:controls="clr-namespace:DaSaSo.Wpf.Controls"
|
||||||
xmlns:View="clr-namespace:DaSaSo.Wpf.View"
|
xmlns:View="clr-namespace:DaSaSo.Wpf.View"
|
||||||
xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
||||||
@@ -41,6 +42,12 @@
|
|||||||
<DataTemplate DataType="{x:Type viewmodel:SewerMainListViewModel}">
|
<DataTemplate DataType="{x:Type viewmodel:SewerMainListViewModel}">
|
||||||
<SewerObjectView:SewerMainView />
|
<SewerObjectView:SewerMainView />
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
<DataTemplate DataType="{x:Type viewmodel:ImpregnierungListViewModel}">
|
||||||
|
<ImpregnationViews:ImpregnationListView />
|
||||||
|
</DataTemplate>
|
||||||
|
<DataTemplate DataType="{x:Type viewmodel:ImpregnierungEditViewModel}">
|
||||||
|
<ImpregnationViews:ImpregnationEditView />
|
||||||
|
</DataTemplate>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -49,13 +56,15 @@
|
|||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition Height="40" />
|
<RowDefinition Height="auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>
|
<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>
|
||||||
<ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding CurrentViewModel}" />
|
<ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding CurrentViewModel}" />
|
||||||
<StatusBar FontSize="20" Grid.Row="1" Grid.ColumnSpan="2">
|
<StatusBar FontSize="20" Grid.Row="1" Grid.ColumnSpan="2">
|
||||||
<StatusBarItem FontSize="20" Content="{Binding ClientName}" />
|
<StatusBarItem FontSize="20" Content="{Binding ClientName}" />
|
||||||
<StatusBarItem FontSize="20" Content="{Binding Projektname}" />
|
<Separator />
|
||||||
|
<StatusBarItem FontSize="20" Content="{Binding Projektnummer}" />
|
||||||
|
<Separator />
|
||||||
<StatusBarItem FontSize="20" Content="{Binding Buildingsitename}" />
|
<StatusBarItem FontSize="20" Content="{Binding Buildingsitename}" />
|
||||||
</StatusBar>
|
</StatusBar>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
Reference in New Issue
Block a user