Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r1a062846c75d2d86454dc052adc7a5993b79963e -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 1a062846c75d2d86454dc052adc7a5993b79963e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -75,6 +75,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -126,6 +129,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -168,6 +174,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -328,7 +337,6 @@ - True Fisheye: Tag 37652d7a208ab210033b48025d8d768d409086a8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs =================================================================== diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -37,6 +37,7 @@ { public long ClosingStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } + public Nullable ClosingStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerTwoA { get; set; } public Nullable LayerThree { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 23-Sep-2016 11:38:21 AM */ +/* Created On : 18-okt-2016 17:12:52 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -15,6 +15,9 @@ DROP TABLE IF EXISTS 'ProjectEntity' ; +DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'AssessmentSectionEntity' ; @@ -24,6 +27,12 @@ DROP TABLE IF EXISTS 'FailureMechanismEntity' ; +DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' +; + +DROP TABLE IF EXISTS 'ClosingStructureFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'CalculationGroupEntity' ; @@ -178,6 +187,15 @@ ) ; +CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity' +( + 'StrengthStabilityPointConstructionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' INT (4) NOT NULL, + CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'AssessmentSectionEntity' ( 'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -219,6 +237,25 @@ ) ; +CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' +( + 'HeightStructuresFailureMechanismMetaEntity' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' INT (4) NOT NULL, + CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + +CREATE TABLE 'ClosingStructureFailureMechanismMetaEntity' +( + 'ClosingStructureFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'C' REAL, + 'N2A' INT (4) NOT NULL, + CONSTRAINT 'FK_ClosingStructureFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'CalculationGroupEntity' ( 'CalculationGroupEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -496,6 +533,7 @@ ( 'ClosingStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismSectionEntityId' INTEGER NOT NULL, + 'ClosingStructuresCalculationEntityId' INTEGER, 'LayerOne' TINYINT (1) NOT NULL, -- true or false 'LayerTwoA' REAL, 'LayerThree' REAL, @@ -814,6 +852,10 @@ ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_AssessmentSectionEntity_ProjectEntity' ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC) ; @@ -830,6 +872,14 @@ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + +CREATE INDEX 'IXFK_ClosingStructureFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'ClosingStructureFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_CalculationGroupEntity_CalculationGroupEntity' ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -r2651fdf110e56d0f48e416fcffc1b4922cff00a5 -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -38,13 +38,16 @@ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public FailureMechanismEntity() { + this.ClosingStructureFailureMechanismMetaEntities = new HashSet(); this.DikeProfileEntities = new HashSet(); this.FailureMechanismSectionEntities = new HashSet(); this.ForeshoreProfileEntities = new HashSet(); this.GrassCoverErosionInwardsFailureMechanismMetaEntities = new HashSet(); this.GrassCoverErosionOutwardsFailureMechanismMetaEntities = new HashSet(); this.GrassCoverErosionOutwardsHydraulicLocationEntities = new HashSet(); + this.HeightStructuresFailureMechanismMetaEntities = new HashSet(); this.PipingFailureMechanismMetaEntities = new HashSet(); + this.StabilityPointStructuresFailureMechanismMetaEntities = new HashSet(); this.StochasticSoilModelEntities = new HashSet(); this.SurfaceLineEntities = new HashSet(); } @@ -59,6 +62,8 @@ public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ClosingStructureFailureMechanismMetaEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DikeProfileEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismSectionEntities { get; set; } @@ -71,8 +76,12 @@ [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 HeightStructuresFailureMechanismMetaEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingFailureMechanismMetaEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection StabilityPointStructuresFailureMechanismMetaEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilModelEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection SurfaceLineEntities { get; set; } Fisheye: Tag 37652d7a208ab210033b48025d8d768d409086a8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag adbfca968beb93b87561607f2b0fd9a23bdfc6bd refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -34,7 +34,7 @@ using System.Data.Entity; using System.Data.Entity.Infrastructure; - public partial class RingtoetsEntities : DbContext, IRingtoetsEntities + public partial class RingtoetsEntities : DbContext { public RingtoetsEntities() : base("name=RingtoetsEntities") @@ -55,6 +55,7 @@ public virtual DbSet AssessmentSectionEntities { get; set; } public virtual DbSet CalculationGroupEntities { get; set; } public virtual DbSet CharacteristicPointEntities { get; set; } + public virtual DbSet ClosingStructureFailureMechanismMetaEntities { get; set; } public virtual DbSet ClosingStructuresSectionResultEntities { get; set; } public virtual DbSet DikeProfileEntities { get; set; } public virtual DbSet DuneErosionSectionResultEntities { get; set; } @@ -72,6 +73,7 @@ public virtual DbSet GrassCoverErosionOutwardsWaveConditionsOutputEntities { get; set; } public virtual DbSet GrassCoverSlipOffInwardsSectionResultEntities { get; set; } public virtual DbSet GrassCoverSlipOffOutwardsSectionResultEntities { get; set; } + public virtual DbSet HeightStructuresFailureMechanismMetaEntities { get; set; } public virtual DbSet HeightStructuresSectionResultEntities { get; set; } public virtual DbSet HydraulicLocationEntities { get; set; } public virtual DbSet MacrostabilityInwardsSectionResultEntities { get; set; } @@ -86,6 +88,7 @@ public virtual DbSet ProjectEntities { get; set; } public virtual DbSet SoilLayerEntities { get; set; } public virtual DbSet SoilProfileEntities { get; set; } + public virtual DbSet StabilityPointStructuresFailureMechanismMetaEntities { 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.Designer.cs =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -1,25 +1,4 @@ -// 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. - -// T4 code generation is enabled for model 'D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -4,7 +4,7 @@ - + @@ -42,12 +42,22 @@ + + + + + + + + + + @@ -259,6 +269,14 @@ + + + + + + + + @@ -432,6 +450,14 @@ + + + + + + + + @@ -634,6 +660,18 @@ + + + + + + + + + + + + @@ -910,6 +948,18 @@ + + + + + + + + + + + + @@ -1090,6 +1140,18 @@ + + + + + + + + + + + + @@ -1310,6 +1372,7 @@ + @@ -1327,6 +1390,7 @@ + @@ -1341,6 +1405,7 @@ + @@ -1367,6 +1432,10 @@ + + + + @@ -1459,6 +1528,10 @@ + + + + @@ -1519,6 +1592,10 @@ + + + + @@ -1600,6 +1677,7 @@ + @@ -1617,6 +1695,7 @@ + @@ -1631,6 +1710,7 @@ + @@ -1689,6 +1769,10 @@ + + + + @@ -1725,10 +1809,18 @@ + + + + + + + + @@ -1931,12 +2023,23 @@ + + + + + + + + + + + @@ -1984,13 +2087,16 @@ + + + @@ -2206,6 +2312,15 @@ + + + + + + + + + @@ -2403,6 +2518,15 @@ + + + + + + + + + @@ -2725,6 +2849,18 @@ + + + + + + + + + + + + @@ -2833,6 +2969,18 @@ + + + + + + + + + + + + @@ -2845,6 +2993,18 @@ + + + + + + + + + + + + @@ -3347,12 +3507,23 @@ + + + + + + + + + + + @@ -3581,6 +3752,15 @@ + + + + + + + + + @@ -3768,6 +3948,15 @@ + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -radbfca968beb93b87561607f2b0fd9a23bdfc6bd --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -4,55 +4,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -64,6 +67,7 @@ + @@ -73,7 +77,9 @@ + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (revision adbfca968beb93b87561607f2b0fd9a23bdfc6bd) @@ -0,0 +1,44 @@ +// 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 StabilityPointStructuresFailureMechanismMetaEntity + { + public long StrengthStabilityPointConstructionFailureMechanismMetaEntityId { get; set; } + public long FailureMechanismEntityId { get; set; } + public int N { get; set; } + + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } + } +}