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
6d543b46b4
renamed new attribute displayColor of competitor back to color
2013-12-07 16:25:54 +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
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
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
8f42128054
merge fix
2013-11-29 18:20:11 +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
Frederik Petersen
28a36d53ec
Fixed race log event serialization for master data import
2013-11-27 12:21:43 +01:00
Lukas Niemeier
30560c19bf
# racing procedure configuration attached to regatta
...
# some help text in UI
2013-11-25 16:46:05 +01:00
Lukas Niemeier
953eaaa668
Merge branch 'racecommittee_app' into racecommittee_app_startphases
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.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/operationaltransformation/ImportMasterDataOperation.java
2013-11-20 12:25:57 +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
Lukas Niemeier
ad41f2e80c
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/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-20 11:37:40 +01:00
Frederik Petersen
3fa16b8484
Added windtrack masterdata deserialization
2013-11-20 09:51:24 +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
Frederik Petersen
4e9b9ee333
Merge branch 'master' into masterdataimport-wind
2013-11-20 09:00:07 +01:00
Lukas Niemeier
58efde4c15
# default racing procedure and default course designer configurable for regtattas
2013-11-16 16:32:30 +01:00
Frederik Petersen
a724200499
Fixed persistence of overall leaderboardgroup data in masterdataimport
...
and tested it
2013-11-16 16:00:31 +01:00
Frederik Petersen
967e3de29e
MetaColumn factors are now imported with MasterDataImport
...
see bug #1605
also added an assert to the according OverallLeaderboard test case
2013-11-15 16:13:55 +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
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
Axel Uhl
eb2d76ca8c
successfully tested in-place update of competitor in replica with explicity update operation
2013-11-07 20:04:03 +01:00
Axel Uhl
28aa49dbc6
use assertNotSame in CompetitorStoreTest; started CompetitorReplicationTest to validate replication of persistent competitor behavior
2013-11-07 19:58:19 +01:00
Axel Uhl
0dcde3f514
fixed test for competitor nationality change
2013-11-07 15:05:51 +01:00
Axel Uhl
86b8149c37
added failing test case for bug 1599
2013-11-07 12:41:21 +01:00
Axel Uhl
b6f97dc6b4
added a test for the CompetitorStore logic
2013-11-07 11:40:01 +01:00
Frederik Petersen
8f1246e8cd
Refactored TrackedRaceImpl wind funtionality into abstract super class
...
This enables us to let the DummyTrackedRace for the master data import to
use the wind track functionality, to save imported wind into the db, by
using the existing code.
2013-11-06 17:15:17 +01:00
Frederik Petersen
6c3a9dd50f
Added wind track serialization for master data import
2013-11-04 15:47:57 +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
fe8bd57a19
allow a competitor to be modified through the UpdateCompetitor operation
2013-10-31 18:10:56 +01:00
Axel Uhl
43cbda4c4c
fixed serialization of persistent competitor store
2013-10-30 13:19:37 +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
Axel Uhl
4e22cee4d7
moved SwissTiming adapter stuff away from RAcingEventService
2013-10-25 10:00:32 +02:00
Axel Uhl
d86ef87132
fixed server tests where the refactoring of TracTrac API calls hadn't correctly passed the TrackerManager along
2013-10-24 18:26:07 +02:00
Axel Uhl
e053f76f8b
first compilable version after moving TracTrac specifics away from server bundle
2013-10-24 15:37:08 +02:00
Axel Uhl
a81ada466f
Bug 1537: this commit fixes the problem for event creation, but not yet for course area addition
2013-10-02 17:25:20 +02:00
Axel Uhl
0687400a37
fixed merge issue of commit 6283cd916d by re-adding TimePoint parameter
2013-09-25 20:25:34 +02:00
Axel Uhl
6283cd916d
Merge branch 'master' into bug655
2013-09-25 20:24:03 +02:00
Axel Uhl
069204f2e2
introduced RaceLog.load(RaceLogEvent) which, as opposed to add(...), does not notify listeners about the changes
2013-09-25 20:23:17 +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
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
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
fmittag
5ab7d5af96
unified usage of "require-bundle: org.junit4" for all test bundles
2013-09-02 11:47:06 +02:00
Axel Uhl
f1fa1d74f6
moved a few more distance and speed types to domain.common and fixed a grave bug in MeterPerSecondSpeed; added test for improved outlier filtering
2013-08-14 18:00:45 +02:00
Frederik Petersen
98769fe4e5
Fixed small naming error in serializer and added test for overall
...
leaderboard import
2013-08-13 10:31:08 +02:00
Axel Uhl
fmittag
Lukas Niemeier
Frederik Petersen