DAM / DamClients / DamUI / trunk

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 8
Last Commit: 17 Dec
Commits this week: 1
Total Lines of Code (LoC): 87,768
Net change in LoC this week: 78

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading

Subversion Details

1 property
  • svn:mergeinfo = /DamClients/DamUI/branches/DamUI 18.1/src:1460,1761,2115,2119 /DamClients/DamUI/branches/DamUI 19.1/src:2804-2805 /DamClients/DamUI/branches/DamUI 19.3/src:3703,3706-3707,3751,3753-3754,3766-3774 /DamClients/DamUI/branches/DamUI 23.1/src:3941 /DamClients/DamUI/branches/RefactoringClientLibrary/src:1501-1506,1509
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 02 Apr 2019
3:54 pm

John Bokma

Added the requested check with log messages for errors found. Adapted test values as some of the test data used in these existing tests proved to contain coinciding characteristic points which is now no longer accepted.

Related to Issue [MWDAM-300]

Options
    • -7
    • +7
    ./Dam/Tests/WaterBoardImporterTests.cs
    • -4
    • +3
    ./Dam/Tests/DataPluginImporterCsvTests.cs
    • -1
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -2
    • +61
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -0
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -2
    • +2
    ./Dam/Tests/CsvImporterTestsNew.cs
2:59 pm

Tom The

Fix file headers

Related to Issue [MWDAM-1407]

Options
    • -1
    • +22
    ./Dam/Forms/DamSurfaceLineControl.Designer.cs
    • -3
    • +3
    ./Dam/Forms/DamSurfaceLineControl.cs
12:36 pm

John Bokma

Adapted ProjectLoader for now static method.

Related to Issue [MWDAM-1458]

Options
    • -1
    • +1
    ./Dam/Tests/TestHelper/ProjectLoader.cs
12:18 pm

John Bokma

Fixed the failing tests.

Related to Issue [MWDAM-1458]

Options
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
  2. … 6 more files in changeset.
Monday 01 Apr 2019
4:36 pm

John Bokma

Solved by adapting the translation.

Related to Issue [MWDAM-1432]

Options
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
3:37 pm

John Bokma

Re-added ResetGroupID as this is used in the tests belonging to DamLive.

Related to Issue [MWDAM-1458]

Options
    • -0
    • +9
    ./DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
3:21 pm

John Bokma

Removed obsolete test data and translations as pointed out by reviewer.

Related to Issue [MWDAM-1443]

Options
    • -5
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
    • -3
    • +0
    ./Dam/Tests/Importers/LocationShapeFileImporterTest.cs
  3. ./Dam/Tests/TestData/LocationImportData
    • -1
    • +0
    ./Dam/Forms/Translations.xml
    • -62
    • +0
    ./Dam/Tests/TestData/LocationImportData/LocationProperties.txt
    • -4
    • +0
    ./Dam/Tests/TestData/LocationImportData/locations.csv
2:43 pm

John Bokma

Removed WIP-status of the tests created by Tom for this issue as these now all succeed. Removed the obsolete line and added missing comments.

Related to Issue [MWDAM-1436]

Options
    • -1
    • +1
    ./Dam/Tests/LoadCompatiblityTest.cs
    • -2
    • +7
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
2:08 pm

John Bokma

Added the requested table as read only. Making some of it editable is another issue.

Related to Issue [MWDAM-1407]

Options
    • -1
    • +22
    ./Dam/Forms/DamContext.cs
    • -0
    • +120
    ./Dam/Forms/DamSurfaceLineControl.resx
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -0
    • +115
    ./Dam/Forms/DamSurfaceLineControl.cs
    • -12
    • +9
    ./Dam/Forms/DamPlugin.cs
    • -0
    • +86
    ./Dam/Forms/DamSurfaceLineControl.Designer.cs
    • -0
    • +9
    ./Dam/Forms/Deltares.Dam.Forms.csproj
Thursday 28 Mar 2019
3:33 pm

John Bokma

Adapted the code to get the tests added by The working.

Related to Issue [MWDAM-1436]

Options
    • -27
    • +1
    ./Dam/Forms/DamPlugin.cs
    • -0
    • +3
    ./Dam/Tests/TestHelper/ProjectLoader.cs
    • -0
    • +52
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -1
    • +4
    ./Dam/Tests/LoadCompatiblityTest.cs
2:03 pm

John Bokma

Extracted the damx version using a new xmlhandler, deletion of results is handled in de Assign method of the DamPlugin.cs. Added tests for new assembler.

Related to Issue [MWDAM-1436]

Options
    • -0
    • +134
    ./DamClientsLibrary/Deltares.Dam.Data/IO/DamProjectVersionXmlHandler.cs
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -0
    • +26
    ./Dam/Forms/DamPlugin.cs
    • -0
    • +1
    ./Dam/Tests/Deltares.Dam.Tests.csproj
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
    • -0
    • +127
    ./Dam/Tests/IO/DamProjectVersionXmlHandlerTests.cs
12:23 pm

Esther van Zantvoort

Removed values that were overwritten

Related to Issue [MWDAM-1415]

Options
    • -1
    • +0
    ./Dam/Tests/EntityFactoryTest.cs
    • -3
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
Wednesday 27 Mar 2019
6:00 pm

John Bokma

Removed obsolete (assessment mode) tests.

Related to Issue [MWDAM-1429]

Options
    • -42
    • +0
    ./Dam/Tests/Deltares.Dam.Tests.csproj
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.BenchmarkTests.csproj
    • -269
    • +0
    ./Dam/Tests/DamCalculationBenchmarkTest.cs
    • -46
    • +0
    ./Dam/Tests/Deltares.Dam.IntegrationTests.csproj
    • -0
    • +1
    ./Dam/Tests/DamIntegrationTestHelper.cs
  6. ./Dam/Tests/TestData/Dijkring13-Sec1
    • -78
    • +0
    ./Dam/Tests/DAMProjectCalculatorDijkring13Test.cs
    • -10
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/Results.csv
    • -2
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/surfacelines.csv
    • -2
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/PipingCharacteristicPoints.csv
    • -4
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/ResultsNormalStability.csv
    • -6
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/segments.csv
    • -2
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/scenarios.csv
    • -29
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/soilprofiles.csv
    • -2
    • +0
    ./Dam/Tests/TestData/Dijkring13-Sec1/PipingSurfaceLines.csv
  16. … 88 more files in changeset.
4:00 pm

John Bokma

Processed review comments.

Related to Issue [MWDAM-1409]

Options
    • -11
    • +18
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
  2. … 1383 more files in changeset.
Tuesday 26 Mar 2019
12:00 pm

Tom The

Transfer traffic load degree of consolidation to Dam Engine

Related to Issue [MWDAM-1416]

Options
    • -4
    • +4
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -0
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -0
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
Friday 22 Mar 2019
6:21 pm

John Bokma

Fixed unit test.

Related to Issue [MWDAM-1409]

Options
    • -2
    • +2
    ./Dam/Tests/Importers/LocationPropertyImporterTest.cs
6:14 pm

John Bokma

Fixed some more translations (English should be Camel Case, Dutch not).

Related to Issue [MWDAM-1424]

Options
    • -81
    • +78
    ./DamClientsLibrary/Deltares.Dam.Data/Translations.xml
5:32 pm

John Bokma

Implemented review comments by Irene even though these were wildly out of scope.

Related to Issue [MWDAM-1409]

Options
    • -1
    • +6
    ./DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
    • -30
    • +39
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs
3:07 pm

John Bokma

Implemented review comments by Tom.

Related to Issue [MWDAM-1409]

Options
    • -10
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -142
    • +0
    ./Dam/Tests/WaterBoardImporterTest.cs
    • -1
    • +0
    ./Dam/Tests/Deltares.Dam.IntegrationTests.csproj
2:30 pm

John Bokma

Corrected some wrongly determined results.

Related to Issue [MWDAM-1409]

Options
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
    • -76
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
    • -18
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
    • -119
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/MStabResults.cs
1:23 pm

Esther van Zantvoort

corrected position of edits for traffic load and degree of consolidation

Related to Issue [MWDAM-1415]

Options
    • -1
    • +0
    ./Dam/Forms/LocationPropertyControl.cs
    • -2
    • +2
    ./Dam/Forms/LocationPropertyControl.Designer.cs
12:29 pm

Esther van Zantvoort

Added degree of consolidation to last tests.

Related to Issue [MWDAM-1415]

Options
    • -1
    • +5
    ./Dam/Tests/Importers/LocationPropertyImporterTest.cs
12:28 pm

Esther van Zantvoort

Divided values for degree of consolidation in shapefile by 100.

Created DemoGrootSallandWithShapefiles.defx to be able to test the import of the shapefile in the UI.

Related to Issue [MWDAM-1415]

Options
    • -1
    • +1
    ./Dam/Tests/DataPluginImporterDataShapeFilesTests.cs
  2. … 2 more files in changeset.
12:04 pm

Tom The

Implement changes of DamEngine for DAM UI:

Replace type of SubSoilScenario.SegmentFailureMechanismType from FailureMechanismSystemType to SegmentFailureMechanismType

Related to Issue [MWDAM-1294]

Options
    • -2
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -3
    • +53
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
    • -3
    • +3
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -8
    • +38
    ./Dam/Tests/DamEngineIo/ConversionHelperTests.cs
11:38 am

Esther van Zantvoort

Fixed bug reading degree of consolidation from shapefile. Created test CanRetrieveDegreeOfConsolidationFromDataShapeFile. Added shapefile TL_DegreeOfConsolidation to Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles

Related to Issue [MWDAM-1415]

Options
    • -1
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -5
    • +21
    ./Dam/Tests/DataPluginImporterDataShapeFilesTests.cs
  3. … 6 more files in changeset.
11:17 am

John Bokma

Re-added locationPropertyControl for non assessment mode use.

Related to Issue [MWDAM-1409]

Options
    • -0
    • +1
    ./Dam/Forms/DamPlugin.cs
Thursday 21 Mar 2019
7:14 pm

Esther van Zantvoort

added TL_DegreeOfConsolidation

Related to Issue [MWDAM-1415]

Options
    • -0
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -3
    • +6
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -0
    • +2
    ./DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -6
    • +42
    ./Dam/Forms/LocationPropertyControl.Designer.cs
    • -0
    • +1
    ./Dam/Forms/LocationPropertyControl.cs
    • -0
    • +11
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -0
    • +2
    ./Dam/Tests/LocationTest.cs
    • -0
    • +5
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs
    • -3
    • +3
    ./Dam/Tests/TestData/CSVData/Full1DProject/csvfiles/locations.csv
    • -0
    • +7
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
Wednesday 20 Mar 2019
11:49 am

Tom The

Adapted to review

Related to Issue [MWDAM-1340]

Options
    • -0
    • +1
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
  2. … 1 more file in changeset.
Tuesday 19 Mar 2019
6:34 pm

John Bokma

Removed DamType from the UI.

Related to Issue [MWDAM-1443]

Options
    • -2
    • +2
    ./Dam/Tests/DataPluginImporterIrisTests.cs
    • -2
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -2
    • +0
    ./Dam/Tests/TestHelper/FactoryForStabilityTests.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -5
    • +4
    ./Dam/Tests/DataPluginImporterDataShapeFilesTests.cs
    • -3
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • -2
    • +2
    ./Dam/Tests/DataPluginImporterMGeobaseTests.cs
    • -3
    • +3
    ./Dam/Tests/DataPluginImporterBackgroundTests.cs
    • -1
    • +1
    ./Dam/Tests/TestHelper/ProjectLoader.cs
    • -11
    • +4
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs
    • -3
    • +2
    ./Dam/Forms/DamPlugin.cs
    • -8
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
    • -13
    • +13
    ./Dam/Tests/DataPluginImporterCsvTests.cs
    • -3
    • +3
    ./DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs
    • -15
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs
  16. … 20 more files in changeset.
2:30 pm

John Bokma

Deleted Location.DikeTableHeight parameter from UI too.

Related to Issue [MWDAM-1410]

Options
    • -5
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCsvColumnNames.cs
    • -3
    • +1
    ./Dam/Tests/CsvImporterTestsNew.cs
    • -1
    • +0
    ./Dam/Tests/LoadCompatiblityTest.cs
    • -1
    • +0
    ./Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
    • -2
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
    • -2
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
    • -1
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
    • too large
    ./DamClientsLibrary/Deltares.Dam.Data/Location.cs
    • -7
    • +0
    ./DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
    • -11
    • +1
    ./DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs