Commit Graph
433 Commits
Author SHA1 Message Date
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
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 a9691de5e9 # use SharedDomainFactory instead of unreferencable DomainFactory 2013-11-14 15:58:28 +01:00
Lukas Niemeier 99a7f2c1ee # fixed evil cast in GateLineOpeneingTimeDeserializer 2013-11-13 22:40:31 +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 4681186e43 # BaseRaceLogEventDeserializer always deserializes an author, falls back to level 4 priority one when no one is given 2013-11-12 22:08:02 +01:00
Lukas Niemeier 8db5b51102 Merge branch 'racecommittee_app' into racecommittee_app_startphases 2013-11-12 16:22:57 +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
Lukas Niemeier c0cbb17785 # renamed StartProcedureType to RacingProcedureType
# tested new Comparator including author
2013-11-11 00:58:31 +01:00
Axel Uhl c553802954 Merge branch 'master' into persistentCompetitors
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
2013-11-07 12:58:35 +01:00
Axel Uhl 86b8149c37 added failing test case for bug 1599 2013-11-07 12:41:21 +01:00
Axel Uhl 8f178fed90 whitespace change only 2013-11-05 17:17:45 +01:00
Nick Klose bc96fdf15a Fixed PassingInstructions going into Database 2013-11-05 17:06:42 +01:00
Nick Klose dedc137e7d Started merge of PassingInstructions and RoundingDirections 2013-11-05 10:00:52 +01:00
Frederik Petersen 6c3a9dd50f Added wind track serialization for master data import 2013-11-04 15:47:57 +01:00
Nick Klose 8540a7081b Finished ControlPointWithTwoMarks 2013-11-04 14:40:59 +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 5068f0268a RacingEventServiceImpl now uses PersistentCompetitorStore and loads/stores competitors to DB 2013-10-31 13:21:01 +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
Axel Uhl 4c64c8588d more compiles, but still not all 2013-10-29 18:03:37 +01:00
Axel Uhl 596b7476f3 DOESN'T COMPILE: started major refactoring NauticalSide-->PassingInstructions for Waypoint; please complete 2013-10-29 17:58:15 +01:00