Commit Graph
871 Commits
Author SHA1 Message Date
Axel Uhl 97c25d6bcd added baseURL property to EventBase
Change-Id: I0fbd92b14331918986d817fc86a06912ae8f603d
2016-07-15 13:56:07 +02:00
Axel Uhl b39eee43d2 Merge branch 'master' into foiling 2016-07-08 11:16:54 +02:00
Axel Uhl 0f23eda391 fixing implementation of /marks/{mark-id} end point: correct mark is now selected
Change-Id: I932eed30d237a3fe555ad3c4d26dfadd6fc4c7c5
2016-07-08 11:13:10 +02:00
Papick Garcia Taboada 297fb13dad Merge branch 'master' of ssh://sapsailing.com/home/trac/git into foiling 2016-07-07 09:28:09 +02:00
Axel Uhl 09e0eaa170 compute remote address of Igtimi connections live for display in servlet
Change-Id: I828de665ef0b00b09c937be1c7696a418b544686
2016-07-06 22:51:52 +02:00
Axel Uhl b884ad9677 a somewhat more robust way of closing and reconnecting to Igtimi WebSocket servers;
ignore the onWebSocketClose event if it is caused by the reconnect() call

Change-Id: I0b735d17168855e66ade684f5953a1faaa8e82e4
2016-07-06 16:50:17 +02:00
Axel Uhl 23553bebf3 made fields of IgtimiConnectionInfo private/final and initialize in constructor
Change-Id: I81fe62c9a8dad8cc2d229a0a56e315117f10059b
2016-07-05 17:36:42 +02:00
Axel Uhl 1530a06919 replaced more stderr exception printing by logging in WindStatusServlet
Change-Id: Ia50a72b64556adf0a7d27db86dce70c079280aee
2016-07-05 14:55:41 +02:00
Papick Garcia Taboada 062c94c58f Introduced storing fixes in batches 2016-07-05 14:02:44 +02:00
Axel Uhl 42bb1d7ac0 Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java

Change-Id: I5f97a3c21e75e6d493c06dc87925d1273b0c4969
2016-07-05 12:47:39 +02:00
Axel Uhl 5223eac3b5 added /marks/{markId} end point for LeaderboardsResource so that it delivers a single mark
Change-Id: Ief31a6d5af78595d222bf056f5f4baf43e413857
2016-07-05 11:41:29 +02:00
Axel Uhl e224363e45 replaced stderr output for exception by logging
Change-Id: I3a1ce245a120028d59c43b5a771484bbe604f7f7
2016-07-05 11:40:29 +02:00
Axel Uhl 5d59e47d5f fixed initialization order of HashMap in WindStatusServlet
Change-Id: Iaad094c73f38f09b94f8644bcdd9a66ea7922a51
2016-07-04 14:27:27 +02:00
Steffen Schaefer ae04b66800 Merge branch 'master' into foiling 2016-06-29 09:01:17 +02:00
fmittag 275d5e83e3 Merge remote-tracking branch 'origin/master' into bug3719_windstatus 2016-06-28 18:34:43 +02:00
Steffen Schaefer 0a1b56765c Merge branch 'master' into foiling
Conflicts:
	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
2016-06-27 16:15:41 +02:00
Axel Uhl 941d50416d fixed OpenEndedDeviceMappingFinder to let it find mappings to marks, too
Change-Id: I29cc05a66b0bf768b311d8652e7bf88796654091
2016-06-24 18:53:55 +02:00
Axel Uhl fc6be86f7f implemented mark device mapping check-out in LeaderboardsResource
Change-Id: I6c83db19d3939936f0a572f1eb16e1d82e323693
2016-06-24 18:26:49 +02:00
Axel Uhl d084dd0c3a added a first untested implementation for creating a mark device mapping to LeaderboardsResource
Change-Id: Ie8d3d618dccdcd5d2bf4ef735f206200bd76a781
2016-06-24 18:10:51 +02:00
fmittag 0bc84656e8 Merge remote-tracking branch 'origin/master' into bug3719_windstatus 2016-06-24 12:14:15 +02:00
Papick Garcia Taboada b55c18c6f8 Refactored and documented the sensor data import servlet 2016-06-22 13:23:44 +02:00
Steffen Schaefer 6450f3db42 Merge branch 'master' into foiling
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
2016-06-22 10:10:52 +02:00
fmittag 5caddd9e57 changed the /api/v1/regattas/{regattaname}/races/{racename}/wind webservice so that a fromTime and toTime is mandatory 2016-06-21 16:18:44 +02:00
fmittag 44c2d93eef added some account information to wind status output 2016-06-21 12:34:14 +02:00
fmittag c2fa105949 removed unused code and made WindStatusServlet abstract 2016-06-21 11:48:47 +02:00
fmittag 8165107167 Implemented correct handling of multiple igtimi accounts in WindStatus servlet 2016-06-20 16:48:35 +02:00
fmittag f395c33cf2 added a getRemoteAddress() method to LiveDataConnection to enable the display of it.
added the display of the igtimi connection uri to the WindStatusservlet
2016-06-20 16:05:11 +02:00
Axel Uhl 6d87074bbb fixing bug 3721 by restricting the number of wind fixes delivered through the /wind REST API to 10,000
Change-Id: I6d0f912667bd31f33d8e01e60d340cc3a03ead29
2016-06-18 21:00:11 +02:00
Axel Uhl fd93d4ab92 for bug 3710, use explicit UTF-8 encoding for race management app configuration servlet response
Change-Id: I62f49b7c9497e2efa58d3c5a92b393b923c29730
2016-06-18 12:18:20 +02:00
fmittag c44aafd255 removed 'Beta' tag from all webservice descriptions 2016-06-17 15:47:38 +02:00
fmittag b72e19bc4b added documentation of /api/v1/regattas/{regattaname}/races/{racename}/competitors/live webservice 2016-06-17 15:18:55 +02:00
Papick Garcia Taboada 07da99810d Merge branch 'foiling' of ssh://sapsailing.com/home/trac/git into foiling 2016-06-14 08:51:36 +02:00
Steffen Schaefer 853c1ee316 Merge branch 'master' into foiling 2016-06-14 08:42:49 +02:00
Axel Uhl 434f9be271 added documentation for the /times REST endpoint
Change-Id: I4bdb51803a12040f9b7334a5a1eac9bd3a4a0364
2016-06-10 14:36:44 +02:00
Axel Uhl 175af63beb Merge remote-tracking branch 'server/master' 2016-06-09 22:38:02 +02:00
Axel Uhl 3efe462473 output numbers as numbers, not strings, in JSON documents of REST API 2016-06-09 22:14:36 +02:00
Papick Garcia Taboada 9416f5deed Removed unneeded GPSFixStore usage 2016-06-09 18:35:16 +02:00
Axel Uhl 55d81047f2 added gapToLeader-m
Change-Id: Ic512bc010cb6406221cfd32014fb63b5091196fe
2016-06-09 18:07:01 +02:00
Axel Uhl e14abcf43b fixed totalPoints export in LeaderboardsResources.
Change-Id: I27e003c02f2600a04cc05a3f22c6d61e1692c30c
2016-06-09 17:28:56 +02:00
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