Axel Uhl
b680c0baf7
Merge remote-tracking branch 'server/master'
2016-02-03 22:43:29 +01:00
Axel Uhl
adc4cea5b9
Describing the Android release / deploy build process.
2016-02-02 23:00:13 +00:00
Axel Uhl
40aca3ea2f
More hints on getting an MiOS build/deploy/handover done
2016-02-02 22:33:29 +00:00
Axel Uhl
8b488c0478
Describing the iOS build
2016-02-02 21:52:17 +00:00
Axel Uhl
1bc29a9ec0
bug 3452: introducing an applyFilter parameter on DynamicTrackedRace.recordWind, forcing RaceLog-provided wind fixes into the race
...
Change-Id: Ie96ac8537650adb46285ebcc18a91dc70a6f7582
2016-02-02 21:14:43 +01:00
Axel Uhl
bda7a900c7
Merge remote-tracking branch 'server/ubilabs--ios--develop'
2016-02-02 16:36:16 +01:00
Axel Uhl
dccac572f8
don't add regatta log-provided competitors if no race exists; only collect competitors from race columns
...
Change-Id: Icd2843aba1d374cb3ac55b3575ec22e734ab9ec0
2016-01-30 21:11:44 +01:00
Axel Uhl
c985c18c86
consolidated imports to avoid warnings
...
Change-Id: Ib94311d8c96ba4474d4509010c51ab97f3cd369d
2016-01-30 17:32:23 +01:00
Axel Uhl
d50e1a73fd
added logic and test case for bug 3448: invalidate competitor cache and compute competitors from reagtta log if no race columns exist yet
...
Change-Id: Ica3d9fe0e032cce30389a55f2d1d4ad0fc7cd9bf
2016-01-30 17:19:41 +01:00
Axel Uhl
75c658cb21
Merge branch 'bug3446'
2016-01-30 15:13:21 +01:00
Axel Uhl
933c9128db
added forwarding rule for RegattaLogEvent on AbstractSimpleLeaderboardImpl
...
Change-Id: I58758c4b7eb7a589090981383587d709a13f34e6
2016-01-30 15:12:40 +01:00
Axel Uhl
fe1bf844a8
fixing bug 3448: trigger event when regatta log events are added and use to invalidate leaderboard DTO cache
...
Change-Id: Ib4a91d1ab8d58e07a845852cffd0f99d59b29544
2016-01-30 13:24:09 +01:00
Axel Uhl
5a5a74075b
"cherry-picked" the admin training presentation from ubilabs--rcapp--bug-3077 onto master
...
Change-Id: I717da07219848d95c10871e5421c25869ec7adf7
2016-01-30 12:51:34 +01:00
Axel Uhl
e43f85537c
more i18n support; focus identifier text field in create config dialog
...
Change-Id: Iaaff7d66d2969a14450b6f03dd04de741616fab6
2016-01-30 12:43:50 +01:00
Axel Uhl
209066b87b
fix for bug 3446: entity identity comparator for device configurations now compares the list of device names
...
Change-Id: I72f7d20cdb95d64cc403e7645f46c86a3f8c8384
2016-01-30 12:33:27 +01:00
Axel Uhl
c0f30fd545
removed "MULTI" device configuration stuff which was unused
...
Change-Id: Ie27a13acdf84c6978f26ecef362df58f3514e967
2016-01-30 12:14:21 +01:00
Axel Uhl
cb3e6aa94e
fixed several i18n issues around DeviceConfigurations in AdminConsole; use MarkedAsyncCallback in more places
...
Change-Id: Ifb0ba3fde55340595d3c87ed951d94d262e5ef48
2016-01-30 11:35:43 +01:00
Axel Uhl
91f8a9799d
"merging" the training presentation into master
...
Change-Id: I44931946b0a1d93626d91606e07897356501c379
2016-01-29 00:16:52 +01:00
Axel Uhl
f196f13aef
added -Djava.awt.headless=true to ADDITIONAL_JAVA_ARGS in start script to avoid issues with DISPLAY variable and QR code generation
...
Change-Id: Ic502069d60b8c2f8070d9966d28076491963ca70
2016-01-28 22:17:20 +01:00
Axel Uhl
30555d8c38
bug 3444: by removing the redundant validate() method in RegattaLogAddDeviceMappingDialog the QR code is generated when it should
...
Change-Id: If956108c63b7475207e526485f1cadfe43ae295a
2016-01-28 21:44:08 +01:00
Axel Uhl
cfcd0a7272
uncheck "Copy Competitors" checkbox in copy course/competitors dialog because competitors by default are registered on the regatta
...
Change-Id: Id7f0455a13c901e574809a60608fcf2128e9ce5a
2016-01-28 21:12:30 +01:00
Axel Uhl
fdc3b1b777
fix for bug 3443: use WaypointDTO's equals/hashCode which is based on identity to compare waypoints for selection model of waypoints tables
...
Change-Id: I337f2b64c7340f1cf3809b098b42fd181b4be256
2016-01-28 21:11:52 +01:00
Axel Uhl
7f0b8a06d0
bug 3442: fixing NPE when checking if marks are used in other course; if there is no course defined yet, marks are not used
...
Change-Id: Ib4d8e8731dce0e84c819eb42fd29765b4e21850d
2016-01-28 20:38:12 +01:00
Axel Uhl
74b4130338
preparing training presentation for smartphone tracking
...
Change-Id: I4dab74bab1c578ca5d9157c2bc7fbe03fe1ddaa2
2016-01-28 18:21:58 +01:00
Axel Uhl
9d105975a6
started with an administrator training guide
...
Change-Id: I65f338130f5231b9209b9485eb13c050e981df28
2016-01-28 11:31:35 +01:00
EC2 Server
a4ae7c3b3c
Merge commit '27fcba4'
2016-01-28 08:03:17 +00:00
EC2 Server
7e78c061e3
use TMP environment variable to set java.io.tmpdir VM argument for GWT build
2016-01-28 08:02:29 +00: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
cdcd9a7c6c
fix for bug 3435: don't try to revoke a "Start Tracking" event when none is provided
...
Change-Id: If6a30934618469db1c7c01cf9d30c01d3b40119f
2016-01-27 17:56:44 +01:00
Axel Uhl
7e38d91535
fixed regatta log dialog heading
...
Change-Id: If307671f49f46454765cf8bfd49fd14a7febf557
2016-01-27 17:52:03 +01:00
Axel Uhl
86de772656
Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3011'
2016-01-27 15:10:57 +01:00
Axel Uhl
e48fbfc26d
removed extra space characters from www/build.properties
...
Change-Id: I5f5d6922221fce1a34613c1be59353a9b2138f3f
2016-01-27 14:23:59 +01:00
Axel Uhl
aade9cf2bf
Merge remote-tracking branch 'server/master'
2016-01-27 14:23:15 +01:00
Axel Uhl
4396919105
Merge branch 'master' into ubilabs--rcapp--bug-3011
2016-01-27 10:39:27 +01:00
Axel Uhl
d3c7fd9760
Merge branch 'bug3420'
2016-01-27 10:06:08 +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
0c76c57e79
added missing version update of pom.xml for TracAPI upgrade
...
Change-Id: Ida5055d690f406a2a6ebbe29c493a8b6361eaf9b
2016-01-25 18:34:42 +01:00
Axel Uhl
a070d86627
upgraded to TracAPI 3.1.3, hoping to fix the deadlock issue
...
Change-Id: Ib8f06a5841b9a46c07667d7f3c3757de7efd9abe
2016-01-25 18:28:39 +01:00
Axel Uhl
d6b3066620
renamed AdminConsole tab from Race Committee App to Race Manager App
...
Change-Id: I0594862ec56681a934c7fb030c2aaea82e4b96f1
2016-01-25 15:28:17 +01:00
Axel Uhl
4c378e7ca9
enhanced Javadoc
...
Change-Id: Ib6322d3c9741b99c03ed5e5260dd468c347e1ab0
2016-01-25 11:18:29 +01:00
Axel Uhl
f8e3c32bae
integrated loading indicator in abstract entry point hierarchy and included in AdminConsole and EmbeddedMapAndWindChart entry points
...
Change-Id: Ia22bed6fd44a2cf2035a313d73dacfa5236de63a
2016-01-25 11:11:03 +01:00
Axel Uhl
60d6cbc4c6
caching CompetitorResult objects in a Map<Competitor, CompetitorResult> in DynamicTrackedRaceImpl;
...
this way regular mark passing updates are not troubled by expensive race log look-ups
Change-Id: I2bfe6fcf4eac4a6b9749fb4ea8b549967bc4aeb8
2016-01-22 18:23:37 +01:00
Axel Uhl
1aa9bae074
Merge branch 'master' into bug3420
2016-01-22 16:43:20 +01:00
Axel Uhl
642426ecfb
Merge remote-tracking branch 'server/master'
2016-01-22 16:42:45 +01:00
Axel Uhl
5af777f726
fixed tests by using different creation time stamps for mark definition events
...
Change-Id: I5e89fe6e581a70e850c08cafeae62a2c85d489dd
2016-01-22 16:40:46 +01:00
Axel Uhl
7a41f85d17
fixed mark fix loading tests which require now that there is a RegattaLogDefineMarkEvent in the RegattaLog
...
Change-Id: Iac9d5e9699b7df4aed376b508c92ec49a097de89
2016-01-22 16:35:19 +01:00
Axel Uhl
c6ca28750d
removed method from DynamicTrackedRace contract that was only used by Impl class
...
Change-Id: I29b462c77de1b13932c31a39e43449b82d651d5c
2016-01-22 16:24:47 +01:00
Axel Uhl
a522f7450e
added more tests for mark passing updates from race logs
...
Change-Id: I5f1631678bef2ecf7b5a1e8dbc059705e562e9d9
2016-01-22 16:20:46 +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
35af1394c6
Got the first tests for mark passing update from race log changes running
...
Change-Id: I857191e67ae8e408670832d02f1e1caab42d10a9
2016-01-22 15:15:03 +01:00
Axel Uhl
b81e6742e5
re-added version to TracAPI's pom.xml
...
Change-Id: Ia234e07f754324801f072a4181e84859bfa7948d
2016-01-21 16:47:34 +01:00
Axel Uhl
1d93baa62c
upgraded TracAPI from 3.1.1 to 3.1.2, hoping to ultimately fix the deadlock upon terminating a subscription and stopping a subscriber
...
Change-Id: I82c5cb7fbaa9ab9f3b475245d96b35500dd3248f
2016-01-21 14:40:19 +01:00
Axel Uhl
09f92c97da
Merge branch 'master' into bug3420
2016-01-20 10:25:00 +01:00
Axel Uhl
e5eb4f19b3
adjusted PositioningFragment to changes around CompetitorResults/CompetitorResult
...
Change-Id: Ib90f29218f6f654312c836625c951a7e87140e7b
2016-01-20 10:14:35 +01:00
Axel Uhl
86c4942049
added missing COmpetitorResultImpl class
...
Change-Id: I2c08a429851c3604f5f0f8718b52174d30be027a
2016-01-20 08:40:58 +01:00
Axel Uhl
471b8585b7
if an explicit score is provided in the RaceLogFinishPositioningEvent object, it is applied in the score correction (bug 3420)
...
Change-Id: Iedb4388168024c0f581b96149c295dcb57fb66f0
2016-01-19 20:48:04 +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
563a282b73
fixed message strings explaining soring schemes for ESS / 12
...
Change-Id: Ia8d076dbc49fb21c269789185cf00d9c6cf89f9f
2016-01-18 18:33:38 +01:00
Axel Uhl
a23387bacd
fixed ordering in BoatClassMasterdata
...
Change-Id: I8fc0fe40ca99e89137d6d2a3754ec14595bba298
2016-01-18 18:25:45 +01:00
Axel Uhl
b5e60a0417
factored out commonalities between ESS High Point scoring schemes for act leaderboards
...
Change-Id: I962f12756e1667a53c533bdd95c0f6757cf29349
2016-01-18 18:24:01 +01:00
Axel Uhl
11132b9fa2
factored out commonalities between the two different ESS HighPoint overall scoring schemes
...
Change-Id: Iebaf853057056aad271bc20868d6f08323ea31b4
2016-01-18 18:19:45 +01:00
Axel Uhl
ba9a19c7c6
re-format and comment change only
...
Change-Id: I447224e1cc21eef1034f40665f135b0ec800adf8
2016-01-18 17:51:51 +01:00
Axel Uhl
b488c2608f
Merge branch 'master' into gc32-changes
2016-01-18 17:14:00 +01:00
Axel Uhl
98c7f1b77a
Merge branch 'master' into bug2851
2016-01-18 17:08:59 +01:00
Axel Uhl
0fffbe7869
upgraded TracAPI version also in pom.xml
...
Change-Id: I25e689f8460f12919c37f9798709fdfae03f61a3
2016-01-18 17:06:41 +01:00
Axel Uhl
1891a5562b
upgraded TracAPI to version 3.1.1; this should resolve the timeouts during unsubscribe
...
Change-Id: I7ffa172214d76938258890285b8af4fb48a1028e
2016-01-18 16:58:54 +01:00
Axel Uhl
16196258c9
restored DeviceIdentifier serialization/deserialization test functionality from removed RaceLogSerializationTest
...
Change-Id: Icfbf819c7a766ec1035db717fc6cf72bf560f9dd
2016-01-18 16:34:44 +01:00
Axel Uhl
a5e4ccb465
removed FIXME; append /fleetName to list of races containing mark
...
Change-Id: I62facd34621de2080a94c710ab4d2272b71200ef
2016-01-18 15:51:00 +01:00
Axel Uhl
cf9dd8f662
replaced equals check on RaceLog by ==
...
Change-Id: I80a7bab98377b63e9068ed48eed36a25089c9a48
2016-01-18 15:40:55 +01:00
Axel Uhl
aff525180e
single point of exit pattern
...
Change-Id: I5c8040a5babc3f4562c116fbb9a041da813b01d6
2016-01-18 15:38:37 +01:00
Axel Uhl
22471f9903
made a few variables final; removed redundant cast
...
Change-Id: I244d0259aceb4d084d048d0e58292481317da5e6
2016-01-18 15:34:38 +01:00
Axel Uhl
d6cd41def9
improved Javadoc
...
Change-Id: I86022d11facc9e799ab23a13ba483b5cff482b3e
2016-01-18 15:29:16 +01:00
Axel Uhl
7b9321336e
avoid redundant contains/remove double lookup in SailingServiceImpl.findDuplicates
...
Change-Id: I65eba92b15187ae489cbb6c7d59adf8303a41496
2016-01-18 15:21:01 +01:00
Axel Uhl
c4fb89fb38
refined exception list of SailingServiceImpl.denoteForRaceLogTracking
...
Change-Id: Iaf17608e35020c428c629eecf2c5170edb3f97fb
2016-01-18 15:13:24 +01:00
Axel Uhl
bfc35601ce
replaced use of SailingServiceImpl.sizeOf by Util.isEmpty() and removed sizeOf
...
Change-Id: I2b6a49b897790030618ce73abe5b83f5cf79d90d
2016-01-18 15:08:06 +01:00
Axel Uhl
1d9f04992f
introducing equals/hashCode on DeviceMappingDTO; reducing entity comparison for DeviceMappingDTO to its equals/hashCode definition
...
Change-Id: I9ce39fa3f560fd1280100adfe0612cfbe41ef094
2016-01-18 12:36:53 +01:00
Axel Uhl
259f61d96d
coding conventions in RegattaLogTrackingDeviceMappingsDialog
...
Change-Id: I5a5e2735da23d432d910666522fc27240a4f2532
2016-01-18 11:38:30 +01:00
Axel Uhl
e7584e6c90
merged AbstractLogTrackingDeviceMappingsDialog into only subclass RegattaLogTrackingDeviceMappingsDialog
...
Change-Id: Ifce7a064817bb90eae1471db933e7db74bb4bcfe
2016-01-18 11:34:55 +01:00
Axel Uhl
9b1e11b0c9
merged AbstractLogAddDeviceMappingDialog into RegattaLogAddDeviceMappingDialog
...
Change-Id: I776f5d2017c669fdd083a1f9addf06781e2c28bb
2016-01-18 11:28:05 +01:00
Axel Uhl
884f071972
added i18n for course management panel
...
Change-Id: Ie12db85b6eb88c463752853148f33ab2a570f2a5
2016-01-18 11:18:45 +01:00
Axel Uhl
3ef139d0dc
use Util.getDominantObject in RaceLogTrackingAdapterImpl when denoting a race for smartphone tracking
...
Change-Id: I454c0ce3bdf72e3c919e0eaa63df85a77a6f0601
2016-01-18 10:48:29 +01:00
Axel Uhl
4286652f3a
changed scope of move method from package to protected
...
Change-Id: I39b40fa6eb9b2f385d7da21322b7f434ee439441
2016-01-18 09:31:31 +01:00
Axel Uhl
babd76d4a3
formatting changes only
...
Change-Id: Ie9442d4229d8f773d40f6f632aa8a94a527b0188
2016-01-18 09:27:16 +01:00
Axel Uhl
80a34a7a0e
fixed test verdict: no artificial mark ping fix is generated anymore
...
Change-Id: Iace233127fcf03972e0c5ddc7a00061be69d6768
2016-01-15 20:15:03 +01:00
Axel Uhl
981c843381
fixed cancel behavior for toggling "Register Competitors on Race"
...
Change-Id: Ic4c299797365fc481e7f65b013a3eac929f39fce
2016-01-15 18:09:38 +01:00
Axel Uhl
c5f9d0b2a0
validate race competitor registration dialog: it's invalid (not saveable) if the race does not support per-race competitor registrations
...
Change-Id: I683234365c642c40a1ae70cd98b7d491c11af753
2016-01-15 18:04:15 +01:00
Axel Uhl
46e5f927ae
allow user to add any competitor to a RaceLog, not only those registered for the regatta
...
Change-Id: I01d844cb06a6dfaba11b6338a0824e36551f4e08
2016-01-15 17:32:22 +01:00
Axel Uhl
132bde4686
use DeviceMappingConstants for postCheckout endpoint
...
Change-Id: Ia8f1a77877304d32d6336fe9fbf6eb9ee66e62b6
2016-01-15 16:59:40 +01:00
Axel Uhl
57c6e5ac89
LeaderboardsResource.pingMark no longer returns a lastKnownPosition in its response, only an OK
...
Change-Id: Id57cbcbb876bf04707a8cb14046b962d44221485
2016-01-15 16:33:02 +01:00
Axel Uhl
d57265f72c
added a confirmation popup when toggling the "Show only competitors from log" checkbox which may lose user input
...
Change-Id: I8d08a8a99d630e4b0474b5926505c38781d576ec
2016-01-15 15:27:52 +01:00
Axel Uhl
27a82505aa
fixed clear() vs. removeAll() issue in filtered competitor panel
...
Change-Id: Ie1bfad9c2ff921ad806b72de043c91a4c740aacb
2016-01-15 15:10:02 +01:00
Axel Uhl
1c3834de91
removed a bunch of empty lines
...
Change-Id: Ifa3c076996b489c8f52c328f1106b3108b67c3a2
2016-01-15 14:46:14 +01:00
Axel Uhl
01dfe544c2
consolidated imports
...
Change-Id: I1b6e5a77e73d1860cde00eadbdd1b71a5e518616
2016-01-15 14:39:28 +01:00
Axel Uhl
f1e1623c2c
improved the implementation of AbstractCompetitorRegistrationsDialog.move, avoiding intermediate collections to be constructed
...
Change-Id: I27baa65771a8417e79289d8de2ebca41b2ff8c3e
2016-01-15 14:37:56 +01:00
Axel Uhl
32f914c0ea
coding conventions, and added a FIXME for showing a confirmation dialog at least before toggling "Show only competitors from log" otherwise losing user input
...
Change-Id: I3b79a60d55a3cc39dbb004bc7160925483eef007
2016-01-15 14:30:55 +01:00
Axel Uhl
b7e7b83778
some minor method renames and making variables final where possible
...
Change-Id: I21880695f4a7a34488eed38e1cdd650ded8c704d
2016-01-15 14:12:16 +01:00
Axel Uhl
c616e0181d
made showOnlyCompetitorsOfLog protected because it is not used outside of subclasses
...
Change-Id: I64e68ebd99311718c31ed4cb23d9636bb3fb076c
2016-01-15 13:51:32 +01:00
Axel Uhl
4d0fb5f865
don't create artificial "anti-creep" mark fixes anymore; see bug 3421 and bug 3422 about abandoning interpolation on mark tracks
...
Change-Id: I38cba61bbc004ca028c6d87adc7507ac9c1db4fc
2016-01-15 12:18:48 +01:00