 Frederik Petersen
|
ea5dae85a2
|
Fixed race log import in master data import
one test still fails due to competitor resolving
|
2014-02-08 17:44:17 +01:00 |
|
|
Frederik Petersen
|
627df08d9e
|
Changed master data import to use java.io serialization
scorecorrections don't seem to work yet
|
2014-02-08 13:58:04 +01:00 |
|
|
Frederik Petersen
|
12c6451c8b
|
Started changing master data export to use java binary object serializ.
|
2014-02-07 16:31:52 +01:00 |
|
 Simon Pamies
|
7360e41155
|
Revamped TracTracRaceTrackerImpl to make status of a race available to the tracker - this is useful to control caching
|
2014-02-06 18:55:21 +00:00 |
|
 Fredrik Teschke
|
b48bae009d
|
Merge branch 'master' into devicetype-identifier
|
2014-02-02 09:48:06 +01:00 |
|
|
Fredrik Teschke
|
eaf266e228
|
changed how deviceTypeServiceFinder is set (Axel's changes)
Conflicts:
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
|
2014-01-28 22:06:46 +01:00 |
|
 Axel Uhl
|
36ffaea4d5
|
fixing bug 1729 by adding latch-based synchronization to OT test case
|
2014-01-28 21:15:28 +01:00 |
|
|
Frederik Petersen
|
c99cb73d3e
|
Changed carried points storing
|
2014-01-22 17:04:46 +01:00 |
|
|
Frederik Petersen
|
c008cd923a
|
Added failing test for carried points persistance
|
2014-01-22 15:11:52 +01:00 |
|
|
Frederik Petersen
|
0c26f164a9
|
Fixed override behavior for master data import
concerning bug 1708
tracked races are now relinked for flexible leaderboards
they are removed for regatta leaderboards
|
2014-01-22 10:53:30 +01:00 |
|
|
Frederik Petersen
|
c2bf8a9925
|
Added failing test for bug 1708
|
2014-01-22 08:55:49 +01:00 |
|
 Nick Klose
|
a0517dfa76
|
Merge branch 'master' into mark-rounding-inference
|
2014-01-06 22:56:10 +01:00 |
|
|
Simon Pamies
|
169eae6735
|
Merged origin/xcelsius-revamp
|
2013-12-22 12:46:01 +01:00 |
|
|
Axel Uhl
|
4ad6594a25
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
|
2013-12-10 09:30:41 +01:00 |
|
|
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 |
|
|
Nick Klose
|
3018bd8bfe
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
|
2013-12-09 18:35:16 +01:00 |
|
|
Nick Klose
|
96075f5cc1
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.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.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
|
2013-12-09 13:22:09 +01:00 |
|
|
EC2 Server
|
7bd7467cb1
|
Merge remote branch 'origin/master' into dev
|
2013-12-09 11:11:57 +00: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 |
|
|
Axel Uhl
|
2efd0ab0de
|
Merge branch 'master' into dev
Conflicts:
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-30 14:31:18 +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 |
|
|
Nick Klose
|
64ad880d2e
|
Merge branch 'master' into mark-rounding-inference
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
|
2013-11-28 10:15:29 +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 |
|
|
Axel Uhl (Server)
|
3e45c85f22
|
Merge branch 'master' into dev
|
2013-11-19 10:05:29 +01:00 |
|
|
Nick Klose
|
b0fc14872e
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
|
2013-11-18 10:30:34 +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 |
|
|
Frederik Petersen
|
cf8f778fd3
|
Moved central windstore into racingeventservice
also removed addRace and addEvent services from legacy adminapp
|
2013-11-13 11:50:32 +01:00 |
|
|
Nick Klose
|
9f3855e621
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
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/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.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
|
2013-11-11 13:59:39 +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 |
|