Compare commits
12 Commits
renavigato
...
v0.02
| Author | SHA1 | Date | |
|---|---|---|---|
|
ba51c3bde6 | ||
|
|
895a5b7f0d | ||
|
|
adbbc0e528 | ||
|
|
4ed6826f62 | ||
|
|
b48007095e | ||
|
|
790792174d | ||
|
|
3388891134 | ||
|
|
cae9f38227 | ||
|
|
b48c012c18 | ||
|
|
98494be3cf | ||
|
|
9da7090883 | ||
|
|
4789b5f252 |
4
.editorconfig
Normal file
4
.editorconfig
Normal file
@@ -0,0 +1,4 @@
|
||||
[*.cs]
|
||||
|
||||
# CA1416: Validate platform compatibility
|
||||
dotnet_diagnostic.CA1416.severity = none
|
||||
@@ -1,16 +1,16 @@
|
||||
// See https://aka.ms/new-console-template for more information
|
||||
|
||||
using DaSaSo.ConsoleApp;
|
||||
using DaSaSo.Domain.Model;
|
||||
using DaSaSo.Domain.Services;
|
||||
using DaSaSo.EntityFramework;
|
||||
using DaSaSo.EntityFramework.Services;
|
||||
using System.Diagnostics;
|
||||
|
||||
IDataService<Client> clientService = new GenericDataService<Client>(new DaSaSoDbContextFactory(""));
|
||||
clientService.Create(new Client()
|
||||
{
|
||||
Firstname = "Cynthia",
|
||||
LastName = "Schreuder",
|
||||
Country = "Tarmstedt",
|
||||
Postcode = "25445",
|
||||
});
|
||||
|
||||
testclass test = new testclass();
|
||||
test.data = efields.CATRA | efields.PRO;
|
||||
|
||||
var s = test.data.HasFlag(efields.CATRA);
|
||||
|
||||
Debugger.Break();
|
||||
|
||||
38
DaSaSo.ConsoleApp/testclass.cs
Normal file
38
DaSaSo.ConsoleApp/testclass.cs
Normal file
@@ -0,0 +1,38 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DaSaSo.ConsoleApp
|
||||
{
|
||||
class testclass
|
||||
{
|
||||
public efields data;
|
||||
}
|
||||
|
||||
[Flags]
|
||||
enum efields : int
|
||||
{
|
||||
PRO = 1,
|
||||
CONTRA = 2,
|
||||
DESPRED = 4,
|
||||
CATRA = 8
|
||||
};
|
||||
|
||||
static class EnumerationExtensions
|
||||
{
|
||||
public static bool Has<T>(this System.Enum type, T value)
|
||||
{
|
||||
try
|
||||
{
|
||||
return (((int)(object)type & (int)(object)value) == (int)(object)value);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,4 +5,8 @@
|
||||
<Nullable>disable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\.editorconfig" Link=".editorconfig" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -11,6 +11,7 @@ namespace DaSaSo.Domain.DesignModel
|
||||
{
|
||||
public string Streetname { get; set; }
|
||||
public string CountryName { get; set; }
|
||||
public bool IsSelected { get; set; }
|
||||
public IEnumerable<SewerObject> SewerObjects { get; set; }
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
public enum ESewerWindowViewType
|
||||
{
|
||||
SewerStammdaten,
|
||||
SewerDamageList
|
||||
SewerDamageList,
|
||||
SewerDamageEdit,
|
||||
SewerPipeLiner
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace DaSaSo.Domain.Model
|
||||
public string Number { get; set; }
|
||||
public decimal Linerlength { get; set; }
|
||||
public bool IsAvaible { get; set; }
|
||||
public DateTime Date { get; set; }
|
||||
public DateOnly Date { get; set; }
|
||||
public string LinerNumber { get; set; }
|
||||
public decimal WallThickness { get; set; }
|
||||
}
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
namespace DaSaSo.Domain.Model
|
||||
using System;
|
||||
|
||||
namespace DaSaSo.Domain.Model
|
||||
{
|
||||
[Flags]
|
||||
public enum EDamageType
|
||||
{
|
||||
NONE = 0,
|
||||
Riss = 1,
|
||||
Bruch = 2,
|
||||
Scherbe = 4,
|
||||
@@ -9,20 +13,28 @@
|
||||
Inkrustation = 16,
|
||||
Ablagerung = 32,
|
||||
EinrageneStutzen = 64,
|
||||
Infiltration = 128
|
||||
Infiltration = 128,
|
||||
Static = Riss | Bruch | Scherbe,
|
||||
Betrieb = Wurzel | Inkrustation | Ablagerung,
|
||||
Other = EinrageneStutzen | Infiltration
|
||||
}
|
||||
[Flags]
|
||||
public enum EPreparationType
|
||||
{
|
||||
NONE = 0,
|
||||
CleanedHD = 1,
|
||||
CleanedMechanisch = 2,
|
||||
CleanedRoborter = 4,
|
||||
FaekalienFrei = 8
|
||||
CleanedRoboter = 4,
|
||||
FaekalienFrei = 8,
|
||||
WaterBaried = 16,
|
||||
PermitNeeded = 32,
|
||||
STVO = 64
|
||||
}
|
||||
public class SewerDamage : DomainObject
|
||||
{
|
||||
public SewerObject SewerObject { get; set; }
|
||||
public decimal Distance { get; set; }
|
||||
public EDamageType DamageType { get; set; }
|
||||
public EPreparationType PreparationType { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,9 @@ namespace DaSaSo.Domain.Model
|
||||
public class SewerObject : DomainObject
|
||||
{
|
||||
public Buildingsite BuildingSite { get; set; }
|
||||
public string SanNummer { get; set; }
|
||||
public string StreetName { get; set; }
|
||||
public string Hausnummer { get; set; }
|
||||
public string ObjektName { get; set; }
|
||||
public SewerPoint PunktOben { get; set; }
|
||||
public EPointType PunktObenType { get; set; }
|
||||
@@ -28,6 +30,8 @@ namespace DaSaSo.Domain.Model
|
||||
[NotMapped]
|
||||
public bool IsSelected { get; set; }
|
||||
|
||||
[NotMapped]
|
||||
public bool IsChanged { get; set; } = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,16 +9,10 @@ namespace DaSaSo.Domain.Model
|
||||
public abstract class SewerRehabilation : DomainObject
|
||||
{
|
||||
public string Operator { get; set; }
|
||||
public DateTime Date { get; set; }
|
||||
public DateOnly Date { get; set; }
|
||||
public decimal TemperatureOutdoors { get; set; }
|
||||
public decimal TemperatureSewer { get; set; }
|
||||
public string Weather { get; set; }
|
||||
public bool CleanedHD { get; set; }
|
||||
public bool CleanedMechanisch { get; set; }
|
||||
public bool CleanedRoborter { get; set; }
|
||||
public bool WaterBaried { get; set; }
|
||||
public bool PermitNeeded { get; set; }
|
||||
public bool STVO { get; set; }
|
||||
|
||||
public EPreparationType PreparationType { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,4 +19,8 @@
|
||||
<ProjectReference Include="..\DaSaSo.Domain\DaSaSo.Domain.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Migrations\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace DaSaSo.EntityFramework
|
||||
|
||||
public DaSaSoDbContext CreateDbContext()
|
||||
{
|
||||
DbContextOptionsBuilder<DaSaSoDbContext>? options = new DbContextOptionsBuilder<DaSaSoDbContext>();
|
||||
DbContextOptionsBuilder<DaSaSoDbContext>? options = new();
|
||||
_configureDbContext(options);
|
||||
//_connectionString = "Host = localhost; Database = dasaso; Username = kansan; Password = kansan";
|
||||
//options.UseNpgsql(_connectionString);
|
||||
@@ -34,7 +34,7 @@ namespace DaSaSo.EntityFramework
|
||||
{
|
||||
var options = new DbContextOptionsBuilder<DaSaSoDbContext>();
|
||||
options.UseNpgsql("Host = localhost; Database = dasaso; Username = kansan; Password = kansan");
|
||||
DaSaSoDbContext result = new DaSaSoDbContext(options.Options);
|
||||
DaSaSoDbContext result = new(options.Options);
|
||||
return result;
|
||||
}
|
||||
/*
|
||||
|
||||
@@ -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,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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
namespace DaSaSo.EntityFramework.Migrations
|
||||
{
|
||||
[DbContext(typeof(DaSaSoDbContext))]
|
||||
[Migration("20210928153745_ProjectNumberAdded")]
|
||||
partial class ProjectNumberAdded
|
||||
[Migration("20211009183922_Initial")]
|
||||
partial class Initial
|
||||
{
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
@@ -121,15 +121,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("CleanedHD")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("CleanedMechanisch")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("CleanedRoborter")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("ClosedEnd")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
@@ -148,14 +139,11 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<string>("Operator")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("PermitNeeded")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("Preliner")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("STVO")
|
||||
.HasColumnType("boolean");
|
||||
b.Property<int>("PreparationType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<decimal>("TemperaturAssembly")
|
||||
.HasColumnType("numeric");
|
||||
@@ -169,9 +157,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<decimal>("TemperatureSewer")
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<bool>("WaterBaried")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("Weather")
|
||||
.HasColumnType("text");
|
||||
|
||||
@@ -220,9 +205,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<decimal>("Distance")
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<int>("PreparationType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("SewerObjectId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
@@ -250,6 +232,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<int>("DN")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("Hausnummer")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("Material")
|
||||
.HasColumnType("text");
|
||||
|
||||
@@ -274,6 +259,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<int>("PunktUntenType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("SanNummer")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("SewerActivated")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -119,20 +119,11 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
|
||||
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("CleanedHD")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("CleanedMechanisch")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("CleanedRoborter")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("ClosedEnd")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<DateTime>("Date")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
b.Property<DateOnly>("Date")
|
||||
.HasColumnType("date");
|
||||
|
||||
b.Property<int?>("ImpregnationId")
|
||||
.HasColumnType("integer");
|
||||
@@ -146,14 +137,11 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<string>("Operator")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("PermitNeeded")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("Preliner")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("STVO")
|
||||
.HasColumnType("boolean");
|
||||
b.Property<int>("PreparationType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<decimal>("TemperaturAssembly")
|
||||
.HasColumnType("numeric");
|
||||
@@ -167,9 +155,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<decimal>("TemperatureSewer")
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<bool>("WaterBaried")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("Weather")
|
||||
.HasColumnType("text");
|
||||
|
||||
@@ -218,9 +203,6 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<decimal>("Distance")
|
||||
.HasColumnType("numeric");
|
||||
|
||||
b.Property<int>("PreparationType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("SewerObjectId")
|
||||
.HasColumnType("integer");
|
||||
|
||||
@@ -248,6 +230,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<int>("DN")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("Hausnummer")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("Material")
|
||||
.HasColumnType("text");
|
||||
|
||||
@@ -272,6 +257,9 @@ namespace DaSaSo.EntityFramework.Migrations
|
||||
b.Property<int>("PunktUntenType")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("SanNummer")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("SewerActivated")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
|
||||
@@ -37,12 +37,10 @@ namespace DaSaSo.EntityFramework.Services
|
||||
|
||||
public async Task<Buildingsite> Get(int id)
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
Buildingsite entity = await context.Buildingsites.FirstOrDefaultAsync((e) => e.Id == id);
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
Buildingsite entity = await context.Buildingsites.FirstOrDefaultAsync((e) => e.Id == id);
|
||||
|
||||
return entity;
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public Task<IEnumerable<Buildingsite>> GetAll()
|
||||
@@ -54,11 +52,9 @@ namespace DaSaSo.EntityFramework.Services
|
||||
{
|
||||
// Get Clientid
|
||||
int id = project.Id;
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
IEnumerable<Buildingsite> entities = await context.Buildingsites.Where(x => x.Project.Id == id).ToListAsync();
|
||||
return entities;
|
||||
}
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
IEnumerable<Buildingsite> entities = await context.Buildingsites.Where(x => x.Project.Id == id).ToListAsync();
|
||||
return entities;
|
||||
}
|
||||
|
||||
public async Task<Buildingsite> Update(int id, Buildingsite entity)
|
||||
|
||||
@@ -39,22 +39,18 @@ namespace DaSaSo.EntityFramework.Services
|
||||
|
||||
public async Task<Client> Get(int id)
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
Client entity = await context.Clients.Include(a => a.Projects).FirstOrDefaultAsync((e) => e.Id == id);
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
Client entity = await context.Clients.Include(a => a.Projects).FirstOrDefaultAsync((e) => e.Id == id);
|
||||
|
||||
return entity;
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<Client>> GetAll()
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
IEnumerable<Client> entities = await context.Clients.ToListAsync();
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
IEnumerable<Client> entities = await context.Clients.ToListAsync();
|
||||
|
||||
return entities;
|
||||
}
|
||||
return entities;
|
||||
}
|
||||
|
||||
public async Task<Client> Update(int id, Client entity)
|
||||
|
||||
@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.ChangeTracking;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
@@ -19,43 +20,35 @@ namespace DaSaSo.EntityFramework.Services.Common
|
||||
}
|
||||
public async Task<T> Create(T entity)
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
EntityEntry<T> createdEntity = await context.Set<T>().AddAsync(entity);
|
||||
await context.SaveChangesAsync();
|
||||
return createdEntity.Entity;
|
||||
}
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
EntityEntry<T> createdEntity = await context.Set<T>().AddAsync(entity);
|
||||
await context.SaveChangesAsync();
|
||||
return createdEntity.Entity;
|
||||
}
|
||||
|
||||
public T CreateNonAsync(T entity)
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
EntityEntry<T> createdEntity = context.Set<T>().Add(entity);
|
||||
context.SaveChanges();
|
||||
return createdEntity.Entity;
|
||||
}
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
EntityEntry<T> createdEntity = context.Set<T>().Add(entity);
|
||||
context.SaveChanges();
|
||||
return createdEntity.Entity;
|
||||
}
|
||||
|
||||
public async Task<bool> Delete(int id)
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
T entity = await context.Set<T>().FirstOrDefaultAsync((e) => e.Id == id);
|
||||
context.Set<T>().Remove(entity);
|
||||
await context.SaveChangesAsync();
|
||||
return true;
|
||||
}
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
T entity = await context.Set<T>().FirstOrDefaultAsync((e) => e.Id == id);
|
||||
context.Set<T>().Remove(entity);
|
||||
await context.SaveChangesAsync();
|
||||
return true;
|
||||
}
|
||||
public async Task<T> Update(int id, T entity)
|
||||
{
|
||||
using (DaSaSoDbContext context = _contextFactory.CreateDbContext())
|
||||
{
|
||||
entity.Id = id;
|
||||
context.Set<T>().Update(entity);
|
||||
await context.SaveChangesAsync();
|
||||
return entity;
|
||||
}
|
||||
using DaSaSoDbContext context = _contextFactory.CreateDbContext();
|
||||
entity.Id = id;
|
||||
context.Set<T>().Update(entity);
|
||||
await context.SaveChangesAsync();
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,6 +45,8 @@ namespace DaSaSo.EntityFramework.Services
|
||||
.Include("PunktOben")
|
||||
.Include("PunktUnten")
|
||||
.Include("SewerDamages")
|
||||
.Include("PipeLiner")
|
||||
.Include("PipeLiner.Impregnation")
|
||||
.FirstOrDefaultAsync((e) => e.Id == id);
|
||||
return s;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace DaSaSo.ViewModel
|
||||
{
|
||||
_actualProject = actualProject;
|
||||
_renavigator = renavigator;
|
||||
_buildingSiteDataService = buildingSiteDataService as BuildingsiteDataService;
|
||||
_buildingSiteDataService = (BuildingsiteDataService)buildingSiteDataService;
|
||||
Buildingsites = new ObservableCollection<Buildingsite>();
|
||||
EditCommand = new EditBuildingsiteCommand(buildingSiteDataService,actualProject,renavigator,buildingsiteService,this);
|
||||
SelectCommand = new SelectBuildingsiteCommand(actualProject, this);
|
||||
|
||||
@@ -14,7 +14,7 @@ namespace DaSaSo.ViewModel
|
||||
public class ClientEditViewModel : BaseViewModel
|
||||
{
|
||||
private Client _model;
|
||||
private IDataService<Client> _dataService;
|
||||
private readonly IDataService<Client> _dataService;
|
||||
private readonly IActualProject _actualProject;
|
||||
private readonly IRenavigator renavigator;
|
||||
|
||||
@@ -32,9 +32,9 @@ namespace DaSaSo.ViewModel
|
||||
this._model = _actualProject.AktuellClient;
|
||||
}
|
||||
|
||||
private void SaveClient()
|
||||
private async void SaveClient()
|
||||
{
|
||||
_dataService.Update(Model.Id, Model);
|
||||
await _dataService.Update(Model.Id, Model);
|
||||
renavigator.Renavigate();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,9 +19,7 @@ namespace DaSaSo.ViewModel
|
||||
{
|
||||
public ObservableCollection<Client> Clients { get; }
|
||||
private Client? _selectedClient;
|
||||
private IDataService<Client> _dataService;
|
||||
private readonly IRenavigator renavigator;
|
||||
IEnumerable<Client>? result;
|
||||
private readonly IDataService<Client> _dataService;
|
||||
bool _isLoading = true;
|
||||
|
||||
public ICommand SelectCommand { get; set; }
|
||||
@@ -63,19 +61,14 @@ namespace DaSaSo.ViewModel
|
||||
{
|
||||
Clients = new ObservableCollection<Client>();
|
||||
_dataService = dataService;
|
||||
this.renavigator = renavigator;
|
||||
|
||||
LoadClient();
|
||||
SelectCommand = new SelectClientCommand(actualProject, this); //= new RelayCommand(SelectClient, () => SelectedClient != null);
|
||||
SelectCommand = new SelectClientCommand(dataService,actualProject, this);
|
||||
EditCommand = new EditClientCommand(_dataService,actualProject, editRenavigator, this);
|
||||
AddNewClientCommand = new AddClientCommand(_dataService, actualProject, editRenavigator, this);
|
||||
|
||||
}
|
||||
|
||||
~ClientListViewModel()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public async void LoadClient()
|
||||
{
|
||||
IsLoading = true;
|
||||
@@ -86,7 +79,7 @@ namespace DaSaSo.ViewModel
|
||||
IsLoading = false;
|
||||
}
|
||||
|
||||
private void InitCollection(ObservableCollection<Client> target, IEnumerable<Client> source)
|
||||
private static void InitCollection(ObservableCollection<Client> target, IEnumerable<Client> source)
|
||||
{
|
||||
target.Clear();
|
||||
foreach (var i in source)
|
||||
|
||||
40
DaSaSo.ViewModel/Commands/AddDamageCommand.cs
Normal file
40
DaSaSo.ViewModel/Commands/AddDamageCommand.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
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
|
||||
{
|
||||
class AddDamageCommand : AsyncCommandBase
|
||||
{
|
||||
private readonly IActualProject actualProject;
|
||||
private readonly IRenavigator addedNavigator;
|
||||
|
||||
|
||||
public AddDamageCommand(IActualProject actualProject, IRenavigator addedNavigator)
|
||||
{
|
||||
this.actualProject = actualProject;
|
||||
this.addedNavigator = addedNavigator;
|
||||
|
||||
}
|
||||
|
||||
public override async Task ExecuteAsync(object? parameter)
|
||||
{
|
||||
SewerDamage newSewerDamage = new SewerDamage();
|
||||
//newSewerDamage.SewerObject = actualProject.AktuellSewerObject; // Führt zur Exception, dass EF versucht doppelte einträge vorzunehmen
|
||||
|
||||
actualProject.AktuellSewerObject.SewerDamages.Add(newSewerDamage);
|
||||
SewerDamage? lastInsertedDamage = actualProject.AktuellSewerObject.SewerDamages.Last();
|
||||
lastInsertedDamage.SewerObject = actualProject.AktuellSewerObject;
|
||||
actualProject.SetSewerDamage(lastInsertedDamage);
|
||||
|
||||
|
||||
//addedNavigator.Renavigate(); // Bug führt zur generellen umnavigation...
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -36,11 +36,14 @@ namespace DaSaSo.ViewModel.Commands
|
||||
_sewerObjectService = sewerObjectService;
|
||||
_renavigator = renavigator;
|
||||
_navigator = navigator;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public override async Task ExecuteAsync(object? parameter)
|
||||
{
|
||||
Trace.WriteLine(_actualProject.AktuellSewerObject.IsChanged);
|
||||
_navigator.CurrentViewModel = null;
|
||||
_renavigator.Renavigate();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using DaSaSo.ViewModel.Interface;
|
||||
using DaSaSo.Domain.Model;
|
||||
using DaSaSo.Domain.Services;
|
||||
using DaSaSo.ViewModel.Interface;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
@@ -14,19 +16,24 @@ namespace DaSaSo.ViewModel.Commands
|
||||
|
||||
private readonly IActualProject _actualProject;
|
||||
private readonly ClientListViewModel _clientListViewModel;
|
||||
private readonly IDataService<Client> _dataservice;
|
||||
|
||||
public override bool CanExecute(object? parameter)
|
||||
{
|
||||
return _clientListViewModel.CanSelectClient;
|
||||
}
|
||||
public SelectClientCommand(IActualProject actualProject, ClientListViewModel clientListViewModel)
|
||||
public SelectClientCommand(
|
||||
IDataService<Client> dataService,
|
||||
IActualProject actualProject,
|
||||
ClientListViewModel clientListViewModel)
|
||||
{
|
||||
_actualProject = actualProject;
|
||||
_clientListViewModel = clientListViewModel;
|
||||
_clientListViewModel.PropertyChanged += _clientListViewModel_PropertyChanged;
|
||||
_clientListViewModel.PropertyChanged += ClientListViewModel_PropertyChanged;
|
||||
_dataservice = dataService;
|
||||
}
|
||||
|
||||
private void _clientListViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
|
||||
private void ClientListViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
|
||||
{
|
||||
if(e.PropertyName == nameof(_clientListViewModel.CanSelectClient))
|
||||
{
|
||||
@@ -36,8 +43,10 @@ namespace DaSaSo.ViewModel.Commands
|
||||
|
||||
public override async Task ExecuteAsync(object? parameter)
|
||||
{
|
||||
var s = _clientListViewModel.SelectedClient;
|
||||
_actualProject.SetClient(s);
|
||||
Client? _selectedClient = _clientListViewModel.SelectedClient;
|
||||
if (_selectedClient == null) return;
|
||||
_selectedClient = await _dataservice.Get(_selectedClient.Id);
|
||||
_actualProject.SetClient(_selectedClient);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
24
DaSaSo.ViewModel/Commands/SelectDamageCommand.cs
Normal file
24
DaSaSo.ViewModel/Commands/SelectDamageCommand.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DaSaSo.ViewModel.Commands
|
||||
{
|
||||
class SelectDamageCommand : AsyncCommandBase
|
||||
{
|
||||
private readonly SewerMainListViewModel _sewerMainListViewModel;
|
||||
|
||||
public SelectDamageCommand(SewerMainListViewModel sewerMainListViewModel)
|
||||
{
|
||||
_sewerMainListViewModel = sewerMainListViewModel;
|
||||
}
|
||||
|
||||
public override Task ExecuteAsync(object? parameter)
|
||||
{
|
||||
var d = _sewerMainListViewModel;
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
50
DaSaSo.ViewModel/Controls/SewerDamageControllViewModel.cs
Normal file
50
DaSaSo.ViewModel/Controls/SewerDamageControllViewModel.cs
Normal file
@@ -0,0 +1,50 @@
|
||||
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 SewerDamageControllViewModel : BaseViewModel
|
||||
{
|
||||
public bool Riss { get; set; }
|
||||
public bool Bruch { get; set; }
|
||||
public bool Scherbe { get; set; }
|
||||
public bool Wurzel { get; set; }
|
||||
public bool Inkrustation { get; set; }
|
||||
public bool Ablagerungen { get; set; }
|
||||
public bool EinrageneStutzen { get; set; }
|
||||
public bool Infiltration { get; set; }
|
||||
public SewerDamageControllViewModel(EDamageType damageType)
|
||||
{
|
||||
Riss = damageType.HasFlag(EDamageType.Riss);
|
||||
Bruch = damageType.HasFlag(EDamageType.Bruch);
|
||||
Scherbe = damageType.HasFlag(EDamageType.Scherbe);
|
||||
|
||||
Wurzel = damageType.HasFlag(EDamageType.Wurzel);
|
||||
Inkrustation = damageType.HasFlag(EDamageType.Inkrustation);
|
||||
Ablagerungen = damageType.HasFlag(EDamageType.Ablagerung);
|
||||
|
||||
EinrageneStutzen = damageType.HasFlag(EDamageType.EinrageneStutzen);
|
||||
Infiltration = damageType.HasFlag(EDamageType.Infiltration);
|
||||
}
|
||||
|
||||
public EDamageType CalculateDamageFlags()
|
||||
{
|
||||
EDamageType result = EDamageType.NONE;
|
||||
if (Riss) result |= EDamageType.Riss;
|
||||
if (Bruch) result |= EDamageType.Bruch;
|
||||
if (Scherbe) result |= EDamageType.Scherbe;
|
||||
if (Wurzel) result |= EDamageType.Wurzel;
|
||||
if (Inkrustation) result |= EDamageType.Inkrustation;
|
||||
if (Ablagerungen) result |= EDamageType.Ablagerung;
|
||||
if (EinrageneStutzen) result |= EDamageType.EinrageneStutzen;
|
||||
if (Infiltration) result |= EDamageType.Infiltration;
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
using DaSaSo.Domain.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DaSaSo.ViewModel.Controls
|
||||
{
|
||||
public class SewerPreperationControllViewModel : BaseViewModel
|
||||
{
|
||||
public bool HD { get; set; }
|
||||
public bool Mechanisch { get; set; }
|
||||
public bool Roboter { 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)
|
||||
{
|
||||
HD = preparationType.HasFlag(EPreparationType.CleanedHD);
|
||||
Mechanisch = preparationType.HasFlag(EPreparationType.CleanedMechanisch);
|
||||
Roboter = preparationType.HasFlag(EPreparationType.CleanedRoboter);
|
||||
Faekalienfrei = preparationType.HasFlag(EPreparationType.FaekalienFrei);
|
||||
Genehmigung = preparationType.HasFlag(EPreparationType.PermitNeeded);
|
||||
WaterBaried = preparationType.HasFlag(EPreparationType.WaterBaried);
|
||||
STVO = preparationType.HasFlag(EPreparationType.STVO);
|
||||
}
|
||||
|
||||
public EPreparationType CalculatePreparationFlags()
|
||||
{
|
||||
EPreparationType result = EPreparationType.NONE;
|
||||
if (HD) result |= EPreparationType.CleanedHD;
|
||||
if (Mechanisch) result |= EPreparationType.CleanedMechanisch;
|
||||
if (Roboter) result |= EPreparationType.CleanedRoboter;
|
||||
if (Faekalienfrei) result |= EPreparationType.FaekalienFrei;
|
||||
if (Genehmigung) result |= EPreparationType.PermitNeeded;
|
||||
if (WaterBaried) result |= EPreparationType.WaterBaried;
|
||||
if (STVO) result |= EPreparationType.STVO;
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
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));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,15 +12,20 @@ namespace DaSaSo.ViewModel.Factories
|
||||
{
|
||||
private CreateViewModel<SewerStammdatenViewModel> _createSewerStammdatenViewModel;
|
||||
private CreateViewModel<SewerDamageListViewModel> _createSewerDamageListViewModel;
|
||||
private CreateViewModel<SewerDamageEditViewModel> _createSewerDamageEditViewModel;
|
||||
private CreateViewModel<SewerPipeLinerViewModel> _createSewerPipeLinerViewModel;
|
||||
|
||||
public SewerWindowViewModelFactory(
|
||||
CreateViewModel<SewerStammdatenViewModel> createSewerStammdatenViewModel,
|
||||
CreateViewModel<SewerDamageListViewModel> createSewerDamageListViewModel
|
||||
|
||||
CreateViewModel<SewerDamageListViewModel> createSewerDamageListViewModel,
|
||||
CreateViewModel<SewerDamageEditViewModel> createSewerDamageEditViewModel,
|
||||
CreateViewModel<SewerPipeLinerViewModel> createSewerPipeLinerViewModel
|
||||
)
|
||||
{
|
||||
_createSewerStammdatenViewModel = createSewerStammdatenViewModel;
|
||||
_createSewerDamageListViewModel = createSewerDamageListViewModel;
|
||||
_createSewerDamageEditViewModel = createSewerDamageEditViewModel;
|
||||
_createSewerPipeLinerViewModel = createSewerPipeLinerViewModel;
|
||||
}
|
||||
|
||||
public BaseViewModel CreateViewModel(ESewerWindowViewType viewType)
|
||||
@@ -29,6 +34,8 @@ namespace DaSaSo.ViewModel.Factories
|
||||
{
|
||||
case ESewerWindowViewType.SewerStammdaten: return _createSewerStammdatenViewModel();
|
||||
case ESewerWindowViewType.SewerDamageList: return _createSewerDamageListViewModel();
|
||||
case ESewerWindowViewType.SewerDamageEdit: return _createSewerDamageEditViewModel();
|
||||
case ESewerWindowViewType.SewerPipeLiner: return _createSewerPipeLinerViewModel();
|
||||
default:
|
||||
throw new ArgumentException("The Viewtype does not have a ViewModel", "viewType");
|
||||
}
|
||||
|
||||
@@ -13,15 +13,18 @@ namespace DaSaSo.ViewModel.Interface
|
||||
event EventHandler? ProjectChanged;
|
||||
event EventHandler? BuildingSiteChanged;
|
||||
event EventHandler? SewerObjectChanged;
|
||||
event EventHandler? SewerDamageChanged;
|
||||
Client AktuellClient { get; }
|
||||
Project AktuellProjekt { get; }
|
||||
Buildingsite AktuellBaustelle { get; }
|
||||
SewerObject AktuellSewerObject { get; }
|
||||
SewerDamage AktuellSewerDamage { get; }
|
||||
|
||||
void SetClient(Client client, bool notification = true);
|
||||
void SetProject(Project project, bool notification = true);
|
||||
void SetBuildingSite(Buildingsite buildingsite);
|
||||
void SetSewerObject(SewerObject sewerObject, bool notification = true);
|
||||
void SetSewerDamage(SewerDamage sewerDamage, bool notification = true);
|
||||
void ResetProject();
|
||||
void ResetBuildingSite();
|
||||
}
|
||||
|
||||
90
DaSaSo.ViewModel/SewerDamageEditViewModel.cs
Normal file
90
DaSaSo.ViewModel/SewerDamageEditViewModel.cs
Normal file
@@ -0,0 +1,90 @@
|
||||
using DaSaSo.Domain.Model;
|
||||
using DaSaSo.ViewModel.Controls;
|
||||
using DaSaSo.ViewModel.Interface;
|
||||
using Microsoft.Toolkit.Mvvm.Input;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DaSaSo.ViewModel
|
||||
{
|
||||
public class SewerDamageEditViewModel : BaseViewModel
|
||||
{
|
||||
private SewerDamage? _damage;
|
||||
|
||||
public SewerDamageControllViewModel damageControllViewModel { get; set; }
|
||||
//public SewerPreperationControllViewModel preperationControllViewModel { get; set; }
|
||||
public IRelayCommand Berechne { get; set; }
|
||||
|
||||
private string? _entfernung;
|
||||
public string Entfernung
|
||||
{
|
||||
get => _entfernung;
|
||||
set
|
||||
{
|
||||
_entfernung = value;
|
||||
_damage.SewerObject.IsChanged = true;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public SewerDamage? Damage
|
||||
{
|
||||
get => _damage;
|
||||
set
|
||||
{
|
||||
_damage = value;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public SewerDamageEditViewModel(IActualProject actualProject)
|
||||
{
|
||||
if (actualProject.AktuellSewerDamage == null) throw new NullReferenceException(nameof(actualProject.AktuellSewerDamage));
|
||||
Damage = actualProject.AktuellSewerDamage;
|
||||
|
||||
damageControllViewModel = new SewerDamageControllViewModel(Damage.DamageType);
|
||||
//preperationControllViewModel = new SewerPreperationControllViewModel(Damage.PreparationType);
|
||||
|
||||
Entfernung = Damage.Distance.ToString();
|
||||
|
||||
/*Berechne = new RelayCommand(() =>
|
||||
{
|
||||
//Debugger.Break();
|
||||
Damage.DamageType = damageControllViewModel.CalculateDamageFlags();
|
||||
Damage.PreparationType = preperationControllViewModel.CalculatePreparationFlags();
|
||||
});
|
||||
*/
|
||||
|
||||
}
|
||||
~SewerDamageEditViewModel()
|
||||
{
|
||||
//Debugger.Break();
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
{
|
||||
// Alle Werte Speichern, form wurde geändert (Noch nicht in DB!)
|
||||
EDamageType newDamage = damageControllViewModel.CalculateDamageFlags();
|
||||
//EPreparationType newPrepartion = preperationControllViewModel.CalculatePreparationFlags();
|
||||
if(Damage.DamageType != newDamage)
|
||||
{
|
||||
Damage.DamageType = newDamage;
|
||||
Damage.SewerObject.IsChanged = true;
|
||||
}
|
||||
/* if(Damage.PreparationType != newPrepartion)
|
||||
{
|
||||
Damage.PreparationType = newPrepartion;
|
||||
Damage.SewerObject.IsChanged = true;
|
||||
}
|
||||
*/
|
||||
damageControllViewModel.Dispose();
|
||||
//preperationControllViewModel.Dispose();
|
||||
base.Dispose();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
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
|
||||
{
|
||||
@@ -13,15 +15,29 @@ namespace DaSaSo.ViewModel
|
||||
{
|
||||
private readonly IActualProject _actualProject;
|
||||
private readonly IDataService<SewerObject> _dataService;
|
||||
private SewerDamage? _selectedDamage;
|
||||
|
||||
public ICommand AddNewDamage { get; set; }
|
||||
public SewerDamage SelectedDamage
|
||||
{
|
||||
get => _selectedDamage;
|
||||
set
|
||||
{
|
||||
_selectedDamage = value;
|
||||
_actualProject.SetSewerDamage(_selectedDamage);
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
SewerObject _model;
|
||||
public List<SewerDamage> Damages { get => _model.SewerDamages.ToList(); }
|
||||
|
||||
public SewerDamageListViewModel(IActualProject actualProject, IDataService<SewerObject> dataService)
|
||||
public SewerDamageListViewModel(IActualProject actualProject, IDataService<SewerObject> dataService, IRenavigator addedNavigator)
|
||||
{
|
||||
_actualProject = actualProject;
|
||||
_dataService = dataService;
|
||||
_model = _actualProject.AktuellSewerObject;
|
||||
AddNewDamage = new AddDamageCommand(actualProject,addedNavigator);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -17,15 +17,18 @@ namespace DaSaSo.ViewModel
|
||||
{
|
||||
public class SewerMainListViewModel : BaseViewModel
|
||||
{
|
||||
private ISewerMainNavigator _navigator { get; set; }
|
||||
private ISewerMainNavigator Navigator { get; set; }
|
||||
private readonly SewerObjectDataService _dataservice;
|
||||
private readonly ISewerObjectService _sewerObjectService;
|
||||
private readonly IRenavigator _renavigator;
|
||||
private IActualProject _actualProject { get; set; }
|
||||
private IActualProject ActualProject { get; set; }
|
||||
public ICommand UpdateCurrentSewerViewModelCommand { get; }
|
||||
public ICommand CloseCommand { get; set; }
|
||||
public BaseViewModel CurrentSewerViewModel => _navigator.CurrentViewModel;
|
||||
public ICommand SchadenCommand { get; set; }
|
||||
public ICommand Schlauchliner { get; set; }
|
||||
public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel;
|
||||
|
||||
public bool CanSelectDamage => Schaden != null;
|
||||
public bool IsLoading
|
||||
{
|
||||
get => _isLoading;
|
||||
@@ -38,37 +41,65 @@ namespace DaSaSo.ViewModel
|
||||
}
|
||||
}
|
||||
}
|
||||
private SewerDamage _schaden;
|
||||
public SewerDamage Schaden
|
||||
{
|
||||
get => _schaden;
|
||||
set
|
||||
{
|
||||
_schaden = value;
|
||||
OnPropertyChanged();
|
||||
OnPropertyChanged(nameof(CanSelectDamage));
|
||||
}
|
||||
}
|
||||
|
||||
public string Strasse { get => _actualProject.AktuellSewerObject.StreetName; }
|
||||
public string AktualObject { get => _actualProject.AktuellSewerObject.ObjektName; }
|
||||
public string Strasse { get => ActualProject.AktuellSewerObject.StreetName; }
|
||||
public string AktualObject { get => ActualProject.AktuellSewerObject.ObjektName; }
|
||||
|
||||
bool _isLoading = true;
|
||||
public bool CanSaveSewer => !string.IsNullOrEmpty(_actualProject.AktuellSewerObject.StreetName);
|
||||
public bool CanSaveSewer => !string.IsNullOrEmpty(ActualProject.AktuellSewerObject.StreetName);
|
||||
|
||||
public SewerMainListViewModel(IDataService<SewerObject> dataService, ISewerMainNavigator navigator,IActualProject actualProject, IViewModelSewerMainFactory viewModelFactory, IRenavigator renavigator, ISewerObjectService sewerObjectService, ISewerpointService sewerpointService)
|
||||
public SewerMainListViewModel(
|
||||
IDataService<SewerObject> dataService,
|
||||
ISewerMainNavigator navigator,
|
||||
IActualProject actualProject,
|
||||
IViewModelSewerMainFactory viewModelFactory,
|
||||
IRenavigator renavigator,
|
||||
ISewerObjectService sewerObjectService,
|
||||
ISewerpointService sewerpointService
|
||||
)
|
||||
{
|
||||
_navigator = navigator;
|
||||
_actualProject = actualProject;
|
||||
Navigator = navigator;
|
||||
ActualProject = actualProject;
|
||||
_dataservice = (SewerObjectDataService)dataService;
|
||||
_renavigator = renavigator;
|
||||
_sewerObjectService = sewerObjectService;
|
||||
CloseCommand = new SaveSewerCommand(_dataservice,_actualProject,_sewerObjectService,_renavigator,_navigator); //RelayCommand(SaveSewer);
|
||||
CloseCommand = new SaveSewerCommand(_dataservice,ActualProject,_sewerObjectService,_renavigator,Navigator); //RelayCommand(SaveSewer);
|
||||
LoadModel();
|
||||
UpdateCurrentSewerViewModelCommand = new UpdateCurrentSewerViewModelCommand(_navigator, viewModelFactory);
|
||||
_navigator.StateChanged += () => OnPropertyChanged(nameof(CurrentSewerViewModel));
|
||||
UpdateCurrentSewerViewModelCommand = new UpdateCurrentSewerViewModelCommand(Navigator, viewModelFactory);
|
||||
Navigator.StateChanged += () => OnPropertyChanged(nameof(CurrentSewerViewModel));
|
||||
ActualProject.SewerDamageChanged += ActualProject_SewerDamageChanged;
|
||||
|
||||
//SchadenCommand = UpdateCurrentSewerViewModelCommand.Execute(); // new SelectDamageCommand(this);
|
||||
}
|
||||
|
||||
private void ActualProject_SewerDamageChanged(object? sender, EventArgs e)
|
||||
{
|
||||
Schaden = ActualProject.AktuellSewerDamage;
|
||||
OnPropertyChanged(nameof(Schaden));
|
||||
}
|
||||
|
||||
private async void LoadModel()
|
||||
{
|
||||
IsLoading = true;
|
||||
SewerObject sewer = await _dataservice.Get(_actualProject.AktuellSewerObject.Id);
|
||||
_actualProject.SetSewerObject(sewer,false);
|
||||
SewerObject sewer = await _dataservice.Get(ActualProject.AktuellSewerObject.Id);
|
||||
ActualProject.SetSewerObject(sewer,false);
|
||||
IsLoading = false;
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
{
|
||||
_navigator.StateChanged -= () => OnPropertyChanged(nameof(CurrentSewerViewModel));
|
||||
Navigator.StateChanged -= () => OnPropertyChanged(nameof(CurrentSewerViewModel));
|
||||
base.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
123
DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
Normal file
123
DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
Normal file
@@ -0,0 +1,123 @@
|
||||
using DaSaSo.Domain.Model;
|
||||
using DaSaSo.ViewModel.Controls;
|
||||
using DaSaSo.ViewModel.Interface;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DaSaSo.ViewModel
|
||||
{
|
||||
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();
|
||||
base.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,30 @@ namespace DaSaSo.ViewModel
|
||||
}
|
||||
}
|
||||
}
|
||||
public string Hausnummer
|
||||
{
|
||||
get => Model.Hausnummer;
|
||||
set
|
||||
{
|
||||
if(Model.Hausnummer != value)
|
||||
{
|
||||
Model.Hausnummer = value;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
public string Sanierungsid
|
||||
{
|
||||
get => Model.SanNummer;
|
||||
set
|
||||
{
|
||||
if(Model.SanNummer != value)
|
||||
{
|
||||
Model.SanNummer = value;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public string Oberepunkt
|
||||
{
|
||||
@@ -155,6 +179,12 @@ namespace DaSaSo.ViewModel
|
||||
|
||||
Model = _actualProject.AktuellSewerObject;
|
||||
SaveCommand = new SaveSewerStammdatenCommand(this, dataService, sewerpointService);
|
||||
this.PropertyChanged += SewerStammdatenViewModel_PropertyChanged;
|
||||
}
|
||||
|
||||
private void SewerStammdatenViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
|
||||
{
|
||||
Model.IsChanged = true;
|
||||
}
|
||||
|
||||
~SewerStammdatenViewModel()
|
||||
|
||||
@@ -15,12 +15,15 @@ namespace DaSaSo.ViewModel.State.ActualState
|
||||
public Project? AktuellProjekt { get; private set; }
|
||||
public SewerObject? AktuellSewerObject { get; private set; }
|
||||
|
||||
public SewerDamage? AktuellSewerDamage { get; private set; }
|
||||
|
||||
|
||||
#region events
|
||||
public event EventHandler? ClientChanged;
|
||||
public event EventHandler? ProjectChanged;
|
||||
public event EventHandler? BuildingSiteChanged;
|
||||
public event EventHandler? SewerObjectChanged;
|
||||
public event EventHandler? SewerDamageChanged;
|
||||
|
||||
protected void OnClientChanged()
|
||||
{
|
||||
@@ -38,9 +41,15 @@ namespace DaSaSo.ViewModel.State.ActualState
|
||||
{
|
||||
SewerObjectChanged?.Invoke(this, new EventArgs());
|
||||
}
|
||||
protected void OnSewerDamageChanged()
|
||||
{
|
||||
SewerDamageChanged?.Invoke(this, new EventArgs());
|
||||
}
|
||||
#endregion
|
||||
public void SetClient(Client client, bool notification = true)
|
||||
{
|
||||
//ResetProject();
|
||||
//ResetBuildingSite();
|
||||
AktuellClient = client;
|
||||
if(notification)
|
||||
OnClientChanged();
|
||||
@@ -48,6 +57,7 @@ namespace DaSaSo.ViewModel.State.ActualState
|
||||
|
||||
public void SetProject(Project project, bool notification = true)
|
||||
{
|
||||
|
||||
AktuellProjekt = project;
|
||||
if(notification)
|
||||
OnProjectChanged();
|
||||
@@ -77,5 +87,12 @@ namespace DaSaSo.ViewModel.State.ActualState
|
||||
{
|
||||
SetBuildingSite(null);
|
||||
}
|
||||
|
||||
public void SetSewerDamage(SewerDamage sewerDamage, bool notification = true)
|
||||
{
|
||||
AktuellSewerDamage = sewerDamage;
|
||||
if (notification)
|
||||
OnSewerDamageChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ using Microsoft.Win32;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
@@ -23,6 +24,12 @@ namespace DaSaSo.ViewModel
|
||||
public sealed class MainWindowViewModel : BaseViewModel
|
||||
{
|
||||
private readonly IViewModelAbstractFactory viewModelFactory;
|
||||
|
||||
public MainWindowViewModel(IViewModelAbstractFactory viewModelFactory)
|
||||
{
|
||||
this.viewModelFactory = viewModelFactory;
|
||||
}
|
||||
|
||||
private readonly IActualProject _actualProject;
|
||||
private readonly IDataService<Client> _clientDataService;
|
||||
private readonly IDataService<Project> _projectDataService;
|
||||
@@ -30,16 +37,17 @@ namespace DaSaSo.ViewModel
|
||||
|
||||
private string _clientname = "";
|
||||
private string _projektname = "";
|
||||
private string _projektnummer = "";
|
||||
private string _buildingsitename = "";
|
||||
RegistryKey registry;
|
||||
private RegistryKey? registry;
|
||||
const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
|
||||
public bool CanSelectProject { get => _actualProject.AktuellClient != null; }
|
||||
public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; }
|
||||
public bool CanSelectSewerObjects { get => _actualProject.AktuellBaustelle != null; }
|
||||
|
||||
public IMainWindowNavigator _navigator { get; set; }
|
||||
public IMainWindowNavigator Navigator { get; set; }
|
||||
public ICommand UpdateCurrentViewModelCommand { get; }
|
||||
public BaseViewModel CurrentViewModel => _navigator.CurrentViewModel;
|
||||
public BaseViewModel CurrentViewModel => Navigator.CurrentViewModel;
|
||||
|
||||
public string ClientName
|
||||
{
|
||||
@@ -66,6 +74,18 @@ namespace DaSaSo.ViewModel
|
||||
}
|
||||
}
|
||||
}
|
||||
public string Projektnummer
|
||||
{
|
||||
get => _projektnummer;
|
||||
set
|
||||
{
|
||||
if (_projektnummer != value)
|
||||
{
|
||||
_projektnummer = value;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
public string Buildingsitename
|
||||
{
|
||||
get => _buildingsitename;
|
||||
@@ -78,13 +98,17 @@ namespace DaSaSo.ViewModel
|
||||
}
|
||||
}
|
||||
}
|
||||
public string ApplicationTitle
|
||||
public static string ApplicationTitle
|
||||
{
|
||||
get
|
||||
{
|
||||
string gitVersion;
|
||||
#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
|
||||
using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("DaSaSo.ViewModel.version.txt"))
|
||||
using (StreamReader reader = new StreamReader(stream))
|
||||
#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
|
||||
#pragma warning disable CS8604 // Possible null reference argument.
|
||||
using (StreamReader reader = new(stream))
|
||||
#pragma warning restore CS8604 // Possible null reference argument.
|
||||
{
|
||||
gitVersion = reader.ReadToEnd();
|
||||
}
|
||||
@@ -99,37 +123,37 @@ namespace DaSaSo.ViewModel
|
||||
IDataService<Buildingsite> buildingsiteDataService
|
||||
)
|
||||
{
|
||||
this._navigator = navigator;
|
||||
this.Navigator = navigator;
|
||||
this.viewModelFactory = viewModelFactory;
|
||||
_clientDataService = clientDataService;
|
||||
_projectDataService = projectDataService;
|
||||
_buildingsiteDataService = buildingsiteDataService;
|
||||
|
||||
registry = Registry.CurrentUser.OpenSubKey("Software\\Cosysda\\DaSaSo");
|
||||
if (registry == null) InitRegistry();
|
||||
|
||||
_navigator.StateChanged += _navigator_StateChanged;
|
||||
Navigator.StateChanged += Navigator_StateChanged;
|
||||
|
||||
UpdateCurrentViewModelCommand = new UpdateCurrentViewModelCommand(navigator, viewModelFactory);
|
||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Home);
|
||||
_actualProject = actualProject;
|
||||
_actualProject.ClientChanged += _actualProject_ClientChanged;
|
||||
_actualProject.ProjectChanged += _actualProject_ProjectChanged;
|
||||
_actualProject.BuildingSiteChanged += _actualProject_BuildingSiteChanged;
|
||||
_actualProject.SewerObjectChanged += _actualProject_SewerObjectChanged;
|
||||
_actualProject.ClientChanged += ActualProject_ClientChanged;
|
||||
_actualProject.ProjectChanged += ActualProject_ProjectChanged;
|
||||
_actualProject.BuildingSiteChanged += ActualProject_BuildingSiteChanged;
|
||||
_actualProject.SewerObjectChanged += ActualProject_SewerObjectChanged;
|
||||
|
||||
ladeRegistry();
|
||||
LadeRegistry();
|
||||
}
|
||||
|
||||
private async void ladeRegistry()
|
||||
private async void LadeRegistry()
|
||||
{
|
||||
|
||||
registry = Registry.CurrentUser.OpenSubKey("Software\\Cosysda\\DaSaSo");
|
||||
if (registry == null) initRegistry();
|
||||
int clientid = Convert.ToInt32((string)registry.GetValue("lastclient", "-1"));
|
||||
if (clientid == -1)
|
||||
return;
|
||||
Client lastClient = await _clientDataService.Get(clientid);
|
||||
if (lastClient == null)
|
||||
{
|
||||
saveInRegistry("lastclient", "-1");
|
||||
SaveInRegistry("lastclient", "-1");
|
||||
return;
|
||||
}
|
||||
_actualProject.SetClient(lastClient);
|
||||
@@ -140,64 +164,66 @@ namespace DaSaSo.ViewModel
|
||||
Project lastProject = await _projectDataService.Get(projectid);
|
||||
if(lastProject == null)
|
||||
{
|
||||
saveInRegistry("lastproject","-1");
|
||||
SaveInRegistry("lastproject","-1");
|
||||
return;
|
||||
}
|
||||
_actualProject.SetProject(lastProject);
|
||||
|
||||
int buildingsiteid = Convert.ToInt32((string)registry.GetValue("lastbuildingsite", "-1"));
|
||||
string? value = registry.GetValue("lastbuildingsite", "-1") as string;
|
||||
int buildingsiteid = Convert.ToInt32(value);
|
||||
if (buildingsiteid == -1)
|
||||
return;
|
||||
Buildingsite lastBuildingiste = await _buildingsiteDataService.Get(buildingsiteid);
|
||||
if(lastBuildingiste == null)
|
||||
{
|
||||
saveInRegistry("lastbuildingsite","-1");
|
||||
SaveInRegistry("lastbuildingsite","-1");
|
||||
return;
|
||||
}
|
||||
_actualProject.SetBuildingSite(lastBuildingiste);
|
||||
|
||||
}
|
||||
|
||||
private void saveInRegistry(string key, string value)
|
||||
private static void SaveInRegistry(string key, string value)
|
||||
{
|
||||
Registry.SetValue(REGISTRYKEY, key, value);
|
||||
}
|
||||
|
||||
private void initRegistry()
|
||||
private void InitRegistry()
|
||||
{
|
||||
Registry.CurrentUser.CreateSubKey("Software\\Cosysda\\DaSaSo");
|
||||
ladeRegistry();
|
||||
registry = Registry.CurrentUser.CreateSubKey("Software\\Cosysda\\DaSaSo");
|
||||
LadeRegistry();
|
||||
}
|
||||
|
||||
private void _actualProject_SewerObjectChanged(object? sender, EventArgs e)
|
||||
private void ActualProject_SewerObjectChanged(object? sender, EventArgs e)
|
||||
{
|
||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.SewerMainMenu);
|
||||
}
|
||||
|
||||
private void _navigator_StateChanged()
|
||||
private void Navigator_StateChanged()
|
||||
{
|
||||
OnPropertyChanged(nameof(CurrentViewModel));
|
||||
}
|
||||
|
||||
private void _actualProject_BuildingSiteChanged(object? sender, EventArgs e)
|
||||
private void ActualProject_BuildingSiteChanged(object? sender, EventArgs e)
|
||||
{
|
||||
saveInRegistry("lastbuildingsite", _actualProject.AktuellBaustelle.Id.ToString());
|
||||
SaveInRegistry("lastbuildingsite", _actualProject.AktuellBaustelle.Id.ToString());
|
||||
Buildingsitename = _actualProject.AktuellBaustelle.BuildingSiteNumber;
|
||||
OnPropertyChanged(nameof(CanSelectSewerObjects));
|
||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.SewerObjects);
|
||||
}
|
||||
|
||||
private void _actualProject_ProjectChanged(object? sender, EventArgs e)
|
||||
private void ActualProject_ProjectChanged(object? sender, EventArgs e)
|
||||
{
|
||||
saveInRegistry("lastproject", _actualProject.AktuellProjekt.Id.ToString());
|
||||
SaveInRegistry("lastproject", _actualProject.AktuellProjekt.Id.ToString());
|
||||
Projektname = _actualProject.AktuellProjekt.Name;
|
||||
Projektnummer = _actualProject.AktuellProjekt.Projektnummer;
|
||||
OnPropertyChanged(nameof(CanSelectBuildingSite));
|
||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Buildingsites);
|
||||
}
|
||||
|
||||
private void _actualProject_ClientChanged(object? sender, EventArgs e)
|
||||
private void ActualProject_ClientChanged(object? sender, EventArgs e)
|
||||
{
|
||||
saveInRegistry("lastclient", _actualProject.AktuellClient.Id.ToString());
|
||||
SaveInRegistry("lastclient", _actualProject.AktuellClient.Id.ToString());
|
||||
ClientName = _actualProject.AktuellClient.Firstname;
|
||||
OnPropertyChanged(nameof(CanSelectProject));
|
||||
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Projects);
|
||||
|
||||
@@ -165,6 +165,7 @@ namespace DaSaSo.Wpf
|
||||
using (DaSaSoDbContext context = contextFactory.CreateDbContext())
|
||||
{
|
||||
context.Database.Migrate();
|
||||
|
||||
}
|
||||
MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService<MainWindowViewModel>() };
|
||||
window.Show();
|
||||
|
||||
@@ -6,13 +6,17 @@
|
||||
xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="200">
|
||||
d:DesignHeight="607.5" d:DesignWidth="200">
|
||||
<Grid>
|
||||
<StackPanel>
|
||||
<RadioButton Content="Stammdaten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" />
|
||||
<RadioButton Content="Schäden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerDamageList}" Margin="20" />
|
||||
<RadioButton Content="Schließen" Style="{StaticResource ToggleButtonList}" Command="{Binding CloseCommand}" Margin="20" />
|
||||
</StackPanel>
|
||||
|
||||
<RadioButton Content="Schließen" Style="{StaticResource ToggleButtonList}" Command="{Binding CloseCommand}" Margin="20" />
|
||||
<RadioButton Content="{Binding Schaden.Distance,FallbackValue='Damage'}" Command="{Binding UpdateCurrentSewerViewModelCommand}" IsEnabled="{Binding CanSelectDamage}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerDamageEdit}" Style="{StaticResource ToggleButtonList}" Margin="20" />
|
||||
<RadioButton Content="Schlauchliner" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerPipeLiner}" Margin="20" />
|
||||
</StackPanel>
|
||||
|
||||
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
26
DaSaSo.Wpf/Converters/EqualDamageTypeToBooleanConverter.cs
Normal file
26
DaSaSo.Wpf/Converters/EqualDamageTypeToBooleanConverter.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using DaSaSo.Domain.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Data;
|
||||
|
||||
namespace DaSaSo.Wpf.Converters
|
||||
{
|
||||
class EqualDamageTypeToBooleanConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
bool result = (((int)value & (int)parameter) == (int)value);
|
||||
return result;
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
//EDamageType result = (EDamageType)parameter;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using DaSaSo.Domain.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Data;
|
||||
|
||||
namespace DaSaSo.Wpf.Converters
|
||||
{
|
||||
class EqualPreperationTypeToBooleanConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
EPreparationType damagevalue = (EPreparationType)value;
|
||||
EPreparationType damageParameter = (EPreparationType)parameter;
|
||||
return damagevalue.HasFlag(damageParameter);
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -37,6 +37,21 @@
|
||||
<Compile Update="View\SewerObjecte\SewerObjecteListView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="View\SewerObject\Controls\SewerDamage.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="View\SewerObject\Controls\SewerDamagePreparation.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="View\SewerObject\SewerPipeLinerView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="View\SewerObject\SewerDamageEditView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Update="View\SewerObject\SewerDamageListView.xaml.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -84,6 +99,21 @@
|
||||
<Page Update="View\SewerObjecte\SewerObjecteListView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="View\SewerObject\Controls\SewerDamage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="View\SewerObject\Controls\SewerDamagePreparation.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="View\SewerObject\Controls\SewerRehabilation.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="View\SewerObject\SewerPipeLinerView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="View\SewerObject\SewerDamageEditView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Update="View\SewerObject\SewerDamageListView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
|
||||
@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
@@ -20,6 +21,7 @@ namespace DaSaSo.Wpf.HostBuilders
|
||||
string connectionString = "";
|
||||
Action<DbContextOptionsBuilder> configureDbContext = null;
|
||||
string databaseToUse = context.Configuration.GetConnectionString("databaseToUse");
|
||||
Trace.WriteLine(databaseToUse);
|
||||
if(databaseToUse.Equals("default"))
|
||||
{
|
||||
connectionString = context.Configuration.GetConnectionString("default");
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace DaSaSo.Wpf.HostBuilders
|
||||
{
|
||||
host.ConfigureServices(services =>
|
||||
{
|
||||
services.AddSingleton<IDataService<Client>, ClientDataService>();
|
||||
services.AddTransient<IDataService<Client>, ClientDataService>();
|
||||
services.AddSingleton<IDataService<Project>, ProjectDataService>();
|
||||
services.AddTransient<IDataService<Buildingsite>, BuildingsiteDataService>();
|
||||
services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
|
||||
|
||||
@@ -38,6 +38,7 @@ namespace DaSaSo.Wpf.HostBuilders
|
||||
services.AddSingleton<ViewModelDelegateRenavigator<BuildingsiteEditViewModel>>();
|
||||
|
||||
services.AddSingleton<ViewModelDelegateRenavigator<SewerObjectListViewModel>>();
|
||||
services.AddTransient<ViewModelDelegateRenavigator<SewerDamageEditViewModel>>();
|
||||
|
||||
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
|
||||
{
|
||||
@@ -77,7 +78,21 @@ namespace DaSaSo.Wpf.HostBuilders
|
||||
{
|
||||
return () => new SewerDamageListViewModel(
|
||||
services.GetRequiredService<IActualProject>(),
|
||||
services.GetRequiredService<IDataService<SewerObject>>());
|
||||
services.GetRequiredService<IDataService<SewerObject>>(),
|
||||
services.GetRequiredService<ViewModelDelegateRenavigator<SewerDamageEditViewModel>>()
|
||||
);
|
||||
});
|
||||
services.AddTransient<CreateViewModel<SewerDamageEditViewModel>>(services =>
|
||||
{
|
||||
return () => new SewerDamageEditViewModel(
|
||||
services.GetRequiredService<IActualProject>()
|
||||
);
|
||||
});
|
||||
services.AddTransient<CreateViewModel<SewerPipeLinerViewModel>>(services =>
|
||||
{
|
||||
return () => new SewerPipeLinerViewModel(
|
||||
services.GetRequiredService<IActualProject>()
|
||||
);
|
||||
});
|
||||
|
||||
services.AddTransient<CreateViewModel<ClientListViewModel>>(services =>
|
||||
|
||||
24
DaSaSo.Wpf/Sampledata/SewerDamageListSampleData.cs
Normal file
24
DaSaSo.Wpf/Sampledata/SewerDamageListSampleData.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using DaSaSo.Domain.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace DaSaSo.Wpf.Sampledata
|
||||
{
|
||||
public class SewerDamageListSampleData
|
||||
{
|
||||
public ObservableCollection<SewerDamage> Damages { get; private set; } = new ObservableCollection<SewerDamage>();
|
||||
public SewerDamageListSampleData()
|
||||
{
|
||||
Damages.Add(new SewerDamage()
|
||||
{
|
||||
DamageType = EDamageType.Bruch | EDamageType.EinrageneStutzen,
|
||||
Distance = 12.5m
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,11 +17,12 @@
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="Projektname" />
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Projektnummer" />
|
||||
|
||||
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ProjektName}" />
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ProjektNummer}" />
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="Projektnummer" />
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Projektname" />
|
||||
|
||||
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ProjektNummer}" />
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding ProjektName}" />
|
||||
|
||||
</Grid>
|
||||
<Button Content="Speichern" Command="{Binding SaveProjectCommand}" />
|
||||
|
||||
52
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml
Normal file
52
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml
Normal file
@@ -0,0 +1,52 @@
|
||||
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.Controls.SewerDamage"
|
||||
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:damagetype="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerDamageControllViewModel}"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid Background="LightBlue">
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Border Grid.Row="0" Grid.ColumnSpan="3" BorderBrush="Black" BorderThickness="3">
|
||||
<TextBlock TextAlignment="Center" Text="Schaden" />
|
||||
</Border>
|
||||
<Border Grid.Column="0" Grid.Row="1" BorderBrush="Black" BorderThickness="2,1" Margin="3">
|
||||
<StackPanel>
|
||||
<Label />
|
||||
<Label Content="Rohrstatik schaden" />
|
||||
<CheckBox Content="Riss" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Riss}" />
|
||||
<CheckBox Content="Bruch" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Bruch}" />
|
||||
<CheckBox Content="Scherbe" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Scherbe}" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border Grid.Column="1" Grid.Row="1" BorderBrush="Black" BorderThickness="1,2" Margin="3">
|
||||
<StackPanel>
|
||||
<Label Content="Rohr Betrieb Hinderniss" />
|
||||
<CheckBox Content="Wurzeln" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Wurzel }"/>
|
||||
<CheckBox Content="Inkrustation" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Inkrustation }" />
|
||||
<CheckBox Content="Ablagerungen" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Ablagerungen}" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border Grid.Column="2" Grid.Row="1" BorderBrush="Black" BorderThickness="1,2" Margin="3">
|
||||
<StackPanel>
|
||||
<Label Content="Sonstiges" />
|
||||
<CheckBox Content="Einragende Anschluss" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding EinrageneStutzen }" />
|
||||
<CheckBox Content="Infiltration" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Infiltration }"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
28
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml.cs
Normal file
28
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.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.SewerObject.Controls
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for SewerDamage.xaml
|
||||
/// </summary>
|
||||
public partial class SewerDamage : UserControl
|
||||
{
|
||||
public SewerDamage()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.Controls.SewerDamagePreparation"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerPreperationControllViewModel}"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid Background="LightBlue">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Border Grid.Row="0" BorderThickness="3" BorderBrush="Black">
|
||||
<TextBlock Text="Vorbereitungen" TextAlignment="Center"/>
|
||||
</Border>
|
||||
<Border BorderBrush="Black" Grid.Row="1" BorderThickness="2" Margin="3">
|
||||
<StackPanel>
|
||||
<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="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="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Genehmigung}" />
|
||||
<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}" IsChecked="{Binding STVO}" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace DaSaSo.Wpf.View.SewerObject.Controls
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for SewerDamagePreparation.xaml
|
||||
/// </summary>
|
||||
public partial class SewerDamagePreparation : UserControl
|
||||
{
|
||||
public SewerDamagePreparation()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
44
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
Normal file
44
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
Normal file
@@ -0,0 +1,44 @@
|
||||
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.Controls.SewerRehabilation"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" 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"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border>
|
||||
<local:SewerDamagePreparation DataContext="{Binding SewerPreperationControllViewModel}" />
|
||||
</Border>
|
||||
<Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
|
||||
<Grid Grid.Column="1" Background="LightBlue">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Label Margin="5" Grid.Column="0" Grid.Row="0" Content="Operator" />
|
||||
<Label Margin="5" Grid.Column="0" Grid.Row="1" Content="Datum" />
|
||||
<Label Margin="5" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
|
||||
<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="5" Text="{Binding Bediener}" />
|
||||
<DatePicker Grid.Column="1" Grid.Row="1" Margin="5" SelectedDate="{Binding Datum}" />
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="5" Text="{Binding TemperaturAussen}" />
|
||||
<TextBox Grid.Column="1" Grid.Row="3" Margin="5" Text="{Binding TemperaturSewer}" />
|
||||
<TextBox Grid.Column="1" Grid.Row="4" Margin="5" Text="{Binding Weather}" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,28 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace DaSaSo.Wpf.View.SewerObject.Controls
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for SewerRehabilation.xaml
|
||||
/// </summary>
|
||||
public partial class SewerRehabilation : UserControl
|
||||
{
|
||||
public SewerRehabilation()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
41
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
Normal file
41
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
Normal file
@@ -0,0 +1,41 @@
|
||||
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.SewerDamageEditView"
|
||||
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:selfControls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerDamageEditViewModel}"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<selfControls:SewerDamage Grid.Column="0" Grid.Row="0" DataContext="{Binding damageControllViewModel}" Margin="3" />
|
||||
<!--<selfControls:SewerDamagePreparation Grid.Column="1" Grid.Row="0" DataContext="{Binding preperationControllViewModel}" Margin="3" />-->
|
||||
<Grid Grid.Row="1" Grid.Column="0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="200" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="0" Content="Entfernung" />
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Damage.Distance,StringFormat={}{0:#.##}}" />
|
||||
|
||||
</Grid>
|
||||
|
||||
|
||||
|
||||
<Button Grid.Column="1" Grid.Row="1" Content="Sanierung Zeigen" Command="{Binding Berechne}" />
|
||||
|
||||
</Grid>
|
||||
</UserControl>
|
||||
28
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml.cs
Normal file
28
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.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.SewerObject
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for SewerDamageEditView.xaml
|
||||
/// </summary>
|
||||
public partial class SewerDamageEditView : UserControl
|
||||
{
|
||||
public SewerDamageEditView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,12 +2,37 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerDamageListViewModel}"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="800">
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:sd="clr-namespace:DaSaSo.Wpf.Sampledata"
|
||||
xmlns:damagetype ="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
|
||||
xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="1020">
|
||||
<UserControl.Resources>
|
||||
<converters:EqualDamageTypeToBooleanConverter x:Key="EqualDamageTypeToBooleanConverter" />
|
||||
<converters:EqualPreperationTypeToBooleanConverter x:Key="EqualPreperationTypeToBooleanConverter" />
|
||||
</UserControl.Resources>
|
||||
<d:UserControl.DataContext>
|
||||
<sd:SewerDamageListSampleData />
|
||||
</d:UserControl.DataContext>
|
||||
<Grid>
|
||||
<DataGrid ItemsSource="{Binding Damages}" />
|
||||
<StackPanel>
|
||||
<DataGrid ItemsSource="{Binding Damages}" AutoGenerateColumns="False" IsReadOnly="True" SelectedItem="{Binding SelectedDamage}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Entfernung" Binding="{Binding Distance}" />
|
||||
<DataGridCheckBoxColumn Header="Statik (Riss / Bruch / Scherbe)" Binding="{Binding DamageType, Converter={StaticResource EqualDamageTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EDamageType.Static}}" />
|
||||
<DataGridCheckBoxColumn Header="Betrieb (Wurzeln / Inkrustation / Ablagerungen)" Binding="{Binding DamageType, Converter={StaticResource EqualDamageTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EDamageType.Betrieb}}" />
|
||||
<DataGridCheckBoxColumn Header="Sonstiges (Infiltration / Einragene Stutzen)" Binding="{Binding DamageType, Converter={StaticResource EqualDamageTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EDamageType.Other}}" />
|
||||
|
||||
|
||||
<DataGridCheckBoxColumn Header="HD Reinigung" Binding="{Binding PreparationType, Converter={StaticResource EqualPreperationTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EPreparationType.CleanedHD}}" />
|
||||
<DataGridCheckBoxColumn Header="Mechanisch gereinigt" Binding="{Binding PreparationType, Converter={StaticResource EqualPreperationTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EPreparationType.CleanedMechanisch}}" />
|
||||
<DataGridCheckBoxColumn Header="Roboter" Binding="{Binding PreparationType, Converter={StaticResource EqualPreperationTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EPreparationType.CleanedRoboter}}" />
|
||||
<DataGridCheckBoxColumn Header="Fäkalienfrei" Binding="{Binding PreparationType, Converter={StaticResource EqualPreperationTypeToBooleanConverter}, ConverterParameter={x:Static damagetype:EPreparationType.FaekalienFrei}}" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<Button Content="Neue Schaden Aufnehmen" Command="{Binding AddNewDamage}" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
@@ -15,6 +15,12 @@
|
||||
<DataTemplate DataType="{x:Type viewmodel:SewerDamageListViewModel}">
|
||||
<views:SewerDamageListView />
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewmodel:SewerDamageEditViewModel}">
|
||||
<views:SewerDamageEditView />
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewmodel:SewerPipeLinerViewModel}">
|
||||
<views:SewerPipeLinerView />
|
||||
</DataTemplate>
|
||||
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
||||
</UserControl.Resources>
|
||||
<Grid>
|
||||
|
||||
48
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
Normal file
48
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
Normal file
@@ -0,0 +1,48 @@
|
||||
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.SewerPipeLinerView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject"
|
||||
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" d:DesignWidth="800" Height="722">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Border Grid.Row="0">
|
||||
<controls:SewerRehabilation DataContext="{Binding SewerRhebalationControllViewModel}" />
|
||||
</Border>
|
||||
<Border BorderBrush="Black" BorderThickness="2" Grid.Row="1">
|
||||
<Grid Background="LightBlue">
|
||||
<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" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Margin="10" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
|
||||
<Label Margin="10" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
|
||||
<Label Margin="10" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
|
||||
<Label Margin="10" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
|
||||
<Label Margin="10" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
|
||||
<Label Margin="10" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
|
||||
|
||||
<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="10" Content="Ja" IsChecked="{Binding Preliner}" />
|
||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="10" />
|
||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="10" Text="{Binding LagerungTemperatur}" />
|
||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="10" Text="{Binding EinbauTemperatur}" />
|
||||
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="10" Text="{Binding EinbauDruck}" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
28
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml.cs
Normal file
28
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.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.SewerObject
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for Pipeliner.xaml
|
||||
/// </summary>
|
||||
public partial class SewerPipeLinerView : UserControl
|
||||
{
|
||||
public SewerPipeLinerView()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,19 +27,22 @@
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Label Grid.Column="0" Grid.Row="0" Content="Haltungsname" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="1" Content="Punkt Oben" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Unten" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="3" Content="Durchmesser" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="4" Content="Material" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="5" Content="Leitungslänge" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Haltungsname }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Oberepunkt }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Unterepunkt }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Durchmesser }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Material }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Leitungslength }" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="0" Content="Sanierung ID" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="1" Content="Haltungsname" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Oben" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="3" Content="Punkt Unten" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="4" Content="Durchmesser" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="5" Content="Material" Margin="20" />
|
||||
<Label Grid.Column="0" Grid.Row="6" Content="Leitungslänge" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Sanierungsid}" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Haltungsname }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Oberepunkt }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Unterepunkt }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Durchmesser }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Material }" Margin="20" />
|
||||
<TextBox Grid.Column="1" Grid.Row="6" Text="{Binding Leitungslength }" Margin="20" />
|
||||
</Grid>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -49,11 +52,14 @@
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto"/>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Label Grid.Row="0" Grid.Column="0" Content="Strasse" Margin="20" />
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Ort" Margin="20" />
|
||||
<Label Grid.Row="1" Grid.Column="0" Content="Hausnummer" Margin="20" />
|
||||
<Label Grid.Row="2" Grid.Column="0" Content="Ort" Margin="20" />
|
||||
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Strasse}" Margin="20"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
|
||||
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Hausnummer}" Margin="20" />
|
||||
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
|
||||
</Grid>
|
||||
<Button Grid.Row="1" Grid.ColumnSpan="2" FontSize="20" Content="Speichern" Command="{Binding SaveCommand}" />
|
||||
</Grid>
|
||||
|
||||
@@ -26,8 +26,21 @@
|
||||
|
||||
<DataTemplate DataType="{x:Type model:SewerObject}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="{Binding ObjektName}" />
|
||||
<TextBlock Text="{Binding Material}" />
|
||||
<TextBlock Text="SanID [" />
|
||||
<TextBlock Text="{Binding SanNummer}" Foreground="Red" />
|
||||
<TextBlock Text="] Hausnummer [" />
|
||||
<TextBlock Text="{Binding Hausnummer}" Foreground="Red" />
|
||||
<TextBlock Text="] Haltung [" />
|
||||
<!--<TextBlock Text="[" />-->
|
||||
<TextBlock Foreground="Blue" Text="{Binding ObjektName}" />
|
||||
<TextBlock Text="] DN [" />
|
||||
<TextBlock Text="{Binding DN}" Foreground="Blue" />
|
||||
<TextBlock Text="]" />
|
||||
<!--
|
||||
<TextBlock Text="] Material [" />
|
||||
<TextBlock Text="{Binding Material}" Foreground="Blue" />
|
||||
<TextBlock Text="]" />
|
||||
-->
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
<Style TargetType="{x:Type TreeViewItem}">
|
||||
|
||||
@@ -49,13 +49,15 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
<RowDefinition Height="40" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>
|
||||
<ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding CurrentViewModel}" />
|
||||
<StatusBar FontSize="20" Grid.Row="1" Grid.ColumnSpan="2">
|
||||
<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}" />
|
||||
</StatusBar>
|
||||
</Grid>
|
||||
|
||||
@@ -27,4 +27,39 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="checkBoxCircleSmall" TargetType="{x:Type CheckBox}">
|
||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||
<Setter Property="Margin" Value="0" />
|
||||
<Setter Property="Content" Value="" />
|
||||
<Setter Property="IsEnabled" Value="{Binding Change}" />
|
||||
<Setter Property="FrameworkElement.FocusVisualStyle" Value="{x:Null}" />
|
||||
<Setter Property="Foreground" Value="Black" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type CheckBox}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Ellipse Name="outerEllipse" Grid.Column="0" Width="30" Height="30" StrokeThickness="2" Stroke="#FFFFFFFF" />
|
||||
<Ellipse Name="highlightCircle" Grid.Column="0" Width="20" Height="20" Fill="#FFFFFFFF" />
|
||||
<ContentPresenter Name="content" Grid.Column="1" Content="{TemplateBinding Content}" Margin="5,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="ToggleButton.IsChecked" Value="True">
|
||||
<Setter TargetName="highlightCircle" Property="Shape.Fill" Value="BlueViolet" />
|
||||
</Trigger>
|
||||
<Trigger Property="ToggleButton.IsChecked" Value="False">
|
||||
<Setter TargetName="highlightCircle" Property="Shape.Fill" Value="#FFFFFF" />
|
||||
</Trigger>
|
||||
<Trigger Property="UIElement.IsFocused" Value="True">
|
||||
<Setter TargetName="outerEllipse" Property="Shape.Stroke" Value="BlueViolet" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
@@ -17,6 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.InMemoryProvider", "
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.DatabaseConverter", "DaSaSo.DatabaseConverter\DaSaSo.DatabaseConverter.csproj", "{E0842F1A-E74D-4B84-BD27-3585901B0DE9}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C7F32A0F-BC57-43A4-8865-AC88C109676F}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
.editorconfig = .editorconfig
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
||||
Reference in New Issue
Block a user