Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql
===================================================================
diff -u -rab5185b4950e4d02d6334996028cd65239e152dc -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision ab5185b4950e4d02d6334996028cd65239e152dc)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 28-Jun-2017 08:44:13 */
+/* Created On : 28-Jun-2017 11:35:44 AM */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1465,7 +1465,7 @@
CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity'
(
'GrassCoverErosionOutwardsHydraulicLocationStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER,
+ 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL,
'Name' TEXT NOT NULL,
'Duration' REAL NOT NULL,
'Alpha' REAL NOT NULL,
@@ -1478,7 +1478,7 @@
(
'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL,
- 'Name' TEXT NOT NULL,
+ 'IllustrationPointName' TEXT NOT NULL,
'ClosingSituation' TEXT NOT NULL,
'WindDirectionName' TEXT NOT NULL,
'WindDirectionAngle' REAL NOT NULL,
@@ -1526,7 +1526,7 @@
(
'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL,
- 'Name' TEXT NOT NULL,
+ 'IllustrationPointName' TEXT NOT NULL,
'ClosingSituation' TEXT NOT NULL,
'WindDirectionName' TEXT NOT NULL,
'WindDirectionAngle' REAL NOT NULL,
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r30df7a3cabc5c48307afa542944fc17fd7a355e3 -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 30df7a3cabc5c48307afa542944fc17fd7a355e3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -236,12 +236,6 @@
-
-
-
-
-
-
RingtoetsEntities.tt
@@ -251,6 +245,12 @@
RingtoetsEntities.tt
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs
===================================================================
diff -u -r4938d7e24964edb84ebeb51f96d021bd03501d1f -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs) (revision 4938d7e24964edb84ebeb51f96d021bd03501d1f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -34,10 +34,10 @@
{
public long GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntityId { get; set; }
public long GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId { get; set; }
- public string Description { get; set; }
- public double Value { get; set; }
public int Order { get; set; }
public virtual GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity { get; set; }
+ public string Description { get; set; }
+ public double Value { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs
===================================================================
diff -u -r9f1d99a24df496c485b08e40196bea77ea68502f -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs) (revision 9f1d99a24df496c485b08e40196bea77ea68502f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -34,12 +34,12 @@
{
public long GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntityId { get; set; }
public long GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId { get; set; }
+ public int Order { get; set; }
+
+ public virtual GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity { get; set; }
public string Name { get; set; }
public double Duration { get; set; }
public double Alpha { get; set; }
public double Realization { get; set; }
- public int Order { get; set; }
-
- public virtual GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs
===================================================================
diff -u -r9f1d99a24df496c485b08e40196bea77ea68502f -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs) (revision 9f1d99a24df496c485b08e40196bea77ea68502f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -34,11 +34,11 @@
{
public long GrassCoverErosionOutwardsHydraulicLocationStochastEntityId { get; set; }
public long? GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId { get; set; }
- public string Name { get; set; }
- public double Duration { get; set; }
- public double Alpha { get; set; }
public int Order { get; set; }
public virtual GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity { get; set; }
+ public string Name { get; set; }
+ public double Duration { get; set; }
+ public double Alpha { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationRealizedStochastEntity.cs
===================================================================
diff -u -r9f1d99a24df496c485b08e40196bea77ea68502f -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationRealizedStochastEntity.cs (.../HydraulicLocationRealizedStochastEntity.cs) (revision 9f1d99a24df496c485b08e40196bea77ea68502f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationRealizedStochastEntity.cs (.../HydraulicLocationRealizedStochastEntity.cs) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -34,12 +34,12 @@
{
public long HydraulicLocationRealizedStochastEntityId { get; set; }
public long HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId { get; set; }
+ public int Order { get; set; }
+
+ public virtual HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity { get; set; }
public string Name { get; set; }
public double Duration { get; set; }
public double Alpha { get; set; }
public double Realization { get; set; }
- public int Order { get; set; }
-
- public virtual HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationStochastEntity.cs
===================================================================
diff -u -r9f1d99a24df496c485b08e40196bea77ea68502f -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationStochastEntity.cs (.../HydraulicLocationStochastEntity.cs) (revision 9f1d99a24df496c485b08e40196bea77ea68502f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationStochastEntity.cs (.../HydraulicLocationStochastEntity.cs) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -34,11 +34,11 @@
{
public long HydraulicLocationStochastEntityId { get; set; }
public long HydraulicLocationGeneralResultEntityId { get; set; }
- public string Name { get; set; }
- public double Duration { get; set; }
- public double Alpha { get; set; }
public int Order { get; set; }
public virtual HydraulicLocationGeneralResultEntity HydraulicLocationGeneralResultEntity { get; set; }
+ public string Name { get; set; }
+ public double Duration { get; set; }
+ public double Alpha { get; set; }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -rd75f3b9393379183384128e980ba9e558cf29e3d -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision d75f3b9393379183384128e980ba9e558cf29e3d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -19,7 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-// T4 code generation is enabled for model 'D:\Repos\Ringtoets\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'.
+// T4 code generation is enabled for model 'D:\WTI\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 -rab5185b4950e4d02d6334996028cd65239e152dc -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision ab5185b4950e4d02d6334996028cd65239e152dc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -4,7 +4,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rab5185b4950e4d02d6334996028cd65239e152dc -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision ab5185b4950e4d02d6334996028cd65239e152dc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -9,83 +9,83 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: build/DatabaseStructure.sql
===================================================================
diff -u -rab5185b4950e4d02d6334996028cd65239e152dc -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ab5185b4950e4d02d6334996028cd65239e152dc)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 28-Jun-2017 08:44:13 */
+/* Created On : 28-Jun-2017 11:35:44 AM */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1465,7 +1465,7 @@
CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity'
(
'GrassCoverErosionOutwardsHydraulicLocationStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER,
+ 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL,
'Name' TEXT NOT NULL,
'Duration' REAL NOT NULL,
'Alpha' REAL NOT NULL,
@@ -1478,7 +1478,7 @@
(
'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL,
- 'Name' TEXT NOT NULL,
+ 'IllustrationPointName' TEXT NOT NULL,
'ClosingSituation' TEXT NOT NULL,
'WindDirectionName' TEXT NOT NULL,
'WindDirectionAngle' REAL NOT NULL,
@@ -1526,7 +1526,7 @@
(
'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL,
- 'Name' TEXT NOT NULL,
+ 'IllustrationPointName' TEXT NOT NULL,
'ClosingSituation' TEXT NOT NULL,
'WindDirectionName' TEXT NOT NULL,
'WindDirectionAngle' REAL NOT NULL,
Index: design/DatabaseDesign.eap
===================================================================
diff -u -rab5185b4950e4d02d6334996028cd65239e152dc -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e
Binary files differ