Commit Graph
288 Commits
Author SHA1 Message Date
Axel Uhl 1404c18f67 replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO 2013-12-09 22:06:29 +01:00
fmittag 6a934058ec added failing test case for removeCompetitor(c) in case the competitor as an UUID as Id 2013-12-08 15:14:40 +01:00
fmittag 46ddac833a Merge remote-tracking branch 'origin/master' into competitorpanel_reuse 2013-12-07 16:13:18 +01:00
Axel Uhl 974526d35c failing test for UUID-based competitor ID storage 2013-12-07 15:01:52 +01:00
fmittag 5918bb1d14 Merge remote-tracking branch 'origin/master' into competitorpanel_reuse 2013-12-07 14:22:27 +01:00
fmittag 62b3a9c6ae Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-12-06 19:19:09 +01:00
fmittag d037441787 added load/store/editing of the new attribute displayColor for a competitor 2013-12-06 18:40:15 +01:00
Axel Uhl d4e6ab3624 added unique index for competitor by ID; use UUID for course area all about 2013-12-06 18:30:21 +01:00
Lukas Niemeier c6949b5cf3 # so many comments 2013-12-06 13:40:15 +01:00
Lukas Niemeier dc25f9ccb5 # removed the "any" DeviceConfigurationMatcher 2013-12-06 03:04:43 +01:00
Lukas Niemeier 061936c97e # renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
2013-12-04 16:18:33 +01:00
Lukas Niemeier 492124fd16 # renamed proceduresconfiguration to RegattaConfiguration 2013-12-04 02:49:46 +01:00
Lukas Niemeier d4601894dc # use pass-trough interface instead of getCompetitorStore chain 2013-12-03 18:38:36 +01:00
Lukas Niemeier 69ff32e1d8 # extended GateLineOpeningTime to store Golf-Down time
# added configuration to enable setting the Golf-Down time
# implemented Start prerequisites for all RacingProcedures
2013-12-02 18:33:08 +01:00
Axel Uhl da0c3f914c Merge branch 'master' into racecommittee_app 2013-12-01 23:52:20 +01:00
Lukas Niemeier 04e8671a11 Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-11-29 18:24:13 +01:00
Lukas Niemeier 453ac2b142 Merge branch 'master' into racecommittee_app
Conflicts:
	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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-29 16:42:07 +01:00
Axel Uhl ed35db38b4 removed setConfiguration from MongoDBService and replaced by MongoDBConfiguration.getService() 2013-11-29 13:28:42 +01:00
Lukas Niemeier 30560c19bf # racing procedure configuration attached to regatta
# some help text in UI
2013-11-25 16:46:05 +01:00
Frederik Petersen 81760e6dec Replaced trackedRegatta with regatta name in getWindTrack calls
also added wind import
2013-11-20 12:05:10 +01:00
Frederik Petersen a988003d15 Moved central windstore into racingeventservice
also removed addRace and addEvent services from legacy adminapp
2013-11-20 09:02:55 +01:00
Lukas Niemeier 34b852f0c4 # changed RaceLogEvent#getTimePoint to return createdAt (was logical timestamp before) 2013-11-18 22:05:18 +01:00
Lukas Niemeier 467709c13e Merge branch 'racecommittee_app' into racecommittee_app_startphases 2013-11-17 20:28:12 +01:00
Lukas Niemeier 532b415e04 # added migration of RaceLogEvent on load (identifier)
# added test ensuring that this works...
2013-11-17 20:13:35 +01:00
Lukas Niemeier c80f26f272 # DomainObjectFactory loads a default author for (old) events without author 2013-11-17 19:40:03 +01:00
Lukas Niemeier be370628d8 # removed min/max rounds configuration 2013-11-16 18:05:17 +01:00
Lukas Niemeier 58efde4c15 # default racing procedure and default course designer configurable for regtattas 2013-11-16 16:32:30 +01:00
Lukas Niemeier ea384e4c12 # added CompetitorResults to replace generic list on competitor positions and results
# working towards replacing old RaceState with new RaceState
2013-11-13 14:37:50 +01:00
Lukas Niemeier 8db5b51102 Merge branch 'racecommittee_app' into racecommittee_app_startphases 2013-11-12 16:22:57 +01:00
Lukas Niemeier dac0fd3494 # added SharedDomainFactoryImpl implementing SharedDomainFactory
# DomainFactoryImpl extends SharedDomainFactoryImpl (code reuse)
# Split SharedDomainFactory and CompetitorStore interfaces (no more forwarding)
2013-11-11 03:40:09 +01:00
Lukas Niemeier ea69b28ad2 Merge branch 'master' into racecommittee_app
Conflicts:
	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/CollectionNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.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/SharedDomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
2013-11-11 03:00:31 +01:00
Lukas Niemeier c0cbb17785 # renamed StartProcedureType to RacingProcedureType
# tested new Comparator including author
2013-11-11 00:58:31 +01:00
Lukas Niemeier 422d24eaa5 Merge branch 'otracelog' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
2013-11-04 01:48:14 +01:00
Axel Uhl 2be40c66f8 Merge branch 'master' into persistentCompetitors
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-10-31 18:19:45 +01:00
Simon Pamies 5cc5e52030 Making sure that mongodb host name is always read from configuration 2013-10-31 13:03:59 +01:00
Lukas Niemeier bb58d78236 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-30 14:38:14 +01:00
Lukas Niemeier a9bce35b6f Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app 2013-10-29 22:48:18 +01:00
Lukas Niemeier acdc62d244 # added tests for device configuration (persistence) 2013-10-29 22:45:35 +01:00
Axel Uhl fae59cac79 Introduced CompetitorStore with a transient implementation being used for now in DomainFactoryImpl;
RacingEventServiceImpl already has a PersistentCompetitorStore that will then have to be injected into the
DomainFactoryImpl used by RacingEventServiceImpl
2013-10-29 11:45:31 +01:00
Axel Uhl 3da17302f8 removed DomainFactory.INSTANCE use except from test cases; renamed MongoFactory to PersistenceFactory 2013-10-28 17:26:26 +01:00
Jens Rommel abd3f0dd44 Expanded read-only TrackedRace return type of get*Race() methods to mutable DynamicTrackedRace where appropriate.
According to Axel, the originally intended separation of read-onyl and mutable API via this approach turned out not to be as successful as expected.
2013-10-15 12:27:28 +02:00
Axel Uhl 6283cd916d Merge branch 'master' into bug655 2013-09-25 20:24:03 +02:00
Axel Uhl eed2af9d90 added a failing test case for the NPE during the deserialization of competitor-specific race log events;
The problem is that the competitor ID may not be resolvable in the receiving DomainFactory's competitor cache.
The root cause is that the receiver tries to resolve the race log event in the first place instead of simply
storing the race log event in the RaceLog. The solution will be not to trigger events when storing the race log
events into the RaceLog during master data import.
2013-09-25 20:03:48 +02:00
Axel Uhl 60e86f9702 refactored creation of ScoreCorrectionImpl and subclass instances so that it happens in leaderboard constructors;
Prepares for the linking of the score correction object back to its leaderboard in the score correction's constructor.
This will allow for the detection of race column ordering and hence the default application of score corrections
depending on time point if there are tracked races before or after that time point for a given competitor.
2013-09-24 08:48:58 +02:00
Axel Uhl cce1c54d5e factored a TimePoint parameter into ScoreCorrection.getMaxPointsReason(...) as well 2013-09-23 17:28:46 +02:00
Axel Uhl 822aff3194 started work on bug 655 by adding TimePoint argument to isScoreCorrected API 2013-09-23 16:11:44 +02:00
Axel Uhl 5bcf0f6193 renamed "obsolete" to "deprecated" for deprecated RaceLogIdentifier format 2013-09-20 09:42:56 +02:00
Axel Uhl 4aa504741f made compile again 2013-09-17 21:30:22 +02:00
Axel Uhl abdae7e871 tricky Merge branch 'master' into otracelog; some of the otracelog changes had selectively been applied to master; need to check branch validity first
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/clients/LoadClient.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-09-17 17:57:38 +02:00
Lukas Niemeier daae947da0 # fixed usage of obsolete identifier code in other test 2013-09-17 01:15:28 +02:00