Frank Mittag
d45de24610
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Frank Mittag
7517a9a26c
fixed a couple of tests after removal of BoatStore.getOrCreateBoat(competitor)
2017-11-16 11:05:07 +01:00
Axel Uhl
021ac5e80e
Merge branch 'master' into bug4356
2017-11-13 11:33:54 +01:00
Axel Uhl
612e9b76d5
when adding a device mapping for EXPEDITION_SENSOR, use the correct log event type
...
Change-Id: I6358ff0120224082532ad25d40265b49e2c02142
2017-11-08 14:20:38 +01:00
Axel Uhl
6924ea32b8
bug 4356: included MergeState enum and field in CompetitorResult
...
Change-Id: I974bb5904c7e71efc142ac19e84b03a91b7ad045
2017-10-27 10:42:32 +02:00
Frank Mittag
85f3ec4723
Implemented migration of COMPETITORS collection to COMPETITORS_WITH_BOAT_REFERENCES and BOATS collections (old COMPETITORS collection is not deleted for easier development and debugging)
...
TracTrac connector uses now boat metadata AND leaderboardGroup to create boatIds and lookup boats from the boat store.
2017-09-29 16:09:30 +02:00
Axel Uhl
380cd27572
introduced a CreateCompetitor operation, adjusted test; should fix bug4291
...
Change-Id: I4c2e040e36884eb2e31f7dbb803dde67a52c9701
2017-09-15 15:23:07 +02:00
Frank Mittag
ecc51c05ba
Removed the idea of a RegattaLogEntryEvent
...
Refactored CompetitorProviderFromRaceColumnsAndRegattaLike to be a CompetitorAndBoatProviderFromRaceColumnsAndRegattaLike to cache also the boats of the competitors
2017-08-30 17:01:01 +02:00
Frank Mittag
68ae4f561c
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
# java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-08-28 16:12:00 +02:00
Frank Mittag
48162c73be
major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it.
2017-08-25 17:09:00 +02:00
Kai Boernert
a02dea2a28
cleaned up and removed code not required for stage 1 of anniversaries
2017-08-07 09:46:32 +02:00
Steffen Schaefer
101b686eae
Bug 4227: Fixed compiler errors after merge
2017-08-04 15:29:45 +02:00
Frank Mittag
9e9f5aeaec
changed loading of competitors in competitorStore to load the old competitors with the contained boat
2017-07-21 16:41:38 +02:00
Frank Mittag
244908246d
added a load/store test for the new shortName attribute of a competitor
2017-06-21 17:09:50 +02:00
Frank Mittag
dc045b7f4b
added a load/store test case for new attribute shortName of competitor
2017-06-21 15:41:48 +02:00
Frank Mittag
1dc4676195
Added some basic load/store tests for boats
2017-06-21 15:40:59 +02:00
Frank Mittag
78bcf32976
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/comparators/CompetitorSailIdComparator.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
2017-06-21 13:50:36 +02:00
Steffen Schäfer
3801dbc4f5
Normalized line endings
2017-06-21 11:30:30 +02:00
Steffen Schäfer
e3c9305a92
Merge branch 'bug2822_boatcolors' into
...
bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
2017-06-20 13:02:02 +02:00
Frank Mittag
bc8a71f058
Next step of the removal of Competitor.getBoat()
...
As this affects also CompetitorDTO.getBoat() I introduced as an intermediate step CompetitorWithoutBoatDTO (CompetitorDTO extends CompetitorWithoutBoatDTO) for simpler refactoring.
Added also some new RaceLog and RegattaLog events for adding a competitor/boat pair
2017-06-19 21:21:31 +02:00
Axel Uhl
dc8b15038b
added a test case for leaderboard with elimination persistence
...
Change-Id: I2b15b85833228dc7029c4f6aadd015b3aaef088b
2017-05-22 14:57:55 +02:00
Steffen Schäfer
1542a36109
Merge branch 'master' into bug2822_boatcolors
2017-05-16 16:12:16 +02:00
Steffen Schäfer
67d310df4b
Merge branch 'master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
# java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Steffen Schaefer
9123771f34
normalized line endings
2017-05-16 09:42:02 +02:00
Axel Uhl
bbe1d26c66
whitespace/line ending changes only
...
Change-Id: I3fa9f3747202cec363e4676a06a48c12d473e486
2017-05-09 15:20:21 +02:00
Axel Uhl
fed1c3c469
adjusted test case such that the new restrictions for regatta creation are obeyed
2017-05-03 10:07:50 +02:00
Frank Mittag
fd8fee5d58
work commit in the middle of refactoring competitor.getBoat()
2017-04-28 09:08:14 +02:00
Axel Uhl
9ccd61ef67
fixed test cases
...
Change-Id: I60ef73c89e63ac0b05d70f148cc9ff837f3f2a4d
2017-04-11 16:13:11 +02:00
Axel Uhl
b11dca244e
bug3552: refactored Mark.color from String to Color
...
Change-Id: Iddcc26de68dd5c1ecd3fdcbb61e59810e879ae37
2017-04-11 11:20:46 +02:00
Frank Mittag
358b733fd6
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2017-03-30 18:05:51 +02:00
Axel Uhl
cfccd8c5d6
Merge remote-tracking branch 'origin/tracapi-3.6.0'
2017-03-08 21:35:31 +01:00
Frank Mittag
637786c106
fixed some compile errors after last master merge
2017-03-08 16:27:39 -03:00
Frank Mittag
31e8164166
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh_CN.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java
2017-03-08 16:03:56 -03:00
Axel Uhl
a4b5bfe8d5
use timeout mechanism of TracAPI 3.6.0 for obtaining IRace from TracTrac
...
Change-Id: Ib3ceca870482ce524f647f7c985320c470086a95
2017-03-08 12:17:49 +01:00
Axel Uhl
80d6b83d95
adjusted WindTracks test to relaxed accuracy
...
Change-Id: I7cab91c4c83091f1049cc3b31cf60417d637d0a0
2017-03-07 20:25:28 +01:00
Axel Uhl
547e2e2372
after TracTrac changed what they return as stored URI, adjusted test case accordingly
...
Change-Id: Ib653da911857e88eba0366b5eaceb854d2b0f0e9
2017-03-06 16:48:25 +01:00
Axel Uhl
587a529a8f
fixed connectivity params loading tests by introducing a waitable future
...
Change-Id: If099c72964f9785df73ac80022eb514d177644a7
2017-03-04 12:39:37 +01:00
Axel Uhl
a615173f26
pass through the timeout parameter to the trackers; TracTrac receivers now use it; -1 means wait and is used for restore
...
Change-Id: Iee676ffceb44eb9459c51ba38cddbaf5ba40c9fb
2017-01-27 15:07:56 +01:00
Axel Uhl
844bd18681
fixed test case: TracTrac connectivity params now require a valid paramURL
...
Change-Id: Ie14112cdd0f7edf129985ddcab96bd5a45bcdd6d
2017-01-26 16:01:30 +01:00
Axel Uhl
9a8df602b4
fix for bug4040: computing update for storedURI/liveURI already in TracTrac connectivity params, keeping tracker ID and params ID equal
...
Change-Id: I8f86770286332a5198ab2ba57b83a52c67759008
2017-01-26 11:55:46 +01:00
Axel Uhl
688d37d27c
bug 4037: automatically "upgrade" to replay format during restore if available;
...
still using a kludge for detecting replay format; TracAPI 3.3.2 will
offer a reliable API for that later today
Change-Id: Ied19e1e787f6f28d2a6e531b9ac1aedf5721ab5b
2017-01-25 08:47:17 +01:00
Steffen Schaefer
673907c017
Merge branch 'master' into bug2447
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/pom.xml
2017-01-09 10:05:05 +01:00
fmittag
fbd07215d3
added some simple load/store and replication tests for new 'canBoatsOfCompetitorsChangePerRace' attribute of regatta
2017-01-03 13:05:35 +01:00
fmittag
45452ac185
added canBoatsOfCompetitorsChangePerRace attribute to regatta (+corresponding load/store methods and admin UI)
2016-12-30 17:05:03 +01:00
Axel Uhl
f9b4ac7b50
passing through trackWind and correctByDeclination params into connectivity params
...
Change-Id: I7adbb4f2c84e5352c9f3891b23198b74ca2fce4c
2016-12-30 12:02:06 +01:00
Axel Uhl
19d112115b
first working version of tracked race restoring with -Drestore.tracked.races=true;
...
Change-Id: I2c3968d772c7382589ada66c60874015f46f8996
2016-12-29 17:18:42 +01:00
fmittag
474295d281
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
2016-12-29 14:03:06 +01:00
Axel Uhl
2de65963c4
added tests for removing the connectivity params from the DB again
...
Change-Id: I0d0c8d34f1ac3e1e95951b356d3ae8877be4f78e
2016-12-29 13:22:11 +01:00
Axel Uhl
ce52b0cf05
added a test case for SwissTimingReplay connectivity params persistence
...
Change-Id: I5b32606540bb6c008cedfe8ee8c3423459f45680
2016-12-29 13:10:19 +01:00
Axel Uhl
f81fe95c6f
made connectivity params getters public so that handlers can access them from other bundles
...
Change-Id: I03906cfc4eb4b0c7eba3d7336f7f49a997d11a62
2016-12-29 11:10:55 +01:00