Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 649b0974fb71df7368d19682bc255618f44d49c1)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -108,6 +108,12 @@
RingtoetsEntities.tt
+
+ RingtoetsEntities.tt
+
+
+ RingtoetsEntities.tt
+
RingtoetsEntities.tt
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionFailureMechanismMetaEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionFailureMechanismMetaEntity.cs (.../DuneErosionFailureMechanismMetaEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionFailureMechanismMetaEntity.cs (.../DuneErosionFailureMechanismMetaEntity.cs) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -34,8 +34,18 @@
{
public long DuneErosionFailureMechanismMetaEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
+ public long DuneLocationCalculationCollectionEntity1Id { get; set; }
+ public long DuneLocationCalculationCollectionEntity2Id { get; set; }
+ public long DuneLocationCalculationCollectionEntity3Id { get; set; }
+ public long DuneLocationCalculationCollectionEntity4Id { get; set; }
+ public long DuneLocationCalculationCollectionEntity5Id { get; set; }
public double N { get; set; }
public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
+ public virtual DuneLocationCalculationCollectionEntity DuneLocationCalculationCollectionEntity { get; set; }
+ public virtual DuneLocationCalculationCollectionEntity DuneLocationCalculationCollectionEntity1 { get; set; }
+ public virtual DuneLocationCalculationCollectionEntity DuneLocationCalculationCollectionEntity2 { get; set; }
+ public virtual DuneLocationCalculationCollectionEntity DuneLocationCalculationCollectionEntity3 { get; set; }
+ public virtual DuneLocationCalculationCollectionEntity DuneLocationCalculationCollectionEntity4 { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationCalculationCollectionEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationCalculationCollectionEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationCalculationCollectionEntity.cs (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -0,0 +1,69 @@
+// Copyright (C) Stichting Deltares 2017. 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.
+//
+//------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+ public class DuneLocationCalculationCollectionEntity
+ {
+ [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public DuneLocationCalculationCollectionEntity()
+ {
+ DuneErosionFailureMechanismMetaEntities = new HashSet();
+ DuneErosionFailureMechanismMetaEntities1 = new HashSet();
+ DuneErosionFailureMechanismMetaEntities2 = new HashSet();
+ DuneErosionFailureMechanismMetaEntities3 = new HashSet();
+ DuneErosionFailureMechanismMetaEntities4 = new HashSet();
+ DuneLocationCalculationEntities = new HashSet();
+ }
+
+ public long DuneLocationCalculationCollectionEntityId { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneErosionFailureMechanismMetaEntities { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneErosionFailureMechanismMetaEntities1 { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneErosionFailureMechanismMetaEntities2 { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneErosionFailureMechanismMetaEntities3 { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneErosionFailureMechanismMetaEntities4 { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneLocationCalculationEntities { get; set; }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationCalculationEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationCalculationEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationCalculationEntity.cs (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -0,0 +1,54 @@
+// Copyright (C) Stichting Deltares 2017. 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.
+//
+//------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+ public class DuneLocationCalculationEntity
+ {
+ [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+ public DuneLocationCalculationEntity()
+ {
+ DuneLocationOutputEntities = new HashSet();
+ }
+
+ public long DuneLocationCalculationEntityId { get; set; }
+ public long? DuneLocationEntityId { get; set; }
+ public long? DuneLocationCalculationCollectionEntityId { get; set; }
+
+ public virtual DuneLocationCalculationCollectionEntity DuneLocationCalculationCollectionEntity { get; set; }
+ public virtual DuneLocationEntity DuneLocationEntity { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection DuneLocationOutputEntities { get; set; }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationEntity.cs (.../DuneLocationEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationEntity.cs (.../DuneLocationEntity.cs) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -38,7 +38,7 @@
[SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
public DuneLocationEntity()
{
- DuneLocationOutputEntities = new HashSet();
+ DuneLocationCalculationEntities = new HashSet();
}
public long DuneLocationEntityId { get; set; }
@@ -53,9 +53,9 @@
public double? D50 { get; set; }
public int Order { get; set; }
- public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
-
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection DuneLocationOutputEntities { get; set; }
+ public virtual ICollection DuneLocationCalculationEntities { get; set; }
+
+ public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationOutputEntity.cs
===================================================================
diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationOutputEntity.cs (.../DuneLocationOutputEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneLocationOutputEntity.cs (.../DuneLocationOutputEntity.cs) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -33,7 +33,7 @@
public class DuneLocationOutputEntity
{
public long DuneLocationOutputEntityId { get; set; }
- public long DuneLocationEntityId { get; set; }
+ public long DuneLocationCalculationEntityId { get; set; }
public double? WaterLevel { get; set; }
public double? WaveHeight { get; set; }
public double? WavePeriod { get; set; }
@@ -43,6 +43,6 @@
public double? CalculatedReliability { get; set; }
public byte CalculationConvergence { get; set; }
- public virtual DuneLocationEntity DuneLocationEntity { get; set; }
+ public virtual DuneLocationCalculationEntity DuneLocationCalculationEntity { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -rf49fef750f4d3cd7091fcd44442f91e978b341b3 -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision f49fef750f4d3cd7091fcd44442f91e978b341b3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -47,6 +47,8 @@
public virtual DbSet DikeProfileEntities { get; set; }
public virtual DbSet DuneErosionFailureMechanismMetaEntities { get; set; }
public virtual DbSet DuneErosionSectionResultEntities { get; set; }
+ public virtual DbSet DuneLocationCalculationCollectionEntities { get; set; }
+ public virtual DbSet DuneLocationCalculationEntities { get; set; }
public virtual DbSet DuneLocationEntities { get; set; }
public virtual DbSet DuneLocationOutputEntities { get; set; }
public virtual DbSet FailureMechanismEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -rf2ab31166e5c693678b6743d1c321d7b35d8bb19 -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -203,6 +203,11 @@
+
+
+
+
+
@@ -221,6 +226,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -242,7 +261,7 @@
-
+
@@ -1814,6 +1833,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1826,6 +1905,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1839,14 +1942,14 @@
-
+
-
-
+
+
-
+
@@ -3303,6 +3406,8 @@
+
+
@@ -3484,16 +3589,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -3994,6 +4127,8 @@
+
+
@@ -4222,18 +4357,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -4884,8 +5047,18 @@
+
+
+
+
+
+
+
+
+
+
@@ -4904,6 +5077,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4919,15 +5115,15 @@
+
-
-
+
@@ -4936,7 +5132,7 @@
-
+
@@ -6852,6 +7048,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6864,30 +7120,54 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8284,6 +8564,11 @@
+
+
+
+
+
@@ -8306,6 +8591,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8334,7 +8635,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rf2ab31166e5c693678b6743d1c321d7b35d8bb19 -r98edaeb80b3d2697f80f6396a177222a8128d676
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision f2ab31166e5c693678b6743d1c321d7b35d8bb19)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 98edaeb80b3d2697f80f6396a177222a8128d676)
@@ -52,98 +52,100 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -181,9 +183,16 @@
+
+
+
+
+
-
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -rf2ab31166e5c693678b6743d1c321d7b35d8bb19 -r98edaeb80b3d2697f80f6396a177222a8128d676
Binary files differ