 Axel Uhl
|
f4a8ed1106
|
Merge branch 'master' into bug4425
Change-Id: I431c2aefe52d83c7f63a0962d265a45cf23ef9bb
|
2018-04-12 20:08:37 +02:00 |
|
|
Axel Uhl
|
4c319f5f6c
|
renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
|
2018-04-12 14:18:16 +02:00 |
|
 Kai Börnert
|
8a9137e600
|
Merge branch 'master' into bug4425
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/nodes/IdleOverallLeaderBoardNode.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsDialogComponent.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardPanelLifecycle.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/OverallLeaderboardSettingsDialogComponent.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/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.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/client/StringMessages_de.properties
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/raceboard/RaceBoardEntryPoint.java
|
2018-04-09 15:04:51 +02:00 |
|
|
Kai Boernert
|
67225a85c7
|
Merge branch 'master' into bug4425
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/configs/impl/AutoPlayClassicConfiguration.java
|
2018-03-29 14:48:50 +02:00 |
|
|
Axel Uhl
|
360f72a6a7
|
Merge branch 'master' into bug2822_boatcolors
|
2018-03-24 08:49:11 +01:00 |
|
|
Axel Uhl
|
bd90f921dd
|
added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule
|
2018-03-24 01:45:37 +01:00 |
|
|
Axel Uhl
|
e812b1ad60
|
Merge branch 'master' into bug2822_boatcolors
Change-Id: I19333a21e5d79726b1409eb319798f55b49faf79
|
2018-03-22 14:45:41 +01:00 |
|
|
Kai Boernert
|
7ba5086c34
|
Merge branch 'master' into bug4425
|
2018-03-22 09:06:48 +01:00 |
|
 Steffen Schaefer
|
0601becf81
|
Bug 4489: Initial implementation to ensure replication state for out of
thread event processing in TrackedRegattaImpl
|
2018-03-21 16:50:37 +01:00 |
|
|
Axel Uhl
|
9cf283eec6
|
Merge branch 'master' into bug2822_boatcolors
Change-Id: I883401360422f104c3c3de844a7c3759753a887b
|
2018-03-16 13:43:19 +01:00 |
|
|
Steffen Schaefer
|
6dfba0dd85
|
Merge branch 'master' into bug4425
|
2018-03-13 13:13:43 +01:00 |
|
|
Axel Uhl
|
a9c15e75a7
|
Merge branch 'master' into bug4425
Change-Id: I4380d0b4283a0e782f18465ca2963238d8884abc
|
2018-03-06 13:32:33 +01:00 |
|
|
Steffen Schaefer
|
58069edb21
|
GWT config cleanup
|
2018-03-06 09:16:26 +01:00 |
|
|
Steffen Schaefer
|
0fab47564b
|
Merge branch 'master' into bug4427
|
2018-03-06 08:00:03 +01:00 |
|
|
Steffen Schaefer
|
3752d12c3d
|
Merge branch 'bug2822_boatcolors' into bug4416
|
2018-03-06 07:51:29 +01:00 |
|
 Frank Mittag
|
8b82e2c20c
|
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
|
2018-03-05 16:45:42 +01:00 |
|
|
Frank Mittag
|
fca55ba44e
|
added a new 'timepoint' attribute to LeaderboardDTO to know also for 'live leaderboard' requests where the request timepoint is 'null' the timepoint for which leaderboard has been calculated.
Used this timepoint than for the 'resultTimepoint' of the leaderboard API
|
2018-03-02 14:05:36 +01:00 |
|
|
Steffen Schaefer
|
2862850fad
|
Merge branch 'bug2822_boatcolors_merged_with_eol_changes' into bug4416
|
2018-02-28 08:15:38 +01:00 |
|
|
Frank Mittag
|
162392a435
|
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/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2018-02-27 15:17:45 +01:00 |
|
 Papick Garcia Taboada
|
43add42e72
|
Merge remote-tracking branch 'origin/master' into bug4427
|
2018-02-27 11:01:42 +01:00 |
|
|
Steffen Schaefer
|
b618bc5393
|
Bug 4416: Implemented determination of competitors by boat when loading
fixes
|
2018-02-26 15:39:48 +01:00 |
|
|
Axel Uhl
|
afafed669d
|
formatting; using separate variable for test verdict
Change-Id: I22eeb12013084ce88cba21d65fac74011dd780b0
|
2018-02-20 12:09:41 +01:00 |
|
|
Steffen Schaefer
|
9da7dc2011
|
Bug 4425: Code style changes and typos
|
2018-02-20 09:36:46 +01:00 |
|
|
Frank Mittag
|
98abbf7cb4
|
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2018-02-07 13:38:32 +01:00 |
|
|
Kai Boernert
|
34b0df59a7
|
Merge branch 'master' into bug4425
|
2018-02-07 09:36:38 +01:00 |
|
|
Steffen Schaefer
|
e187731b19
|
Bug 4380: improved comment of a unit test
|
2018-02-05 15:05:42 +01:00 |
|
|
Steffen Schaefer
|
3254146b47
|
Merge branch 'master' into bug4380
|
2018-02-02 08:40:46 +01:00 |
|
|
Axel Uhl
|
9b9c4d69fd
|
removed unused TrackedRegatta.removeTrackedRace(RaceDefinition) method
Change-Id: I738f7250fb06a50fe9f92e3a342ac56c5b41e3e1
|
2018-01-31 15:12:36 +01:00 |
|
|
Kai Boernert
|
7a8ee3b8c9
|
wip for detailtypes
|
2018-01-31 09:42:49 +01:00 |
|
|
Steffen Schaefer
|
3728843817
|
Bug 4429: TrackedRegattaImpl now fires events by using Queue to ensure
that events are being received in order
|
2018-01-24 15:04:49 +01:00 |
|
|
Papick Garcia Taboada
|
06490028de
|
Inital project metadata and gwt launch file
|
2018-01-23 14:17:05 +01:00 |
|
|
Steffen Schaefer
|
dd9abeb4c2
|
Bug 4380: Added unfinished test case for race slicing
|
2018-01-16 15:40:49 +01:00 |
|
|
Axel Uhl
|
5073ea75d7
|
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: I61c922f7a1d7ece025ace4cd6277ccce3640d055
|
2018-01-16 11:24:13 +01:00 |
|
 Vladislav Chumak
|
51f695d0cc
|
Extended Restful API for ManeuverWithEstimationData retrievement
|
2018-01-12 03:07:06 +01:00 |
|
|
Vladislav Chumak
|
03251b2504
|
Merge remote-tracking branch 'origin/master' into maneuver_refactoring
|
2017-12-12 23:09:33 +01:00 |
|
|
Frank Mittag
|
ab250e131b
|
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/preliveraceloop/leaderboard/PreLiveRaceLeaderBoardWithImagePresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/statistics/AbstractStatisticsBoxPresenter.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
|
2017-12-08 11:52:11 +01:00 |
|
|
Frank Mittag
|
b3aba4bb73
|
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorProviderCacheInvalidationTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/CompetitorProviderFromRaceColumnsAndRegattaLike.java
|
2017-11-24 15:20:31 +01:00 |
|
|
Vladislav Chumak
|
667013b14d
|
Merge remote-tracking branch 'origin/master' into maneuver_refactoring
Conflicts:
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/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.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.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
|
2017-11-23 15:15:32 +01:00 |
|
|
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 |
|
|
Steffen Schaefer
|
2bad1681ea
|
Merge branch 'master' into bug4374
|
2017-11-22 15:19:30 +01:00 |
|
|
Steffen Schaefer
|
8d6aaff51c
|
Bug 4374: Changes to ensure that country flags aren't included in the
leftover fragment
|
2017-11-22 14:46:44 +01:00 |
|
|
Axel Uhl
|
a40e19aed7
|
Merge branch 'master' into bug4365
|
2017-11-21 16:26:12 +01:00 |
|
|
Axel Uhl
|
5b0b3cec41
|
bug 4365: offer VMG chart also outside of race
Change-Id: Ibf8b2076cb4d74b9b533a5f4c490db6ea5a16a99
|
2017-11-21 10:52:17 +01:00 |
|
|
Axel Uhl
|
7c5a25d311
|
interims backup commit on the way to introducing foiling overall stats to leaderboard
Change-Id: Idf6759d1aa8031015a09aba3d265cd8a1e9f969a
|
2017-11-20 18:40:32 +01:00 |
|
|
Vladislav Chumak
|
d286bb990b
|
Refactored maneuver detection out of TrackedRaceImpl
|
2017-10-26 18:36:49 +02:00 |
|
|
Steffen Schaefer
|
94bfa841cb
|
Bug 4303: Updated version of GWT bundles
|
2017-10-24 09:15:15 +02:00 |
|
|
Axel Uhl
|
e0441c70e4
|
more clean-up after Simon's tab mess
Change-Id: I84c76c8d918bde74e4c037d9c6f71048fbec3864
|
2017-10-20 16:59:49 +02:00 |
|
 Simon Pamies
|
b36f652a44
|
Moved away from custom average speed computation and now being in line with calculation used by LeaderboardPanel
|
2017-10-20 10:15:04 +02:00 |
|
|
Steffen Schaefer
|
f8676e7056
|
Bug 4316: Availability of rideHeight now depends on the existence of at
least one BravoFixTrack for any Competitor
|
2017-10-04 16:35:19 +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 |
|