Commit Graph
2776 Commits
Author SHA1 Message Date
Axel Uhl 81525d7ca8 Merge branch 'master' into maneuver_refactoring 2017-12-24 12:52:29 +01:00
Axel Uhl 3397169c8a Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
Change-Id: I217ebf26a7c0b92b27efc06de5ac80cf7fcc6d8f
2017-12-21 13:35:18 +01:00
Vladislav Chumak 89674f74b1 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2017-12-20 22:56:04 +01:00
Axel Uhl 43ea092034 fixing generics typing problem
Change-Id: I3e342ecb44dcc09a0c8b0bac9b39a4a1f6eec811
2017-12-20 22:15:14 +01:00
Axel Uhl c9685f7810 Merge branch 'master' into bug3484 2017-12-20 22:07:12 +01:00
Axel Uhl 1ea247cda6 moved Renamable[Impl] to com.sap.sse.common
Change-Id: I87d15e661531f15b04b721af6fe2428126778e07
2017-12-20 18:31:41 +01:00
Frank Mittag 8b7170fcf7 Added some logging for the competitor/boat DB migration. All log infos have the prefix: 'Bug2822 DB-Migration:' 2017-12-20 16:24:15 +01:00
Frank Mittag 046dda41b6 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes 2017-12-20 14:40:04 +01:00
Raphael Müßeler b678012aa2 bug3484 refactoring and formatting 2017-12-20 10:55:35 +01:00
Raphael Müßeler f893677362 bug3484 edited TODOs and inserted bug id 2017-12-20 08:59:41 +01:00
Axel Uhl de70631ede using TrackedRegattaRegistry.removeRace to ensure consistent duplicate race removal
Change-Id: I245828fbd6d49f36e0f1f7d240471e5ea709a481
2017-12-20 00:45:18 +01:00
Raphael Müßeler e92e95c79f bug3484 fixed diverse series selection for pairing list calculation 2017-12-19 14:55:44 +01:00
Raphael Müßeler db131c69a8 bug3484 removed template factory cache and fixed race log bug 2017-12-19 10:38:07 +01:00
Joshua Schulz 3bc2526639 bug3484 Extended Pairinglist with boats 2017-12-19 07:32:44 +01:00
Vladislav Chumak d4d611aa7c Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2017-12-18 15:17:49 +01:00
Steffen Schaefer 6ac0e5b7b8 Merge branch 'bug4382' 2017-12-18 10:18:04 +01:00
Raphael Müßeler 15816c8917 bug3484 fixed filling race logs entries with several series 2017-12-18 09:19:31 +01:00
Robin Kuck 9fa454cd72 Merge remote-tracking branch 'origin/master' into bug3484 2017-12-15 16:27:12 +01:00
Robin Kuck 9809f57b66 Merge branch 'bug3484' of ssh://trac@sapsailing.com/home/trac/git into
bug3484

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.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/server/SailingServiceImpl.java
2017-12-15 16:14:00 +01:00
Robin Kuck ede8727fdb bug3484 series select function added 2017-12-15 14:53:08 +01:00
Vladislav Chumak f243630421 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2017-12-15 13:06:14 +01:00
Axel Uhl d103db6d05 limiting max speed to validity threshold (currently 40kts)
Change-Id: I679ec5e8d61aafc3294b766393dd1dbb2f0628a1
2017-12-15 11:29:40 +01:00
Raphael Müßeler f4875b2792 bug3484 added and modified JavaDocs in services 2017-12-15 10:43:57 +01:00
Raphael Müßeler 1cdd9ffc55 bug3484 fixed apply to race logs 2017-12-14 11:22:27 +01:00
Raphael Müßeler 695ae58daa bug3484 fixed flight count 2017-12-11 11:41:08 +01:00
Raphael Müßeler 7d8806262e fixed parameters in SailingService and RacingEventService 2017-12-07 15:01:41 +01:00
Raphael Müßeler 82f9ba3af1 created PairingListEntryPoint to show Pairing list 2017-12-07 13:37:24 +01:00
Kai Boernert a7c75fca69 allow to reset the infered starttime from mp4 back to default starttime,
adjusted runconfigs to include mp4parser osgi module
2017-12-05 11:18:17 +01:00
Frank Mittag 812fef2f22 Removed not needed RegattaLogRegisterAndBoatEvent after discussion with Axel.
All registration on regatta level will be of type RegattaLogRegisterCompetitorEvent where the passed competitor is either of type Competitor or CompetitorWithBoat depending on the regatta type
2017-12-04 14:38:59 +01:00
D070264 a5b5f5c3f9 bug3484 BusyDialog added + groupCount bug fix 2017-12-04 10:37:39 +01:00
Frank Mittag ce5d710d65 Fixed condition for the migration of the COMPETITORS collection 2017-12-01 15:27:47 +01:00
Frank Mittag 14e900e354 Changed the CompetitorWithBoat to Competitor migration in a way that a CompetitorWithBoat gets a 'null' boat (intermediate state) instead of creating a new Competitor 2017-11-30 16:30:30 +01:00
Frank Mittag b144ae9b19 - Changed the way a regatta is migrated from a 'without changing boats' regatta to 'with changing boats' regatta by removing the public setter and using a special derived MigratableRegattaImpl type which provides the actual migration function
- Change COMPETITOR collection migration by renaming the old COMPETITOR collection to COMPETITOR_BAK and creating all migrated competitors in the now empty COMPETITORS collection
2017-11-30 15:07:55 +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
Axel Uhl 227ada2820 Merge branch 'master' into bug3484
Change-Id: I6d4384b2796b7706ea1004e97c1420ed5859aaaf
2017-11-28 11:34:55 +01:00
Raphael Müßeler 4784055ee4 bug3484 set initial value of competitors count 2017-11-28 11:25:20 +01:00
Raphael Müßeler d29bbe2424 bug3484 implemented flightMultiplier 2017-11-27 14:38:55 +01:00
Raphael Müßeler 7c86cfc912 bug3484 changed layout and added flightMultiplier 2017-11-27 13:44:01 +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
Raphael Müßeler 269db9c5c6 Merge branch 'bug3484_ui' of ssh://sapsailing.com/home/trac/git into bug3484_ui 2017-11-24 13:34:58 +01:00
Raphael Müßeler 7a95c891ea bug3484 worked on displaying pairing list 2017-11-24 13:33:35 +01:00
D070264 8ad84cad0c bug3484_ui PairingListTemplateFactory pairingListTemplates Map fixed 2017-11-24 12:02:56 +01:00
D070264 fad0efa004 bug3484 RacingEventServiceImpl PairingListTemplateFactory fixed 2017-11-24 10:37:16 +01:00
Raphael Müßeler bb34a94e4b created RacingEventService and Dialogs 2017-11-24 07:23:52 +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 f778a611c4 Implemented boat replication (create and update) similar to competitor replication 2017-11-22 16:21:27 +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 7c8374ebcd Merge branch 'master' into bug4370 2017-11-22 14:08:13 +01:00
Axel Uhl 1a23501402 Merge remote-tracking branch 'server/master' 2017-11-22 14:06:27 +01:00
Kai Boernert 4d5f81a1a5 Merge branch 'bug4268'
Conflicts:
	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
2017-11-22 11:38:30 +01:00