Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -rcc91baaea7dfcc12765017b57ffc768c7d02f7a1 -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision cc91baaea7dfcc12765017b57ffc768c7d02f7a1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -132,6 +132,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -rb73d9512e3a69a17d8be939d91cb655d20aa64f2 -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision b73d9512e3a69a17d8be939d91cb655d20aa64f2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 20-okt-2016 14:29:49 */ +/* Created On : 20-okt-2016 15:32:23 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -159,6 +159,9 @@ DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsWaveConditionsOutputEntity' ; +DROP TABLE IF EXISTS 'HeightStructureEntity' +; + /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -846,6 +849,33 @@ ) ; +CREATE TABLE 'HeightStructureEntity' +( + 'HeightStructureEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'Order' INT (4) NOT NULL, + 'Name' VARCHAR (260), + 'Id' VARCHAR (260), + 'X' REAL, + 'Y' REAL, + 'StructureNormalOrientation' REAL, + 'LevelCrestStructureMean' REAL, + 'LevelCrestStructureStandardDeviation' REAL, + 'FlowWidthAtBottomProtectionMean' REAL, + 'FlowWidthAtBottomProtectionStandardDeviation' REAL, + 'CriticalOvertoppingDischargeMean' REAL, + 'CriticalOvertoppingDischargeCoefficientOfVariation' REAL, + 'WidthFlowAperturesMean' REAL, + 'WidthFlowAperturesCoefficientOfVariation' REAL, + 'FailureProbabilityStructureWithErosion' REAL, + 'StorageStructureAreaMean' REAL, + 'StorageStructureAreaCoefficientOfVariation' REAL, + 'AllowedLevelIncreaseStorageMean' REAL, + 'AllowedLevelIncreaseStorageStandardDeviation' REAL, + CONSTRAINT 'FK_HeightStructure_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE No Action ON UPDATE No Action +) +; + /* Create Indexes and Triggers */ CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' @@ -1091,3 +1121,7 @@ CREATE INDEX 'IXFK_GrassCoverErosionOutwardsWaveConditionsOutputEntity_GrassCoverErosionOutwardsWaveConditionsCalculationEntity' ON 'GrassCoverErosionOutwardsWaveConditionsOutputEntity' ('GrassCoverErosionOutwardsWaveConditionsCalculationEntityId' ASC) ; + +CREATE INDEX 'IXFK_HeightStructure_FailureMechanismEntity' + ON 'HeightStructureEntity' ('FailureMechanismEntityId' ASC) +; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -radbfca968beb93b87561607f2b0fd9a23bdfc6bd -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -45,6 +45,7 @@ this.GrassCoverErosionInwardsFailureMechanismMetaEntities = new HashSet(); this.GrassCoverErosionOutwardsFailureMechanismMetaEntities = new HashSet(); this.GrassCoverErosionOutwardsHydraulicLocationEntities = new HashSet(); + this.HeightStructureEntities = new HashSet(); this.HeightStructuresFailureMechanismMetaEntities = new HashSet(); this.PipingFailureMechanismMetaEntities = new HashSet(); this.StabilityPointStructuresFailureMechanismMetaEntities = new HashSet(); @@ -76,6 +77,8 @@ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HeightStructureEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresFailureMechanismMetaEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingFailureMechanismMetaEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -0,0 +1,62 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Storage.DbContext +{ + using System; + using System.Collections.Generic; + + public partial class HeightStructureEntity + { + public long HeightStructureEntityId { get; set; } + public long FailureMechanismEntityId { get; set; } + public int Order { get; set; } + public string Name { get; set; } + public string Id { get; set; } + public Nullable X { get; set; } + public Nullable Y { get; set; } + public Nullable StructureNormalOrientation { get; set; } + public Nullable LevelCrestStructureMean { get; set; } + public Nullable LevelCrestStructureStandardDeviation { get; set; } + public Nullable FlowWidthAtBottomProtectionMean { get; set; } + public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } + public Nullable CriticalOvertoppingDischargeMean { get; set; } + public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } + public Nullable WidthFlowAperturesMean { get; set; } + public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } + public Nullable FailureProbabilityStructureWithErosion { get; set; } + public Nullable StorageStructureAreaMean { get; set; } + public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } + public Nullable AllowedLevelIncreaseStorageMean { get; set; } + public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } + + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } + } +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -radbfca968beb93b87561607f2b0fd9a23bdfc6bd -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -73,6 +73,7 @@ public virtual DbSet GrassCoverErosionOutwardsWaveConditionsOutputEntities { get; set; } public virtual DbSet GrassCoverSlipOffInwardsSectionResultEntities { get; set; } public virtual DbSet GrassCoverSlipOffOutwardsSectionResultEntities { get; set; } + public virtual DbSet HeightStructureEntities { get; set; } public virtual DbSet HeightStructuresFailureMechanismMetaEntities { get; set; } public virtual DbSet HeightStructuresSectionResultEntities { get; set; } public virtual DbSet HydraulicLocationEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.tt =================================================================== diff -u -ra6371ac68897b69e2efd537fa29bb6564f50fdcf -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.tt (.../RingtoetsEntities.Context.tt) (revision a6371ac68897b69e2efd537fa29bb6564f50fdcf) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.tt (.../RingtoetsEntities.Context.tt) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -74,7 +74,7 @@ } #> -<#=Accessibility.ForType(container)#> partial class <#=code.Escape(container)#> : DbContext, IRingtoetsEntities +<#=Accessibility.ForType(container)#> partial class <#=code.Escape(container)#> : DbContext { public <#=code.Escape(container)#>() : base("name=<#=container.Name#>") Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rb73d9512e3a69a17d8be939d91cb655d20aa64f2 -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision b73d9512e3a69a17d8be939d91cb655d20aa64f2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -269,6 +269,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -948,6 +974,18 @@ + + + + + + + + + + + + @@ -1390,6 +1428,7 @@ + @@ -1528,6 +1567,10 @@ + + + + @@ -1695,6 +1738,7 @@ + @@ -1809,6 +1853,10 @@ + + + + @@ -2094,6 +2142,7 @@ + @@ -2312,6 +2361,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2969,6 +3045,18 @@ + + + + + + + + + + + + @@ -3752,6 +3840,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rb73d9512e3a69a17d8be939d91cb655d20aa64f2 -r1ab694fe2d416435524ceca426d459caac4af304 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision b73d9512e3a69a17d8be939d91cb655d20aa64f2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 1ab694fe2d416435524ceca426d459caac4af304) @@ -5,57 +5,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -77,6 +78,7 @@ +