Commit Graph
447 Commits
Author SHA1 Message Date
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
Kai Boernert f505b10d50 removed RaceLogCourseAreaChangedEvent 2018-02-23 17:06:14 +01:00
Frank Mittag 4999933364 added 'canBoatsOfCompetitorsChangePerRace' attribute to RaceGroup for usage in RCApp 2018-02-13 15:57:03 +01:00
Frank Mittag 4f5792b797 little improvement with field names 2018-02-12 12:49:41 +01:00
Frank Mittag 6a7d33bda8 Implemented a CompetitorAndBoatJsonSerializer and CompetitorAndBoatJsonDeserializer to implement a /rc/competitorsAndBoats service call to transfer Competitor/Boat pairs to the rcApp 2018-02-09 14:23:47 +01:00
Frank Mittag df3565cd7e just some cleanup of protected vs. final 2018-02-09 14:22:30 +01:00
Frank Mittag 950104f20c fixed Json Serializer for competitors with boats with invalid constructor args 2018-02-08 10:06:51 +01:00
Axel Uhl ae70f96104 use Duration for protest time defaults in regatta configuration
Change-Id: Ie0554276aa96bd304a2787b7f297e69f84df371a
2018-02-01 10:54:31 +01:00
Axel Uhl dcb43721e6 don't use "instanceof CompetitorWithBoat" because of live migration;
when a tracked race is loaded into a regatta with changing boats and the
competitor has a boat, it is migrated "in place" with its boat reference
set to null; this way it is possible to have a CompetitorWithBoat object
that returns false from hasBoat(). Therefore, hasBoat() must be
preferred over a type check

Change-Id: Ic74441bfb48566e66cb88391b52537303638d564
2018-01-16 12:43:30 +01:00
Peter Siegmund 7d825e3fb2 remove unused variable 2018-01-16 08:42:17 +01:00
Peter Siegmund b46e0409e9 save and transfer default protest time to Android 2018-01-16 08:10:48 +01:00
Frank Mittag 62438c83d6 Merged RaceLogRegisterCompetitorEvent and RaceLogRegisterCompetitorAndBoatEvent into just RaceLogRegisterCompetitorEvent to make it easier to handle regattas with changing boats and non changing boats 2017-12-07 16:31:06 +01:00
Frank Mittag aaff138c14 Fixed migration of archived tractrac races with changing boats for some corner cases.
Added a 'LegacyBoatJsonDeserializer' to make sure that changes in the BoatJsonDeserializer will not effect the competitors migration of old servers
2017-11-29 00:21:36 +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
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 8a118e16c0 Integrated 2 boat creation options ('new boat' and 'use existing boat') into the competitor new/edit dialog 2017-10-12 16:08:41 +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
Steffen Schaefer 0359ee202e Bug 4227: Consistent naming of eventType field in JSON and null safety 2017-09-12 09:57:24 +02:00
Steffen Schaefer 2934b47124 Bug 4227: eventName wasn't added to json 2017-09-12 09:56:23 +02:00
Steffen Schaefer 7ac22edc59 Bug 4227: Renamed enum for better reusability 2017-09-12 08:05:34 +02:00
Kai Boernert 7f03a972b0 added anniversary type enum 2017-09-11 17:12:13 +02:00
Steffen Schaefer ca0c02cb55 Bug 4227: Fixed leaderboardDisplayName field in REST API 2017-09-11 16:13:02 +02:00
Kai Boernert 02b93657cb added eventName and leaderboardDisplayName 2017-09-11 14:24:04 +02:00
Frank Mittag 239150af31 Removed the idea of a separate CompetitorWithBoatFactory 2017-09-05 17:36:53 +02:00
Benjamin Barth 0dc106494a bug4227 Adjusted JavaDocs and code formattings 2017-08-29 18:09:10 +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
Axel Uhl 0b97113dba code formatting
Change-Id: I14029aca7f5bbbdc12fdc6c5864b8740e914408a
2017-08-10 15:14:38 +02:00
Steffen Schaefer a5991002bf Bug 4227: Consistently using null as remoteURL for local TrackedRaces in
the REST API
2017-08-10 13:51:15 +02:00
Steffen Schaefer bb85413403 Merge branch 'master' into bug4227
# Conflicts:
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RemoteSailingServerSet.java
2017-08-10 10:17:47 +02:00
Kai Boernert 575f27519e added DetailedRaceInfo remote api, reworked remote messages to allow
transient retrieval from remote servers in the future
2017-08-09 10:17:06 +02:00
Steffen Schaefer e1614b60d3 Bug 4259: Added max speed statistic to year statistics 2017-08-08 17:23:42 +02:00
Kai Boernert f39eb531db remoteurl is only transmitted once, filled with remoteserver if not
transitivly filled (not used yet, but for future compability)
2017-08-08 14:20:01 +02:00
Axel Uhl de455b3274 fixed the so-far unused DetailedRaceInfo regarding several aspects
Change-Id: Iea8462de8315f71100222ec53bbddb4d96bfa1c7
2017-08-07 18:30:28 +02:00
Kai Boernert 2d5b2fba3e improved naming and cleaned up RaceListResource 2017-08-07 11:04:37 +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
Kai Boernert e719e1d866 simple allRace RestService, disabled persistance to reduce future
conflicts if this is deployed
2017-08-04 15:20:34 +02:00
Kai Boernert 85c112140c Merge branch 'bug2059' into bug4227 2017-08-04 15:18:14 +02:00
Steffen Schaefer 886446f72c Merge branch 'master' into bug2059
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/statistics/AbstractStatisticsBox.java
2017-08-03 19:07:48 +02:00
Frank Mittag 20bc27a3da Improved name of a serializer 2017-07-21 17:28:49 +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 6c1ff9066b Improved the scenario to create the boats/competitor mapping based on the competitor metadata from tractrac.
Cleanup of some RaceLogEvent classes to prepare racelog tracking scenario
2017-07-19 17:19:08 +02:00
Axel Uhl a39a82b4e8 added unit to distance field in JSON format
Change-Id: I5174d4a6202d595dd290d41702396863f097b61b
2017-07-14 10:04:01 +02:00
Frank Mittag c295bce93c added a couple of racelog events for competitor/boats assignments (not sure we will need all of them) 2017-07-12 17:05:17 +02:00
Steffen Schaefer 98da501c66 Bug 2059: Fixed several ClassCastExceptions when fetching remote
statistics
2017-07-04 09:06:09 +02:00
Frank Mittag c333fb23c0 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.java
2017-07-03 14:59:42 +02:00
Steffen Schaefer 0bef006d94 Merge branch 'master' into bug2059 2017-07-03 10:56:22 +02:00
Steffen Schaefer 79e3e56ba7 Merge branch 'master' into 60_inch 2017-07-03 10:23:43 +02:00