Steffen Schaefer
7b143f372c
Merge branch 'master' into bug5085
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Mark.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/MarkImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/server/SailingServiceImpl.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/RacingEventServiceImpl.java
2019-11-04 13:08:42 +01:00
Axel Uhl
74338f692e
major refactoring of RaceLogResolver;
...
Introduced specialization that can also resolve a TrackedRace based on a
SimpleRaceLogIdentifier. This is then used to find TrackedRaces for race
log entries setting the implied wind to come from another TrackedRace.
With this, it doesn't matter whether the other tracked race has an ORC
Performance Curve ranking metric or not, or if the reference points to a
race slot that doesn't even have a tracked race attached. If a tracked
race is attached, it will be asked for its "reference implied wind."
Otherwise, the race log will be scanned, but if "own maximum implied
wind" is requested and there is no tracked race, null will be returned.
Change-Id: I14fe32f8a473281c9f489eb081544ae20c5b37f3
2019-10-26 00:00:58 +02:00
Steffen Jacobs
a20fd287f5
Bug 5085: added default number of laps for CourseTemplate
2019-09-25 14:22:35 +02:00
Steffen Jacobs
8728b84ca1
Bug 5085: added short name for CourseTemplates
2019-09-18 16:14:20 +02:00
Steffen Schaefer
187a9f127a
Bug 5085: Removed redundant ControlPointTemplateImpl by using
...
MarkPairTemplateImpl
2019-08-22 16:42:05 +02:00
Steffen Schaefer
b21a1f1798
Bug 5085: Implemented missing handling of role associations for
...
CourseTemplates
2019-08-20 16:12:50 +02:00
Steffen Schaefer
85cbd60beb
Bug 5085: Introduced a dedicated implementation for the repeatable part
2019-08-20 14:29:19 +02:00
Steffen Schaefer
a777860551
Bug 5085: Added optional image URL for CourseTemplate
2019-08-14 14:02:25 +02:00
Steffen Jacobs
f14aadecf2
Bug 5085: added and used constructor with UUID to CourseTemplateImpl
2019-08-13 14:48:50 +02:00
Steffen Jacobs
e746b04c75
Bug 5085: added storing of CourseTemplates
2019-08-13 13:36:02 +02:00
Steffen Jacobs
da4875fae2
Bug 5085: adjusted CourseTemplate to fit new model definition
2019-08-13 12:59:37 +02:00
Axel Uhl
2f68ec5b21
added more tests for CourseTemplate
...
Change-Id: Ic2e70fefe9c9dbf7928141da1b9ed3a244ed3103
2019-07-04 18:03:26 +02:00
Axel Uhl
e2b64fd08d
first test case and according fixes for course template lap logic
...
Change-Id: Iaaacc4573a727854769b093e8cfb01a864a0f7e4
2019-07-04 17:54:18 +02:00
Axel Uhl
89e8bef9c8
Revert "removed PluginNature from our OSGi bundles; they are not Eclipse plugins";
...
according to https://bugs.eclipse.org/bugs/show_bug.cgi?id=544977#c21 the
scenario of using the ManifestBuilder without setting the PluginNature is
not a supported scenario. Besides, it doesn't help to get rid of the new
Eclipse warning regarding non-exported packages.
This reverts commit 063484e29f
2019-05-28 21:54:20 +02:00
Axel Uhl
063484e29f
removed PluginNature from our OSGi bundles; they are not Eclipse plugins
2019-05-27 22:53:30 +02:00
Axel Uhl
242513b42e
Merge branch 'master' into permission-vertical
2019-04-13 08:25:19 +02:00
Robert Benedikt
e7a97749bc
Merge branch 'master' into bug4703
...
# Conflicts:
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultEditableImpl.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/CompetitorResultWithIdImpl.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/PenaltyFragment.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
# mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
2019-04-12 11:34:24 +02:00
Steffen Schaefer
1e00d2d194
Merge branch 'master' into permission-vertical
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
# java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
# java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.polars.datamining/META-INF/MANIFEST.MF
# java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
# java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java
# java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
# java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
# java/com.sap.sailing.server/META-INF/MANIFEST.MF
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
# java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java
# java/com.sap.sse.security.test/META-INF/MANIFEST.MF
# java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java
# java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java
# java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
# java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java
# java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java
# java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java
# java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2018-12-17 14:36:37 +01:00
Axel Uhl
4dd9f10e2c
removed further deprecations by switching imports from junit.* to org.junit
2018-12-10 03:46:28 +01:00
Kai Börnert
704d319d9c
added missing transitive dependency to shared.android.test
2018-12-03 13:24:09 +01:00
Kai Börnert
32ae175e23
manifest adjustment for missing dependency resolve
2018-11-29 15:01:26 +01:00
Manuel Zedel
a6e5206656
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4703
2018-08-10 17:19:08 +02:00
Axel Uhl
6dbbbb1834
bug4713: implemented fix for comment 9; tests locally green
...
Change-Id: I9466ad6d383bc2072f18cb5ca278eaeb73a48fe3
2018-08-09 17:17:53 +02:00
Axel Uhl
6aac0335df
bug4713: avoid phony race status updates if only the meta-attributes for caching have changed
...
Change-Id: If2263925f9e15684cebb5be4f692d6ca69cda459
2018-08-09 11:28:14 +02:00
Axel Uhl
b43879ab29
bug4713: ReadonlyRaceState now updates its status if a status change was possible between last cache calculation time point and the request time point
...
Change-Id: Iba391e2894951e19097e2ea30cdba9c4b4bed815
2018-08-09 11:07:23 +02:00
Axel Uhl
c435d082df
bug4713: added a failing test case
...
Change-Id: I476037f021ee2a84170b5dd90b6bf8cab11157ae
2018-08-09 08:50:17 +02:00
Manuel Zedel
bd6fc8f0e2
tests adjusted
2018-08-08 22:04:15 +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
Frank Mittag
4999933364
added 'canBoatsOfCompetitorsChangePerRace' attribute to RaceGroup for usage in RCApp
2018-02-13 15:57:03 +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
Frank Mittag
7a7e4219be
Reintegration of the concept of the commit I44cc92525acc35b9eb2504517f992343ebc85ede to consider also available race definitions of not tracked traces for the list of competitors
2017-11-20 16:13:04 +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
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
Axel Uhl
c99362e9d9
added a non-trivial test case for race log competitor result merging
...
Change-Id: Ib42676ef2304282f8690c9ee1748718fd14e5684
2017-08-14 17:52:26 +02:00
Frank Mittag
3732c89084
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
2017-06-26 15:53:39 +02:00
Axel Uhl
981561b5f4
added a failing test case for bug 4197 (Stack Overflow for cyclic start time dependencies)
...
Change-Id: Id37cb1f51adddb8d9de528e899581a3d2fd0b792
2017-06-23 11:43:58 +02:00
Steffen Schäfer
1542a36109
Merge branch 'master' into bug2822_boatcolors
2017-05-16 16:12:16 +02:00
Steffen Schaefer
9123771f34
normalized line endings
2017-05-16 09:42:02 +02:00
Frank Mittag
fd8fee5d58
work commit in the middle of refactoring competitor.getBoat()
2017-04-28 09:08:14 +02: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
Steffen Schaefer
86ae110571
Merge branch 'master' into bug4009
2017-01-26 15:31:34 +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
Axel Uhl
1664286df3
introduced JSON format for TargetTimeInfo and use it in RegattasResource's targettime method
...
Change-Id: I93bf54964c34b0a25b5a15e37f9efb6e962bab01
2017-01-04 10:39:30 +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
270697d704
adjusted test verdicts where they have to express an exclusive instead of an inclusive time range now
...
Change-Id: I445d73f2789cdc8063cb627aa0c8c7aa5d7e5547
2016-12-24 10:52:50 +01:00
Axel Uhl
2aba829548
cleaning up the mess with inclusive/exclusive time interval ends
...
Change-Id: Ie7753c053d96b0a2c66a98d7e0e983bba38cfd20
2016-12-23 23:43:29 +01:00
Steffen Schaefer
790d809a29
Merge branch 'master' into bug2447
2016-12-01 10:13:47 +01:00
Steffen Schaefer
Axel Uhl
Steffen Jacobs
Robert Benedikt
Kai Börnert
Manuel Zedel
Frank Mittag
Steffen Schaefer