Commit Graph
1032 Commits
Author SHA1 Message Date
Papick Garcia Taboada 28cd6ae3df Importer quickfix for tests 2016-06-01 11:24:35 +02:00
Steffen Schaefer dafe1a47c2 Merge branch 'master' into foiling 2016-05-31 08:45:38 +02:00
fmittag 3f4bee04b8 added documentaion for the race entries service 2016-05-24 15:30:48 +02:00
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
Benjamin Barth 60bca7d374 Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackFileImportWidget.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
2016-05-19 14:02:20 +02:00
Axel Uhl d16e46d02f Merge branch 'master' into translation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

Change-Id: I473b1d08739e18a794cfe8b72f7b2f813f3e8078
2016-05-12 18:46:17 +02:00
Axel Uhl 687519f223 added a few TODOs for alternatively mapping devices to marks instead of competitors 2016-05-12 08:35:40 +02:00
Papick Garcia Taboada e53df018d4 Removed unused code 2016-05-03 15:26:31 +02:00
Axel Uhl 9d43227986 part three of bug3641: renamed realTotal to total; should be done now; let's wait for the tests
Change-Id: Ie91dbcd94fb52cba0a928389b3d531bf44750000
2016-05-02 16:33:58 +02:00
Axel Uhl a26b7f25cd renamed all totalPoints occurrences into netPoints
Change-Id: Iddf5e02a643b69e4f3f549b1757410cf61281185
2016-05-02 15:47:31 +02:00
Axel Uhl c5b494a0ba part one of swapping net/total point names: renamed all "net" to "realTotal"
Change-Id: Ia61d72e6c1c2323d2b9ad1e32c141b9a063e461d
2016-05-02 14:46:50 +02:00
Steffen Schaefer e1f8dc06d5 Merge remote-tracking branch 'origin/master' into foiling
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-04-27 08:12:55 +02:00
Axel Uhl e599e80f9a Merge branch 'ubilabs--rcapp--bug_3011'
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java

Change-Id: If2fa033a2c1defc00ec9a4bec4a31877c7c28fb6
2016-04-25 20:27:36 +02:00
fmittag e350934f5f Merge remote-tracking branch 'origin/master' into bug3591_datamining_legtype 2016-04-23 14:30:02 +02:00
Axel Uhl 38be2a938a Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-23 13:57:40 +02:00
Steffen Tobias Wagner (D059727) d065302b6d fixed bug-3618 by adding utf-8 content-type to servers responses in API 2016-04-22 21:46:55 +02:00
fmittag 8ba7e75db0 fixed missing usage of parameter in sumManeuversPerCompetitorQuery() function 2016-04-22 19:34:48 +02:00
fmittag 842b3929b9 Merge remote-tracking branch 'origin/master' into bug3591_datamining_legtype 2016-04-22 19:28:25 +02:00
fmittag 9a0b690b77 some refactoring and the implementation of the requested datamining queries without grouping by leg type 2016-04-22 19:23:32 +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
Steffen Schaefer 526bfb32b5 Merge remote-tracking branch 'origin/master' into foiling
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-04-21 09:23:17 +02:00
Axel Uhl d416b90b50 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-20 18:03:01 +02:00
Axel Uhl 913fbe5d76 increased Shiro session manager timeout from 30min to 24h
Change-Id: I8bdcbc5b3c2658858643b3a4f04dfa83a571659a
2016-04-20 18:00:19 +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 5a75caf0f5 Merge branch 'master' into ubilabs--rcapp--bug-1267
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java

Change-Id: I5fa5dce7ca0cbb7d7b4c7804fe010b7200b64bf3
2016-04-15 10:49:18 +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 a60ca6ff8c fixed minute display for wind status servlet 2016-04-14 16:32:25 +02:00
Axel Uhl 43a391713d fixed wind status servlet time lag output (s instead of min) 2016-04-14 16:16:18 +02:00
Peter Siegmund 733c619817 added missing import 2016-04-14 11:57:03 +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
Axel Uhl 575d373a22 whitespace, formatting and commet changes; made one method private
Change-Id: Ibb102cec17f2f848f21235e18e66d58383990e98
2016-04-13 08:30:55 +02:00
fmittag 8097a45b32 some refactoring and preparation of the new predefined queries 2016-04-12 19:59:06 +02:00
Papick Garcia Taboada 40a79d8ded Merge commit 'd1b03bb576b58765444b4f0a44c5ab7f435a5740' into foiling2 2016-04-06 09:45:08 +02:00
Axel Uhl ea17e1bc2f require authentication only for the racecolumnfactors parts of the LeaderboardsResource
Change-Id: I212a39c0b1349dc99392d23c94d25048bbfb4e93
2016-04-05 13:26:39 +02:00
Axel Uhl 075110535c added race column factor services on LeaderboardsResource which now requires authentication for setting the column factor
Change-Id: I42074d7d423ab5dd4a4eb3526c5aa46fae7437df
2016-04-05 13:11:32 +02:00
Axel Uhl 508b3fed1d formatting only
Change-Id: I036c3b4a14a20336d79f32903556d41f65bfe7fd
2016-04-01 18:06:01 +02:00
Peter Siegmund ff495ff1db Race Manager must be able to manage non-public events 2016-04-01 10:48:17 +02:00
Axel Uhl d62104d7b0 in preparation of a solution to bug 3358, added FIELD_TEAM_IMAGE_URI to CompetitorsResource output document 2016-04-01 00:47:54 +02:00
Benjamin Barth 5fcffd7879 Added Bravo sensor data import functionality 2016-03-31 11:22:49 +02:00
Axel Uhl d2ee9e8e97 aftermath for c50d3ec6d6: also return available, not only course marks if no race column is provided
Change-Id: I89ffc7adfb2e0e9aa829498d3ffd7b08dfc05ac8
2016-03-30 16:30:16 +02:00
Axel Uhl c50d3ec6d6 return available, not only course marks from /leaderboards/{leaderboard}/marks
Change-Id: I50faf63ed4d887b633d4f5447c6b6547d30c9982
2016-03-30 11:02:33 +02:00
Axel Uhl 7858cb0168 introduced field trackedRaceLinked on RaceStateSerializer so it will appear in EventsResource output;
the problem so far was that trackedRaceId only indicated which tracked race would be attached to this
column/fleet combination if it were ever loaded. It does not tell about whether that tracked race *is*
currently loaded and linked.

Change-Id: Id922f889040678cdc73b0f3ab0fe497d7ad614f1
2016-03-17 11:27:37 +01:00
Axel Uhl 463cddb921 also add marks to the REST response of MarksJsonExportServlet that don't use a UUID as their ID
Change-Id: I40ea434ab678bb78cfdbf1520a3640dd128471a2
2016-03-14 14:43:14 +01:00
Axel Uhl 05d5eebc66 Bug 3521: implement cleaner separation between RaceColumn.getAvailableMarks() and .getCourseMarks()
Change-Id: Ie6e2453388c625ee68a8c1591fef6dd2f76d1d64
2016-03-14 14:22:10 +01:00