Fisheye on Riskeer/Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/test-data/HeightStructuresCalculation

Riskeer (): Reverted merge attempts so far Related to Issue [WTI-645]...

Thu, 16 Jun 2016 11:56:57 +0200

bos_en committed ab3c22a on branch in Riskeer

Reverted merge attempts so far Related to Issue [WTI-645]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/WTI-645@3656 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 9702ab8b2e5b1e7ed2fcf69c88c76f9e4231a127

Former-commit-id: cb8a111f6aa65b1e58b67d35a078fa539015743e

· /Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf

(-58, +58)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj

(-5, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/.../Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs

(-11, +0)

| History

| Source

| Diff

· /Application/Ringtoets/.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs

(-57, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs

(-34, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/.../Create/PipingFailureMechanismCreateExtensions.cs

(-2, +2)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql

(-19, +2)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs

(-3, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/.../DbContext/GrassCoverErosionInwardsSectionResultEntity.cs

(-45, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs

(-6, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs

(-1, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx

(-64, +0)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

(-16, +14)

| History

| Source

| Diff

· /Application/Ringtoets/src/.../Read/AssessmentSectionEntityReadExtensions.cs

(-2, +19)

| History

| Source

| Diff

· /Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs

(-14, +18)

| History

| Source

| Diff

… 95 more files in changeset.

Riskeer (): Merged revision(s) 3617 from trunk: Merged revision(s) from branches/WTI 616. ...........

Thu, 16 Jun 2016 11:39:12 +0200

bos_en committed 0cc0f65 on branch in Riskeer

Merged revision(s) 3617 from trunk: Merged revision(s) from branches/WTI 616. ........

Related to Issue [WTI-645]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/WTI-645@3653 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: cd25ad466f869862ff4b389028761e11b4b1bc34

Former-commit-id: d0a5175cc78415a4d3ced49deba19581420cf960

· /Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs

(-0, +10)

| History

| Source

| Diff

· /Core/Common/src/Core.Common.Base/Properties/Resources.resx

(-0, +3)

| History

| Source

| Diff

· /Core/Common/test/Core.Common.TestUtil/TestDataPath.cs

(-0, +5)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.Service/DateTimeService.cs

(-0, +42)

| History

| Source

· /Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs

(-0, +117)

| History

| Source

· /Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx

(-0, +138)

| History

| Source

· /Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj

(-0, +12)

| History

| Source

| Diff

· /Ringtoets/Common/test/Ringtoets.Common.Service.Test/DateTimeServiceTest.cs

(-0, +37)

| History

| Source

· /Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj

(-0, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsGuiPlugin.cs

(-108, +10)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Plugin.csproj

(-0, +4)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationActivity.cs

(-0, +110)

| History

| Source

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationService.cs

(-0, +184)

| History

| Source

· /Ringtoets/GrassCoverErosionInwards/src/.../Properties/AssemblyInfo.cs

(-1, +4)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Service.csproj

(-0, +33)

| History

| Source

| Diff

… 48 more files in changeset.

Riskeer (Release16_1_1): - Implemented new service and activity for DesignWaterLevelCalculations. - Added extra check in validation for grassCove...

Wed, 15 Jun 2016 15:20:07 +0200

Robert Tangerman committed 0a51f20 on branch master, Release16_1_1 and 30 more in Riskeer

- Implemented new service and activity for DesignWaterLevelCalculations. - Added extra check in validation for grassCoverErosionInwardsCalculation and HeightStructuresCalculation service. Related to Issue [WTI-616]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@3633 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 358404e4abedfb0ff31b12d8a7934e55d5145bf9

Former-commit-id: 2742440466cf4a3a889f1b5ead07d353c6a99e16

· /Core/Common/test/Core.Common.TestUtil/TestDataPath.cs

(-5, +1)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs

(-3, +2)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Data.csproj

(-0, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsGuiPlugin.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Plugin.csproj

(-0, +3)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationActivity.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationService.cs

(-3, +13)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Service.csproj

(-0, +10)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs

(-1, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs

(-1, +66)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationServiceIntegrationTest.cs

(-1, +114)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationActivityTest.cs

(-32, +0)

| History

| Source

| Diff

… 40 more files in changeset.

Riskeer (Release16_1_1): Merged revision(s) from branches/WTI-616....

Wed, 15 Jun 2016 10:17:58 +0200

Robert Tangerman committed e568165 on branch master, Release16_1_1 and 30 more in Riskeer

Merged revision(s) from branches/WTI-616.

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@3617 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: e7b8d2db71731c5c810ca964484ff64a7225aed5

Former-commit-id: c2325b82c7949c85a03d994c0a9a63557204a288

· /Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs

(-0, +10)

| History

| Source

| Diff

· /Core/Common/src/Core.Common.Base/Properties/Resources.resx

(-0, +3)

| History

| Source

| Diff

· /Core/Common/test/Core.Common.TestUtil/TestDataPath.cs

(-0, +5)

| History

| Source

| Diff

· /Ringtoets/Common/src/Ringtoets.Common.Service/DateTimeService.cs

(-0, +42)

| History

| Source

· /Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs

(-0, +117)

| History

| Source

· /Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx

(-0, +138)

| History

| Source

· /Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj

(-0, +12)

| History

| Source

| Diff

· /Ringtoets/Common/test/Ringtoets.Common.Service.Test/DateTimeServiceTest.cs

(-0, +37)

| History

| Source

· /Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj

(-0, +1)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsGuiPlugin.cs

(-108, +10)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Plugin.csproj

(-0, +4)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationActivity.cs

(-0, +110)

| History

| Source

· /Ringtoets/GrassCoverErosionInwards/.../GrassCoverErosionInwardsCalculationService.cs

(-0, +184)

| History

| Source

· /Ringtoets/GrassCoverErosionInwards/src/.../Properties/AssemblyInfo.cs

(-1, +4)

| History

| Source

| Diff

· /Ringtoets/GrassCoverErosionInwards/.../Ringtoets.GrassCoverErosionInwards.Service.csproj

(-0, +33)

| History

| Source

| Diff

… 48 more files in changeset.

Riskeer (): Added integration tests for HeightStructuresCalculationActivity. Related to Issue [WTI-616]...

Tue, 14 Jun 2016 12:53:16 +0200

Robert Tangerman committed 0025ffa on branch in Riskeer

Added integration tests for HeightStructuresCalculationActivity. Related to Issue [WTI-616]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/WTI-616@3597 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 2f8ef33c7a31e55c24514eabcb300b034f7d777f

Former-commit-id: 9692db465f2fdb2e24f73ea62cd73edbfcf199d5

· /Core/Common/test/Core.Common.TestUtil/TestDataPath.cs	(-0, +5)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/.../Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(-11, +13)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/.../Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(-6, +37)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Resources.Designer.cs	(-0, +10)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Resources.resx	(-0, +3)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/.../Ringtoets.HeightStructures.Service.csproj	(-0, +1)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/test/.../TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(-3, +6)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/.../HeightStructuresCalculationActivityIntegrationTest.cs	(-0, +239)	\| History	\| Source
· /Ringtoets/HeightStructures/.../Ringtoets.HeightStructures.Integration.Test.csproj	(-0, +45)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/test/.../test-data/HeightStructuresCalculation/HLCD.sqlite	(binary)	\| History	\| Source
· /Ringtoets/HeightStructures/test/.../test-data/HeightStructuresCalculation/HRD dutch coast south.sqlite	(binary)	\| History	\| Source
· /Ringtoets/HeightStructures/.../HeightStructuresCalculationActivityTest.cs	(-1, +2)	\| History	\| Source	\| Diff
· /Ringtoets/HeightStructures/.../Ringtoets.HeightStructures.Service.Test.csproj	(-0, +8)	\| History	\| Source	\| Diff