Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r43f72f0cd1f19b6bef02964ac191973d6077c74c -r0ff93a746c6441fbc64c0507914d0db00fea9623 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 43f72f0cd1f19b6bef02964ac191973d6077c74c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -218,6 +218,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r7f87fad7bfc9af859c24f15a04ac2b8e1a6d43d9 -r0ff93a746c6441fbc64c0507914d0db00fea9623 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 7f87fad7bfc9af859c24f15a04ac2b8e1a6d43d9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 01-Nov-2016 10:01:47 AM */ +/* Created On : 01-Nov-2016 11:06:06 AM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -183,6 +183,9 @@ DROP TABLE IF EXISTS 'StabilityPointStructureEntity' ; +DROP TABLE IF EXISTS 'StabilityPointStructuresOutputEntity' +; + /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -1185,6 +1188,20 @@ ) ; +CREATE TABLE 'StabilityPointStructuresOutputEntity' +( + 'StabilityPointStructuresOutputEntity' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'StabilityPointStructuresCalculationEntityId' INTEGER NOT NULL, + 'RequiredProbability' REAL, + 'RequiredReliability' REAL, + 'Probability' REAL, + 'Reliability' REAL, + 'FactorOfSafety' REAL, + CONSTRAINT 'FK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity' FOREIGN KEY ('StabilityPointStructuresCalculationEntityId') REFERENCES 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'U_StabilityPointStructuresCalculationEntity' UNIQUE ('StabilityPointStructuresCalculationEntityId') +) +; + /* Create Indexes and Triggers */ CREATE INDEX 'IXFK_StabilityPointStructuresCalculationEntity_CalculationGroupEntity' @@ -1506,3 +1523,7 @@ CREATE INDEX 'IXFK_StabilityPointStructureEntity_FailureMechanismEntity' ON 'StabilityPointStructureEntity' ('FailureMechanismEntityId' ASC) ; + +CREATE INDEX 'IXFK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity' + ON 'StabilityPointStructuresOutputEntity' ('StabilityPointStructuresCalculationEntityId' ASC) +; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -rdb6506035368f043c476a528c324f1a093759fca -r0ff93a746c6441fbc64c0507914d0db00fea9623 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision db6506035368f043c476a528c324f1a093759fca) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -97,6 +97,7 @@ public virtual DbSet StabilityPointStructureEntities { get; set; } public virtual DbSet StabilityPointStructuresCalculationEntities { get; set; } public virtual DbSet StabilityPointStructuresFailureMechanismMetaEntities { get; set; } + public virtual DbSet StabilityPointStructuresOutputEntities { get; set; } public virtual DbSet StabilityPointStructuresSectionResultEntities { get; set; } public virtual DbSet StabilityStoneCoverSectionResultEntities { get; set; } public virtual DbSet StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r7f87fad7bfc9af859c24f15a04ac2b8e1a6d43d9 -r0ff93a746c6441fbc64c0507914d0db00fea9623 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 7f87fad7bfc9af859c24f15a04ac2b8e1a6d43d9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -751,6 +751,18 @@ + + + + + + + + + + + + @@ -1674,6 +1686,18 @@ + + + + + + + + + + + + @@ -1936,6 +1960,7 @@ + @@ -2202,6 +2227,10 @@ + + + + @@ -2325,6 +2354,7 @@ + @@ -2651,6 +2681,10 @@ + + + + @@ -3538,6 +3572,7 @@ + @@ -3548,6 +3583,19 @@ + + + + + + + + + + + + + @@ -4675,6 +4723,18 @@ + + + + + + + + + + + + @@ -5508,6 +5568,19 @@ + + + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r7f87fad7bfc9af859c24f15a04ac2b8e1a6d43d9 -r0ff93a746c6441fbc64c0507914d0db00fea9623 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 7f87fad7bfc9af859c24f15a04ac2b8e1a6d43d9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -4,7 +4,7 @@ - + <<<<<<< .mine @@ -125,65 +125,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262,6 +264,7 @@ + @@ -1629,6 +1632,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ======= Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -r917741aa3a39593a737390d1116bfcfd3a6ea37f -r0ff93a746c6441fbc64c0507914d0db00fea9623 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 917741aa3a39593a737390d1116bfcfd3a6ea37f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -35,6 +35,12 @@ public partial class StabilityPointStructuresCalculationEntity { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public StabilityPointStructuresCalculationEntity() + { + this.StabilityPointStructuresOutputEntities = new HashSet(); + } + public long StabilityPointStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -104,5 +110,7 @@ public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual StabilityPointStructureEntity StabilityPointStructureEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection StabilityPointStructuresOutputEntities { get; set; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (revision 0ff93a746c6441fbc64c0507914d0db00fea9623) @@ -0,0 +1,48 @@ +// 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 StabilityPointStructuresOutputEntity + { + public long StabilityPointStructuresOutputEntity1 { get; set; } + public long StabilityPointStructuresCalculationEntityId { get; set; } + public Nullable RequiredProbability { get; set; } + public Nullable RequiredReliability { get; set; } + public Nullable Probability { get; set; } + public Nullable Reliability { get; set; } + public Nullable FactorOfSafety { get; set; } + + public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } + } +}