 Henri Kohlberg
|
68fe2ca6d1
|
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104
# Conflicts:
# 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
|
2018-08-06 10:48:19 +02:00 |
|
 Axel Uhl
|
3b516bcbc3
|
bug4704: introducing a ReadonlyRaceState cache based on weak identity hash map over RaceLog and RaceLogResolver
Change-Id: I33412e6ed72ff732333e4a3ce1be8fc3906a57e5
|
2018-08-05 15:35:57 +02:00 |
|
 Manuel Zedel
|
269095c0f1
|
android lint fixes
|
2018-07-19 19:00:15 +02:00 |
|
|
Manuel Zedel
|
5170f126e2
|
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4412
|
2018-07-19 18:54:14 +02:00 |
|
|
Manuel Zedel
|
a08ec2b8d7
|
import formatting
|
2018-07-19 18:52:59 +02:00 |
|
|
Manuel Zedel
|
d0baf771b8
|
removed deprecated sub-package version information
|
2018-07-19 17:51:25 +02:00 |
|
|
Manuel Zedel
|
93719ecdf0
|
gradle api level upgrade
|
2018-07-19 17:12:56 +02:00 |
|
|
Henri Kohlberg
|
691fe7c91a
|
Bug 4104: Removed unused method
|
2018-07-19 17:03:02 +02:00 |
|
|
Henri Kohlberg
|
028caf907a
|
Bug 4104: Removed username from RaceLogTagEvent as this information is laready saved in author object.
|
2018-07-19 17:02:32 +02:00 |
|
|
Henri Kohlberg
|
85855bfec7
|
Merge branch 'bug4104' of ssh://sapsailing.com/home/trac/git into bug4104
# Conflicts:
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogTagEventSerializer.java
|
2018-07-19 08:36:49 +02:00 |
|
|
Henri Kohlberg
|
c42d2bb40b
|
Bug 4104: Tags will show up in right side panel if they were tagged before the current position of time slider (already displayed tags won't be hidden when scrolling back in time), extracted TagDTO to an own class, tags will be stored like other race log events (structure in database)
|
2018-07-19 08:30:43 +02:00 |
|
 D067890
|
cadabc0a82
|
Merge branch 'master' into bug4104
# Conflicts:
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
# java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2018-07-18 16:16:58 +02:00 |
|
|
Henri Kohlberg
|
9623e59b92
|
Bug 4104: Added button to add new tags to race log. Tags get displayed with a CellTable, only new added tags will be displayed yet.
|
2018-07-13 15:02:10 +02:00 |
|
|
D067890
|
13107bba7b
|
bug4104: RaceLogTagEvents now contain a user name
|
2018-07-13 10:53:36 +02:00 |
|
|
D067890
|
902be52661
|
bug4104: changed type of imageURL to String
|
2018-07-12 15:43:47 +02:00 |
|
 Robin Kuck
|
7da918f223
|
Merge remote-tracking branch 'origin/master' into bug4469
|
2018-07-11 11:32:00 +02:00 |
|
|
D067890
|
cf3d5108c8
|
bug4104: added method to add RaceLogEvents for tags into RaceState
|
2018-07-10 12:39:12 +02:00 |
|
|
D067890
|
897b8ecd85
|
bug4104: Added second RaceLogTagEventImpl Constructor
|
2018-07-10 12:37:07 +02:00 |
|
|
D067890
|
0ede320c21
|
Added RaceLogEvent for tagging, added fitting visit methods
|
2018-07-09 16:21:25 +02:00 |
|
|
Axel Uhl
|
d510aaffe5
|
added a comment
Change-Id: I064852e27210946caafd3efbf61645b539bced4b
|
2018-07-09 09:16:04 +02:00 |
|
|
Axel Uhl
|
79e0fbf81a
|
bug4629: update caches while still under the track's read lock
Change-Id: Ie07034aaec9b55f2f620ccab2d82e89fdf64d817
|
2018-07-09 01:09:17 +02:00 |
|
|
Axel Uhl
|
b262f492c9
|
added a comment
Change-Id: I064852e27210946caafd3efbf61645b539bced4b
|
2018-07-08 23:10:12 +02:00 |
|
|
Robin Kuck
|
a27c8b725a
|
Merge remote-tracking branch 'origin/master' into bug4469
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/pairinglist/PairingListEntryPoint.java
|
2018-07-02 21:20:23 +02:00 |
|
 Peter Siegmund
|
3ad383d42d
|
Merge branch 'master' into bug4239
|
2018-06-21 12:56:16 +02:00 |
|
|
Robin Kuck
|
8a5ee5a62f
|
Merge remote-tracking branch 'origin/master' into bug4469
|
2018-06-19 16:27:02 +02:00 |
|
|
Axel Uhl
|
daa0f0c1dd
|
for SwissTiming connector create a dummy person in Team object if no team members are modeled, in order to have a place for the nationality
Change-Id: Id9baa86b5beab742279c16e8ed6f54a9524320cd
|
2018-06-17 13:01:23 +02:00 |
|
|
Robin Kuck
|
753897a917
|
Merge remote-tracking branch 'origin/master' into bug4469
|
2018-06-12 23:54:28 +02:00 |
|
|
Robin Kuck
|
97d6eb4655
|
Merge remote-tracking branch 'origin/master' into bug4469
|
2018-05-29 22:34:52 +02:00 |
|
 Maximilian Groß
|
37917a50a4
|
Merge branch 'master' into bug4491
# Conflicts:
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.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/client/StringMessages_fr.properties
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
# java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
|
2018-05-28 08:35:21 +02:00 |
|
|
Axel Uhl
|
ec80cd48e5
|
fixed replication of creation of CompetitorWithBoat, now transmitting the boat ID and instantiating the right type
Change-Id: I65e8613b7a9e27259095b999fde56fd96e0b6e9b
|
2018-05-14 20:47:16 +02:00 |
|
|
Axel Uhl
|
e956d91484
|
bug 4574: fixing multiple registration of leaderboard cache invalidators; added boat chance-dependent leaderboard invalidation; fixed boat update routine
Change-Id: I88a351768ec5bf3cdd3f63dafed0e3ec1004d80e
|
2018-05-14 18:33:18 +02:00 |
|
|
Robin Kuck
|
28523ce624
|
Merge remote-tracking branch 'origin/master' into bug4469
# Conflicts:
# java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
|
2018-04-30 11:56:24 +02:00 |
|
|
Maximilian Groß
|
53f4c40a20
|
Merge branch 'master' into bug4491
# Conflicts:
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2018-04-27 12:10:44 +02:00 |
|
|
Axel Uhl
|
9cc23e6511
|
Merge branch 'bug4522'
Change-Id: I94e124a698a2effc0083b5b08ca215d63d9e7a54
|
2018-04-26 15:26:57 +02:00 |
|
|
Axel Uhl
|
d0dfea1064
|
moved DEFAULT_START_MODE_FLAGS to new interface SWCRacingProcedureConstants in domain.common so GWT can see it
Change-Id: Iba9c9716ad15f1e28a5a9af41e5a785ebbc9ea65
|
2018-04-26 12:33:18 +02:00 |
|
|
Axel Uhl
|
85f87ff55e
|
added PAPA to SWC Racing Procedure; disallow X-Ray under Uniform
Change-Id: I206f006cc835af5d3f8f6ecaf347e3f36ec6ba84
|
2018-04-26 09:18:23 +02:00 |
|
|
Axel Uhl
|
ad99a56209
|
replaced CompetitorWithBoatDTO by CompetitorDTO where possible
Change-Id: Iabb14f5e5f3989cc96128120955f0d4ae4332d23
|
2018-04-23 18:46:33 +02:00 |
|
|
Maximilian Groß
|
e977678869
|
Merge branch 'master' into bug4491
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# 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/afterliveraceloop/boats/RaceEndWithBoatsView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.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_es.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
# 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/LeaderboardsResource.java
|
2018-04-20 13:10:37 +02:00 |
|
|
Axel Uhl
|
18c777a99f
|
adjusted SwissTiming connector to accomodate UUIDs for mark devices and competitors
Change-Id: Ieaca20de4eacbbc5c64e218fb557045f2590e6f6
|
2018-04-19 17:24:54 +02:00 |
|
|
Axel Uhl
|
22b4ec6535
|
Merge branch 'master' into bug4509
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
|
2018-04-13 15:55:28 +02:00 |
|
|
Axel Uhl
|
514d132314
|
bug4511: now returns the SwissTiming competitor's boat instead of an unused one
Change-Id: Ib17131bed6f1813d303854391396fe528e6f18f5
|
2018-04-13 09:36:33 +02:00 |
|
|
Axel Uhl
|
b4f1c8fb10
|
more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
|
2018-04-13 09:01:27 +02:00 |
|
|
Axel Uhl
|
662fd99fad
|
Merge branch 'master' into bug4509
Change-Id: I68eacba973b9c1246aaf9b769f69bc7e96e93f2b
|
2018-04-12 14:23:56 +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 |
|
|
Axel Uhl
|
231e83bc2c
|
Merge branch 'master' into bug4509
Change-Id: I23ff6e0b645ab626284fc95b172243878e022806
|
2018-04-12 13:41:37 +02:00 |
|
|
Axel Uhl
|
6b1ffa52b5
|
removed extra ":" at end of string message
Change-Id: I6f47ce07c8abe4260f9307887773d8158210697a
|
2018-04-12 10:18:51 +02:00 |
|
|
Maximilian Groß
|
ed1fae0c8f
|
divided datamining from sailing specific classes
|
2018-04-12 07:40:59 +02:00 |
|
|
Axel Uhl
|
9c14151097
|
avoid DynamicCompetitor cast
Change-Id: I77372da3137277c53fba210d9f986ff12b76e9f9
|
2018-04-11 17:29:59 +02:00 |
|
|
Axel Uhl
|
1cf923a027
|
use DynamicCompetitor and DynamicBoat where necessary
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
|
2018-04-11 17:26:20 +02:00 |
|
|
Axel Uhl
|
656d8cbff1
|
another occurrence of boat before competitor to DB
Change-Id: Iba2857f4408789de7c34f50bb3d898dbdb6008b7
|
2018-04-11 16:21:33 +02:00 |
|