Commit Graph
129 Commits
Author SHA1 Message Date
Nick Klose dedc137e7d Started merge of PassingInstructions and RoundingDirections 2013-11-05 10:00:52 +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 5068f0268a RacingEventServiceImpl now uses PersistentCompetitorStore and loads/stores competitors to DB 2013-10-31 13:21:01 +01:00
Axel Uhl 576cc1e5d5 fixed serialization test after changing from NauticalSide to PassingInstructions 2013-10-30 17:12:47 +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
Axel Uhl 3da17302f8 removed DomainFactory.INSTANCE use except from test cases; renamed MongoFactory to PersistenceFactory 2013-10-28 17:26:26 +01:00
Fredrik Teschke f7a3f5c8df added competitor persistence; a first attempt to cherry-pick and merge this feature from the cmd-android-tracking branch
Conflicts:

	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.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BoatJsonSerializer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/tracking/impl/CreateCompetitorPostServlet.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-23 10:01:12 +02:00
Lennart Hensler c8367ad565 Fixed the toggle selection (Bug 1495) 2013-10-02 10:32:18 +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 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
Armin Zamani a139150617 Merge branch 'master' into racecommittee_app 2013-08-18 18:45:03 +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
Lukas Niemeier 3e903e2a27 renamed CourseDataDeserializer to CourseBaseDeserializer 2013-07-31 00:41:10 +02:00
Axel Uhl d23ec67104 added test for author serialization and deserialization 2013-07-19 16:41:29 +02:00
Axel Uhl 832e73e2ff added RaceLogEventAuthor to RaceLogEvent and factored this through all constructor / factory / persistence / serialization code 2013-07-19 16:30:28 +02:00
Axel Uhl 8c4ffc756f introducing RaceLogEventAuthor with priority to decide precedences in competing multi-device scenarios 2013-07-19 15:21:48 +02:00
Axel Uhl 40b2984fdd use constants consistently for servlet parameter names instead of using constant in one place and redundant string literal in another 2013-07-17 15:06:22 +02:00
Frederik Petersen 9e1b3df73d Fixed merge problems after merge of master into import_dbdata 2013-06-29 10:54:13 +02:00
Frederik Petersen 5963984323 Merge branch 'master' into import_dbdata
Conflicts:
	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
2013-06-29 10:46:20 +02:00
Armin Zamani 0ed28673aa Bug fix: Serializer threw an exception old confirmation events where the positioning was not set 2013-06-18 17:23:41 +02:00
Frederik Petersen 02e14d276a Added more detailed serialization
enables us to transfer server master data from one instance to another.

-added nationality for persons
-added coach for teams
-added master data specific serialization classes
2013-06-18 14:00:00 +02:00
Armin Zamani cccd75f0bb implemented new RaceLogWindFixEvent, extended persistence, serialization/deserialization, implemented tests 2013-06-15 12:08:11 +02:00
Armin Zamani 8f643709f4 Made RaceLogScoringReplicator safe against connectivity problems: RaceLogFinishPositioningConfirmedEvent contains now the confirmed list of competitors. When a finish positioning changed event is missing (due to connectivity problems), the final list which is used for score corrections is correct as no wrong, old positioning changed event is used 2013-06-12 14:33:16 +02:00
Lukas Niemeier 4a9cdcd021 refs bug 1125
# added ProtestStartTimeEvent (and tests and serializers and persistence)
2013-06-09 19:33:50 +02:00
Fabian Tschirschnitz bb4c55003d commented out RRS26 and GateLine start because of their current instability... 2013-05-25 17:04:30 +02:00
fmittag 2a689740f0 some cleanup and refactoring of the existing json export servlets and serializers 2013-05-16 16:02:19 +02:00
Lukas Niemeier dc63b554a5 # added RaceLogStartProcedureChangedEvent...
# ... and serializer...
# ... and deserializer...
# ... and persistence...
# ... and tests
2013-04-23 02:20:09 +02:00
Fabian Tschirschnitz 3437581122 added gate line opening time feature to app. event post to server does still not work correctly. 2013-04-22 00:53:04 +02:00
Lukas Niemeier 442b867232 # moved racelog deserialization stuff into own package to ensure symmetry with serialization package structure 2013-04-20 23:03:36 +02:00
Fabian Tschirschnitz 8e45e3a1b6 added gate start specific buttons (pathfinder and gatelineopeningtime) to ui. added pathfinder-event to domain. some other fixes. SORRY: serialization-test does not work. 2013-04-20 19:56:41 +02:00
Axel Uhl 7b6ef0f246 added missing hamcrest dependency to serialization.test manifest 2013-04-11 14:46:43 +02:00
Axel Uhl 34bab83ba2 Merge remote-tracking branch 'server/master'
Conflicts:
	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/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway.serialization.test/build.properties
2013-04-11 14:13:34 +02:00
Axel Uhl 91af0a81ec fixed serialization.test mockito dependencies; added logging for start of tracking 2013-04-11 13:57:15 +02:00
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Armin Zamani ca811614e2 Added the MaxPointsReason to the finishing list, now a pair of
competitor and maxpointsreason is used for the positionings
2013-04-06 11:27:04 +02:00
Armin Zamani 84aad68fce Introduced new race log event finish positioning confirmed event 2013-04-06 00:05:22 +02:00
Armin Zamani ea881bf348 introduced the deserialization of competitors as part of race log events 2013-04-05 22:37:31 +02:00
Armin Zamani db26b0aab7 implemented the new event FinishPositioningListChanged, now it can be
replicated, serialized and deserialized and persisted
2013-04-05 15:23:38 +02:00
Armin Zamani 22dddc900f more simplifications for competitor serialization and deserialization 2013-04-01 21:02:06 +02:00
Armin Zamani 1c16a630a7 implemented competitor serialization (team is serialized, boat
serialized, nationality serialized)
2013-04-01 19:16:28 +02:00
Armin Zamani 4e29bda14c fixed a couple of merge errors 2013-03-21 22:11:57 +01:00
Armin Zamani d2eb988050 remaining changes after merge 2013-03-21 21:19:57 +01:00
Armin Zamani d1f64c456d renamed "CourseData" to "CourseBase", "EventData" to "EventBase" and
"SeriesData" to "SeriesBase", and their impl-classes accordingly,
renamed "CourseDataJsonSerializer" to "CourseBaseJsonSerializer"
2013-03-21 18:30:30 +01:00
Lukas Niemeier 2b2d4d01aa # RaceLogStartTimeEvent now sets 'nextStatus' on its own
# some renaming in RaceLogEventFactory to reduce name-bloat
# database load restores createdAt timestamp correctly
2013-03-20 01:08:27 +01:00
Lukas Niemeier b2639e0379 # added failing serialization test 2013-03-20 00:14:03 +01:00
Lukas Niemeier 968cc32c16 # cleanup of RaceLogEventFactory usage 2013-03-19 17:50:54 +01:00