Commit Graph
407 Commits
Author SHA1 Message Date
Frederik Petersen 32ba332022 Created failing test case for bug 1825 2014-02-25 15:08:42 +01:00
Frederik Petersen 0084d2b61f Added failing test for persistence of PersistentRegattasForRaceIDs 2014-02-25 13:01:24 +01:00
fmittag b5bff27a10 Added startDate and endDate as new properties of the 'Event' domain class (including edit UI) 2014-02-24 16:04:33 +01:00
Jens Rommel 71df453414 Fixed constructor mis-use in MasterDataImportTest
--> "test" is not a valid MongoDb objectId and thus not a valid MediaTrackId
2014-02-22 21:33:04 +01:00
Jens Rommel 6a75723fa6 Eventually fixed media track importing. Required a major redesign of some media APIs:
- introduced new method MediaDB.insertMediaTrackWithId
- moved import logic into racing event service
2014-02-20 17:03:28 +01:00
Frederik Petersen 534d8c6a15 Fixed NPE and tests for data import 2014-02-19 17:34:53 +01:00
Frederik Petersen 74cb4b6431 Merge branch 'master' into bug1776 2014-02-19 17:19:31 +01:00
Frederik Petersen ce71baa411 Added progress indication to master data import 2014-02-19 17:00:40 +01:00
Jens Rommel 9d8da37ce9 Added test cases 2014-02-19 10:50:30 +01:00
Frederik Petersen 2e1ec8fde7 MasterDataImport leaderboard names are now fetched using the server
resolved by the importing server rather than the web client

fixes 1706
2014-02-18 11:40:00 +01:00
Fredrik Teschke 78c848e594 added GPSFixStore concept to TrackedRace
- needs to be passed through RacingEventServiceImpl -> lots of changes in
  test cases
- changes in adapters, as GPSFixStore is also passed around in
  RaceAdapter etc.
2014-02-15 12:20:12 +01:00
Fredrik Teschke 07f5efe154 Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
2014-02-12 21:58:31 +01:00
Frederik Petersen 1da11a140a Merge branch 'master' into masterdataimport-bug1765 2014-02-10 13:45:39 +01:00
Frederik Petersen 5878c0d613 Fixed master data import test 2014-02-10 13:32:44 +01:00
Frederik Petersen dd7df6bdef Moved DummyTrackedRace
to avoid package-bundle-name problem
2014-02-10 12:17:55 +01:00
Frederik Petersen 9d984c0ea9 Removed unused dependency 2014-02-09 17:06:23 +01:00
Frederik Petersen c2a645a5ed Changed MasterDataResource location
and added test for race log event persistence
2014-02-09 16:49:08 +01:00
Frederik Petersen 89385d802f Moved TopLevelMasterData to domain package
removed unused master data json facilities
2014-02-09 16:08:59 +01:00
Axel Uhl a216ef0795 made names of TracTracConnectionConstants consistent with their string representations 2014-02-08 23:34:32 +01:00
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