 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 |
|
|
Axel Uhl
|
e952f42176
|
removed redundant getDynamicCompetitor method
|
2013-12-09 20:49:22 +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 |
|
 fmittag
|
6d543b46b4
|
renamed new attribute displayColor of competitor back to color
|
2013-12-07 16:25:54 +01:00 |
|
|
fmittag
|
46ddac833a
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
|
2013-12-07 16:13:18 +01:00 |
|
|
Axel Uhl
|
051ce73597
|
factored production of competitor ID so it can be re-used in serializer and MongoObjectFactory
|
2013-12-07 15:18:51 +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
|
061936c97e
|
# renaming of RegattaConfiguration completed
# Apps merges global config and RegattaConfiguration now
|
2013-12-04 16:18:33 +01:00 |
|
|
Nick Klose
|
e511cd7f2f
|
Merge branch 'master' into marks
Conflicts:
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
|
2013-12-04 10:18:59 +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
|
5b238f500a
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/CompetitorMasterDataDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/LeaderboardGroupMasterDataJsonDeserializer.java
|
2013-12-03 18:34:33 +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 |
|
 Frederik Petersen
|
dd39c1615a
|
Workaround fix for id serialization in master data import
needs more thorough fix when bug 1599 is "fixed"
|
2013-12-02 16:37:11 +01:00 |
|
|
Lukas Niemeier
|
fecbbe171c
|
# cleanup
|
2013-11-30 14:22:33 +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 |
|
|
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 |
|
|
Frederik Petersen
|
9b14785966
|
Fixed wind serialization for race data import
|
2013-11-26 16:03:54 +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
|
2b1a1d17d8
|
# added new RacingProcedure BASIC
|
2013-11-25 02:34:46 +01:00 |
|
|
Lukas Niemeier
|
7c03c925f9
|
# RacingProcedures are configured by passed configuration
|
2013-11-25 01:32:58 +01:00 |
|
|
Lukas Niemeier
|
773670d608
|
# revamped the configuration system to support remote configuration of racing procedures
|
2013-11-25 00:01:25 +01:00 |
|
|
Lukas Niemeier
|
e0f2309b16
|
# working towards implementing the RacingProcedureConfiguration
|
2013-11-22 01:27:26 +01:00 |
|
|
Lukas Niemeier
|
7d63298739
|
merge fix
|
2013-11-20 19:20:43 +01:00 |
|
|
Frederik Petersen
|
0fbf6071de
|
Changed master data import to use gzip
|
2013-11-20 16:29:32 +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
|
4e9b9ee333
|
Merge branch 'master' into masterdataimport-wind
|
2013-11-20 09:00:07 +01:00 |
|
|
Nick Klose
|
01bda88649
|
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-19 10:06:28 +01:00 |
|
|
Lukas Niemeier
|
34b852f0c4
|
# changed RaceLogEvent#getTimePoint to return createdAt (was logical timestamp before)
|
2013-11-18 22:05:18 +01:00 |
|
|
Axel Uhl
|
3e757a7fcc
|
make clear that the race IDs handled are the toString() representations of the IDs
|
2013-11-18 17:29:49 +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
|
464dfcf16b
|
# integrated old course name generation tool in AdminConsole
|
2013-11-17 19:10:14 +01:00 |
|
|
Lukas Niemeier
|
bb27261737
|
# serialize default procedure + mode
|
2013-11-17 17:48:45 +01:00 |
|
|
Lukas Niemeier
|
3def810e6e
|
# configure overwrites of procedure and designer mode in AdminConsole
|
2013-11-17 17:40:51 +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 |
|
|
Axel Uhl
|
44b3b95db2
|
solved persistence problem for overall leaderboard
|
2013-11-16 15:19:10 +01:00 |
|
|
Lukas Niemeier
|
ae6cc75b1c
|
# added configuration options for each racing procedures (DeviceConfiguration)
|
2013-11-16 11:49:47 +01:00 |
|
|
Axel Uhl
|
bf974089f6
|
started to work on bug 1508: export/import suppressed competitors for overall leaderboard
|
2013-11-15 23:39:49 +01:00 |
|
|
Axel Uhl
|
72c297a970
|
Fixed bug 1611 by making backward compatible
|
2013-11-15 22:07:45 +01:00 |
|
|
Lukas Niemeier
|
c2509129c9
|
# prepared DeviceConfiguration for more options
|
2013-11-15 16:47:18 +01:00 |
|