Commit Graph
152 Commits
Author SHA1 Message Date
fmittag dd918eb7ce added a webservice to retreive the entry list for a race
/api/v1/regattas/{regattaname}/races/{racename}/entries
2016-05-24 15:16:46 +02:00
Peter Siegmund f8e22f70fa fixed GateStart deserializer (incorrect hasPathfinder) 2016-04-26 12:49:28 +02:00
Axel Uhl 450aaee1f1 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-22 22:41:12 +02:00
Axel Uhl 5f5a3c460e introduced CourseDesignerMode field on RaceLogCourseDesignChangedEvent and field isWaypointSequenceValid on CourseDesignerMode;
this is to solve bug 3608 because course designs coming from the ByName course editor will no longer be used to update
a TrackedRace's course.

Change-Id: I8a1aa432f931838902c546a2365b68a8ca59b72e
2016-04-22 16:47:39 +02:00
Axel Uhl f726da1e2c Merge branch 'bug3532' into ubilabs--rcapp--bug_3011 2016-04-22 14:07:44 +02:00
Axel Uhl fcd845955c made series deserializer tolerant against missing "parallel" flag on the series, defaulting to true
Change-Id: Id47ed0a98e9277a302682b21933778f3e7fcf6cb
2016-04-22 14:06:58 +02:00
Axel Uhl 20661662a0 Merge branch 'bug3532' into ubilabs--rcapp--bug_3011 2016-04-22 00:26:25 +02:00
Axel Uhl 00e0f9a438 fixed serialization of new isFleetsCanRunInParallel property on SeriesWithRows; introduced constants for JSON properties
Change-Id: I83a4742548621845c5cdf5338e5d51ce1e4d9d50
2016-04-22 00:24:54 +02:00
Axel Uhl 82e962bf66 Merge remote-tracking branch 'server/bug3532' into ubilabs--rcapp--bug_3011 2016-04-22 00:18:22 +02:00
Axel Uhl f3e9219804 a first implementation of the new current races filter algorithm according to the specification in bug 3011
Change-Id: I5f29d35bbbde9429bff5f3219fa6c22455c6e9d2
2016-04-21 23:01:07 +02:00
fmittag ca9550e93d implemented new attribute fleetsCanRunInParallel on Series domain object including storage, test, replication and admin UI 2016-04-21 17:26:53 +02:00
Axel Uhl 3ff77640e8 equipped RaceCell with a field zeroBasedIndexInFleet
Change-Id: Ic09d225dcfce73b747424f73fae794e9043c512d
2016-04-21 11:14:25 +02:00
Axel Uhl 1dc83816b8 added race column factor and explicit factor to RaceCell including its (de-)serialization; belong to bug 1267
Change-Id: I55b343e2447c2837ce678dbc32e1921ce9a2ffa9
2016-04-18 18:41:57 +02:00
Axel Uhl 1e3a282461 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	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

Change-Id: I829d43c85301fc7c4cdfe3ab49d1f78e39940b2e
2016-04-18 17:48:32 +02:00
Axel Uhl 8b5cade99d Merge remote-tracking branch 'server/competitor_searchtag' 2016-04-15 14:29:02 +02:00
fmittag ef7d84bd81 added a searchTag attribute to 'Competitor' to make it possible to 'tag' competitors for an easier search later on 2016-04-14 13:44:37 -04:00
Axel Uhl ed3ad16678 starting to work on making mark ID handling in buoy pinging app consistent
Change-Id: Ic148adcce06187c2f0b989f4b6a5435caab2f082
2016-04-14 18:25:48 +02:00
Axel Uhl 8b59b63ace using SharedDomainFactory to deserialize marks in buoy pinging app
Change-Id: I1ad347f3e35cca1476603d46679977a08ecaaf93
2016-04-14 12:45:40 +02:00
Peter Siegmund 99ecc950cb Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-1267 2016-04-14 10:17:33 +02:00
Axel Uhl b08b718886 added race column factor and explicit factor to RaceCell including its (de-)serialization; belong to bug 1267
Change-Id: I55b343e2447c2837ce678dbc32e1921ce9a2ffa9
2016-04-13 21:56:52 +02:00
Peter Siegmund 61089e2b83 load race column factors at login 2016-04-13 15:12:19 +02:00
Bennet Brunsen 6301bcf35e Deserialize marks with MarkJsonDeserializer 2016-04-12 16:38:29 +02:00
Axel Uhl eab00350a5 moved race result enabling from AppPreferences to regatta-specific, racing procedure type-specific preference
Change-Id: I3400cd868528388bd741e1798a58c820903ea665
2016-04-05 20:54:46 +02:00
Axel Uhl 461e08a0a8 moved serialized to .android.shared so Buoy Pinging app can see them
Change-Id: I52ebc9fa121b6223575f746bd90a723175b8d491
2016-03-30 13:42:25 +02:00
Steffen Schaefer 4b1d2e1567 Removed legacy JSON (de)serialization for event media 2016-03-02 11:10:49 +01:00
Steffen Schaefer 83c7e4a197 Removed legacy JSON deserialization for EventBase.sailorsInfoWebsiteURL 2016-03-02 08:47:26 +01:00
Steffen Schaefer 054d289fce Removed legacy JSON serialization for sailorsInfoWebsiteURL 2016-03-01 13:56:42 +01:00
Axel Uhl c61a38cdc4 more formatting changes
Change-Id: I77395e834600c312a55203d637abe6eea958d637
2016-02-29 14:59:16 +01:00
Axel Uhl 16fdbdb658 more code formatting
Change-Id: I5a67cda91b67381e7cd6fb0b81bdb558eb48f947
2016-02-29 14:32:46 +01:00
Steffen Schaefer bc69d9a727 Ensuring a consistent method naming 2016-02-24 13:13:57 +01:00
Steffen Schaefer 0572787c8e Added TODOs regarding Locale handling in JSON (de)serialization 2016-02-24 13:13:47 +01:00
Steffen Schaefer e23885f870 Adjusted JSON (de)serializer to handle multiple sailorsInfoWebsiteURLs 2016-02-24 13:13:43 +01:00
Axel Uhl 27fcba4ea6 fixing issue with direct de-serialization from a JSONObject produced not by reading from String but by serialization;
Serialization adds an Integer object to the JSONObject which cannot be cast to a Long. Reading from string
produces a Long. Solution: cast to Number, then use intValue()
2016-01-27 20:10:50 +01:00
Axel Uhl 9087d12118 fetch rank and cast to Long because JSONObject doesn't know Integer
Change-Id: I47c2cc5e32ae8ad38bd93927b90564839a21870a
2016-01-27 10:05:08 +01:00
Axel Uhl f57aed7de6 Merge branch 'master' into bug3420
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java

Change-Id: I7347ab0c849aa43f08eebca569c884b6986bf6d0
2016-01-22 15:39:16 +01:00
Axel Uhl 3f80eaf66b also factored the commonalities of the *serializers* for the RaceLogFinishPositioningEvent types
Change-Id: I58eaf0b8c109c6113b3ced1982b1877885b78f2d
2016-01-19 20:42:45 +01:00
Axel Uhl 3095adc8ee as suggested by bug 3420 comment #2, refactors common parts of RaceLogFinishPositioning deserialization in gateway bundle
Change-Id: I13819430107ef932f5fab433164ec9316f5e78d5
2016-01-19 20:30:33 +01:00
Axel Uhl 053268e0d5 enhanced RaceLogFinishPositioningConfirmedEvent and RaceLogFinishPositioningListChangedEvent by fields for score, rank, comment and finishing time
Change-Id: Ib751beb081a1eecfe462919eaa3ce6ea71e56cd3
2016-01-19 19:57:15 +01:00
Axel Uhl 7216a8cee5 Merge branch 'master' into bug2851 2016-01-13 09:52:31 +01:00
Jan Broß 2a9c674172 Refactorings as Mapping Events are from now on only present on RegattaLog 2015-12-10 19:00:36 +01:00
Jan Broß cf4c7ec95c Removes RaceLogDevicMarkMapping (bug2851) 2015-12-10 18:07:06 +01:00
Jan Broß 7414026cde Removes RaceLogDeviceCompetitorMapping (bug2851) 2015-12-10 18:00:27 +01:00
Jan Broß d456eecfb2 Remove RaceLogCloseOpenEndedDeviceMappingEvent 2015-12-10 15:23:38 +01:00
Jan Broß 0378664357 Removes RaceLogDefineMarkEvent 2015-12-07 14:18:31 +01:00
Jan Broß 6b43e9004c Merge bug3212 in bug2851 2015-12-04 12:39:38 +01:00
Steffen Schaefer fca622efa7 Merge branch 'master' into android-maven-build-bug3190
Conflicts:
	java/com.sap.sailing.domain.common/pom.xml
	java/com.sap.sailing.domain.shared.android/pom.xml
	java/com.sap.sailing.server.gateway.serialization.shared.android/pom.xml
	java/com.sap.sse.common/pom.xml
	java/com.sap.sse.datamining.annotations/pom.xml
	java/com.sap.sse.security.common/pom.xml
	java/org.json.simple/pom.xml
	java/pom.xml
	mobile/com.sap.sailing.android.shared/pom.xml
	mobile/com.sap.sailing.racecommittee.app/pom.xml
	mobile/pom.xml
	pom.xml
2015-11-30 15:02:06 +01:00
Steffen Schaefer 3c25092bc5 Consistently using spaces for intendiation in several POMs 2015-11-30 14:55:28 +01:00
Jan Broß 2906902a9a Merge master into bug2851 2015-11-28 15:55:44 +01:00
Steffen Schaefer 5cc6d15184 Merge remote-tracking branch 'origin/master' into android-maven-build-bug3190 2015-11-25 08:41:04 +01:00
Steffen Schaefer fc8a893e8c Maven profiles can only be copntrolled by system properties and not
Maven properties of a parent POM. The presence of the "ldi.releaseBuild"
is a good match for the activation conditions of "with-mobile" and
"with-not-android-relevant". It currently seems that in
buildAndUpdataProduct.sh the profiles are correctly activated and
deactivated. So this could also correctly work for local builds.
2015-11-24 14:47:13 +01:00