Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl ecb7a6beba Merge branch 'bug3641' into translation 2016-05-03 00:46:20 +02:00
Axel Uhl 7e1facce9b fixed showUncorrectedTotalPoints message
Change-Id: I254cdd78e70e74210ed9baec8caeec6ff99a5cb4
2016-05-02 18:33:41 +02:00
Axel Uhl 51223dbb6e check for TracTrac hidden races using "visibility" instead of "status"
Change-Id: I87e63373c36e37e1d8829f376018305345fdb8be
2016-05-02 18:06:31 +02:00
Axel Uhl efc2fdb304 upgraded Android app versions from 1.7 to 1.8
Change-Id: If9c6e31bafa6cbee9313e3d1cd0c2925ff62b921
2016-05-02 17:34:00 +02:00
Axel Uhl 261d714329 set test case file encoding to UTF-8 to ensure Umlauts in competitor names are encoded properly
Change-Id: I3c96320e3c3ca9ad044e03ac01ef3ffc9946c359
2016-05-02 16:56:08 +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
Axel Uhl 1e018a0f28 Merge remote-tracking branch 'server/master' 2016-05-02 13:35:29 +02:00
Axel Uhl 5cb2018d55 Merge branch 'master' into bug3625 2016-05-02 12:00:44 +02:00
Axel Uhl 6526f20f00 declaring Offset and FixedBearing as "useless" passing instructions for now; they are not really supported internally
Change-Id: I12ba9000b775b9c518133a1f419d29cf8fdd46ec
2016-05-01 11:39:56 +02:00
Axel Uhl 2f364170bb bug3639: made the passing instruction entry work; considering removing Offset and FixedBearing for now (declaring them "useless")
Change-Id: Ia32911b5b01ad02b6ecebc396cb0d0b1ea6a1803
2016-05-01 11:37:08 +02:00
Axel Uhl bd0b929505 bug 3639: generalizing how PassingInstruction values are offered and processed
Change-Id: If894f4f5250e927788bc90a5f382c149c539fd91
2016-05-01 11:18:31 +02:00
Axel Uhl 7f5d8ae024 hot fix for bug 3639: PassingInstruction.Single_Unknown moved to end to keep strings.xml "consistent"
Change-Id: Ifce3080ef9d45d3804bf4af9d148885ab1cae3c8
2016-05-01 10:53:20 +02:00
Axel Uhl eb8c435a32 normalize time point in TrackedRace.getCompetitorsFromBestToWorst() in case it is after timePointOfNewestEvent to improve cache hit rate
Change-Id: Ic280e339c4cae6ced1ea84267137e9eaf9a9e235
2016-04-29 17:47:42 +02:00
Axel Uhl 2163f96943 use lambda expression for small Callable implementation
Change-Id: I1049731d37783df5c206f336f05427fa8dfc2fab
2016-04-29 17:41:26 +02:00
Axel Uhl 07e5a349bf use Lambdas for simple Callable implementations
Change-Id: I176f00e477ebf69e78d54e2c28184e003d83ca54
2016-04-29 17:39:31 +02:00
Axel Uhl fc6d0b3e24 fixing bug in ScoreCorrectionImpl regarding the delayed application of MaxPointsReason and scores; added test case; use live time point for winner determination
Change-Id: I15606fe99c52b32580bf9191e1a592828642c346
2016-04-29 17:34:02 +02:00
Axel Uhl 3ffb2be543 use the live delay as identified by the leadeboard, not by simply subtracting 15s from "now"
Change-Id: I00052cf4a38de846a57563578a88c7c9528c9e47
2016-04-29 16:49:10 +02:00
Axel Uhl 8c801886f6 improved test failure message
Change-Id: Id22493c522c7b49e97e9638b003b782c010d7cf1
2016-04-29 16:28:02 +02:00
Axel Uhl d663c04045 Merge branch 'ubilabs--ios--develop' 2016-04-29 16:02:27 +02:00
Axel Uhl cb91dd1edb Merge remote-tracking branch 'server/ubilabs--ios--develop' into ubilabs--ios--develop 2016-04-29 16:01:15 +02:00
Axel Uhl 3e055eeaff Merge remote-tracking branch 'server/master' 2016-04-29 09:45:49 +02:00
Axel Uhl 90904931d1 Merge branch 'ubilabs--rcapp--master' 2016-04-29 09:43:09 +02:00
Axel Uhl 1f8d3a7719 Merge branch 'ubilabs--rcapp--develop-update-libs' into ubilabs--rcapp--develop 2016-04-29 09:40:20 +02:00
Axel Uhl df4a9a4dd3 increased STRICTNESS_OF_DISTANCE_BASED_PROBABILITY a bit to make far away local distance minima less likely a candidate
Change-Id: I9e6245bc76885c07398cc22bed6423738ec379e1
2016-04-29 09:39:38 +02:00
Axel Uhl b5caa9d254 Merge branch 'ubilabs--ios--develop' 2016-04-28 16:15:52 +02:00
Axel Uhl 39d2c993c6 Merge remote-tracking branch 'server/ubilabs--ios--develop' into ubilabs--ios--develop 2016-04-28 16:15:35 +02:00
Axel Uhl 2338aa1f3a inherit SailingLocales.gwt.xml in all entry point specifications
Change-Id: I0ef92e01e9cb8d32d85475e44c18bbc9aa657482
2016-04-28 13:07:34 +02:00
Axel Uhl 4ffc06a796 Merge remote-tracking branch 'server/master' 2016-04-28 12:33:41 +02:00
Axel Uhl 84fac67d6d improved log messages
Change-Id: I1c370e6f635cf572a547eec4dc2dea76a8483c19
2016-04-28 12:33:36 +02:00
Axel Uhl 1770c38f59 Merge branch 'translation' 2016-04-28 10:37:52 +02:00
Axel Uhl fcc78ff23d whitespace changes; adjusted one log message (adding missing blank)
Change-Id: If68bf5a3da0c1b75e435e41bb94e01e6a368af2a
2016-04-28 08:59:06 +02:00
Axel Uhl 160d4cd3ea Merge remote-tracking branch 'origin/translation' 2016-04-27 23:40:10 +02:00
Axel Uhl fb7e4268c2 fixing mark passing calculator handling of smallestChangedWaypointIndex with IntHolder
Change-Id: I343e9f0f6579307389a5b47b838341d78969d2b5
2016-04-27 18:24:42 +02:00
Axel Uhl af13c00de5 added the "ja" locale to SailingLocales.gwt.xml
Change-Id: Ia6510cccc55b93ddf5e7b75df784421c369bbaf3
2016-04-27 17:58:17 +02:00
Axel Uhl 02254a1851 updated Chinese translation
Change-Id: I83f56d25ced9c6ad8a312de07321334462ac0744
2016-04-27 17:57:31 +02:00
Axel Uhl bb90689c51 Merge branch 'master' into translation 2016-04-27 17:52:34 +02:00
Axel Uhl 726091f2df Merge remote-tracking branch 'server/translation' into translation 2016-04-27 17:49:45 +02:00
Axel Uhl 4d01dffa9a use TrackedRace.getEndOfRace() in RaceContext.getWinnerOrNull() to ensure score corrections are applied;
this fixes bug 3634 which so far had been preferring RaceState.getFinishedTime() which is based on the blue flag down
event which, however, may be before TrackedRace.getEndOfRace(). We may consider to use RaceState.getFinishedTime() as
a default for TrackedRace.getEndOfRace(), particularly in doubtful mark passing situations, and maybe always, since
it would correctly ignore much delayed mark passings outside of the finishing window

Change-Id: I710f9dbcb5a73f6397759be2db8b41311910dbd7
2016-04-27 17:39:08 +02:00
Axel Uhl 6adbbcbd70 Merge branch 'master' into translation 2016-04-27 16:23:22 +02:00
Axel Uhl 4db1aef55a during regatta structure import use null as Fleet color instead of BLACK
Change-Id: I098caf21942be0452054d152d84f3f844a755e19
2016-04-27 16:17:59 +02:00
Axel Uhl 5ce44a3f11 enhanced competitor search hint by "search tag"
Change-Id: Ia9d629613be42d3178d484c583e013c1836bbaf8
2016-04-27 14:04:03 +02:00
Axel Uhl 27d6cef9b4 added "FD" as alias for Flying Dutchman
Change-Id: Iafffb07a309c8622dca7bf1cbc822b1d99f55e56
2016-04-27 13:52:28 +02:00
Axel Uhl 8bc9b3222d cleaned up the escaping of URL parameters for assembling the links sent in e-mails for smartphone tracking sign-up
Change-Id: I4d101e0e7e116c4c08f04f52eda8e782242910ed
2016-04-27 10:46:01 +02:00
Axel Uhl 212787339a solving bug 3623 by relying on RefreshableSelectionModel instead of explicitly refreshing races of a named race column
Change-Id: I593d16ff3c8f3c59e03165aecbf7fc767c9602e3
2016-04-26 23:11:56 +02:00
Axel Uhl 47a08dd2be exclude ADMIN_CONSOLE course designer mode from selectable items in AdminConsole
Change-Id: Ia33a79fd68a76d9641a0bb9a868cb387fb144dd1
2016-04-26 14:34:17 +02:00
Axel Uhl b5d64be7a6 upgraded Android app versions from 1.6 to 1.7
Change-Id: I728c9d1b852408b4e55445d54a2ba1cd1cb543ad
2016-04-26 10:15:13 +02:00
Axel Uhl 17c6e2ed6b Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop 2016-04-25 23:31:01 +02:00
Axel Uhl cc701264f2 fixed merge issue with SeriesImpl constructor taking the new "isParallel..." flag
Change-Id: Id409303869f5c94a6df6d0809de52604cce6ffe6
2016-04-25 23:28:24 +02:00
Axel Uhl c6e42069e1 Merge branch 'bug3622' 2016-04-25 20:28:59 +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
Axel Uhl 8da9982119 Merge branch 'ubilabs--rcapp--bug_3011' into bug3622 2016-04-25 18:11:47 +02:00
Axel Uhl 7096727b77 accomodated for the failing test regarding hiding unscheduled races in series where for their successor series races are already scheduled
Change-Id: I2b96f5cf8c8f5a919af800a27d9a0920fa936c90
2016-04-25 18:04:25 +02:00
Axel Uhl 5f6587b4e5 Merge branch 'master' into ubilabs--rcapp--develop-update-libs 2016-04-25 14:58:52 +02:00
Axel Uhl 347fb3a3ef Merge branch 'master' into ubilabs--rcapp--develop-update-libs 2016-04-25 14:58:14 +02:00
Axel Uhl 97d7912759 made deployable by removing redundant internal_impl-22.2.1.jar; adjusted prefereces to suppress all warnings in imported source code
Change-Id: Ic1f691973c44bddbb8a091868150018a7defa875
2016-04-25 13:54:46 +02:00
Axel Uhl f081650fef first compileable version of ubilabs--rcapp--develop-update-libs branch with upgraded consumption of advrecyclerview-0.7.4
Change-Id: Iaaa96c2e5b66295d202de2b25fc04a2eab7bdd93
2016-04-25 12:53:20 +02:00
Axel Uhl 50be7ce4b5 unpacked sources for version 0.7.4 of advrecyclerview which is the most current version that matches Android 22.2.1
Change-Id: I63d1543898e716998e1771b80a1cddc4bde84264
2016-04-25 10:47:56 +02:00
Axel Uhl a33f3cd4b6 added res and src for support-v7-recuclerview_lib
Change-Id: I0ef0fa93248a2757bad0cb7e4c994a275ac6a1dd
2016-04-25 10:30:45 +02:00
Axel Uhl 3cc6706e71 don't use a Set to keep protest_image views for which click listener has been set; could be a leak; use keyed tag instead
Change-Id: I0860708a6c7f9dd576eaf3f382eefad9a6f7545a
2016-04-25 10:12:26 +02:00
Axel Uhl f472d331ac Merge remote-tracking branch 'origin/master' 2016-04-24 20:02:34 +02:00
Axel Uhl 0b643785af fixed implementation of tie breaking rule A8.2 ("count-back"), considering discarded scores too 2016-04-24 20:02:10 +02:00
Axel Uhl bbf267e781 use CurrentRaceFilter to determine the races to show for the wind fragment; always show fleet name in popup
Change-Id: I7a3d28b8d13af883769a285f77ad3ae36dad964d
2016-04-24 13:07:09 +02:00
Axel Uhl d9ea36c516 Merge branch 'ubilabs--rcapp--bug_3011' into bug3622
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/RaceHelper.java

Change-Id: I39313f9a5e9b0c3d079d2f1ad2cf1eadbb0ef844
2016-04-24 12:48:11 +02:00
Axel Uhl 4e0a0255c5 added Javadoc
Change-Id: I96e7d9e9d4e7bbb5223db3b57928494bc04a621f
2016-04-24 12:47:35 +02:00
Axel Uhl 7b145d5b9c formatting and whitespace changes only
Change-Id: I7e6f2c921d3c47d9adbee50eba4df6996b42564e
2016-04-24 12:13:08 +02:00
Axel Uhl f7cf2d0ec8 re-established mRacesByGroup; set protest flag click listener only once per protest_image view
Change-Id: Icb70244dec996bd04980f22afa55c3d9cbab54dc
2016-04-23 15:29:26 +02:00
Axel Uhl 38be2a938a Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-23 13:57:40 +02:00
Axel Uhl 4224a14b1e don't assume that RaceGroup.getDisplayName always yields a non-null value
Change-Id: I3a5c542fd93ab4bac4bf906efb39d9e07ae6f9ea
2016-04-23 13:39:15 +02:00
Axel Uhl 450aaee1f1 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-22 22:41:12 +02:00
Axel Uhl 4241c11000 Merge remote branch 'origin/bug3608' 2016-04-22 22:25:07 +02:00
Axel Uhl 15df181a29 set live leaderboard updater as daemon thread so it doesn't keep VM from stopping
Change-Id: Ia619774f50c3f7278def904868b62eb882b03a14
2016-04-22 17:59:12 +02:00
Axel Uhl 3d5b6d1d6b fixing an NPE in the RaceManager app related to a problem with empty selection
Change-Id: I0770d0d029e0addf25ed0e94ab5114015164cf8c
2016-04-22 17:33:01 +02:00
Axel Uhl c69199c76e when no CourseDesignerMode is specified on a (legacy) RaceLogCourseDesignChangedEvent, use the course as is for backward compatibility
Change-Id: I0c883b534e9f8836f3b3d097bb25d7c152b896e7
2016-04-22 17:27:54 +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 6ecb70d4c5 infer zeroBasedIndexInFleet if not transmitted explicity by searching through the RaceRow/RaceCell combo; slow but effective
Change-Id: Ib66bd39bdc66a95ed853d7529de5c209865d15c5
2016-04-22 15:54:14 +02:00
Axel Uhl 64eca8c4e1 consider RaceGroup as first criterion for series ordering
Change-Id: I9b2f06ec2c833c6f0a7f4531169af282f1bca859
2016-04-22 15:21:44 +02:00
Axel Uhl 56497de95f fixed series comparator
Change-Id: Ib7e6ec94dc7881e873ca622d40ca9d93079b5a45
2016-04-22 15:12:32 +02:00
Axel Uhl d9ffdc3136 arbitrate sorting ties if the index in fleet hasn't been transmitted, e.g., by an old server, use the NaturalComparator on the race column name
Change-Id: I0e5a42ac44b7447d914dd5db1e13923836119b3c
2016-04-22 14:52:28 +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 53ba7f5540 fixed initialization order of filter and adapter, making it a lot less likely that filtered races are not found
Change-Id: I544f6a9ed9e2653160a1b909f6eace78b0d256be
2016-04-22 13:19:05 +02:00
Axel Uhl c3080caad1 catch the case where for what is probably a race condition due to asynchronous race loading and filter UI application a view item cannot be found
Change-Id: I994b0ef297bfcc7cae8428792289ec6ba55940cd
2016-04-22 12:47:51 +02:00
Axel Uhl 7c01549a9f Merge branch 'bug3532' into ubilabs--rcapp--bug_3011 2016-04-22 12:12:50 +02:00
Axel Uhl 3396cc6b1d added AdminConsole support for parallel/sequential fleet execution for series *creation*
Change-Id: If2f3a6d9c2684f84c162608ca2b57ca884e05ad0
2016-04-22 12:12:14 +02:00
Axel Uhl ccbd8904f0 Merge remote-tracking branch 'server/bug3532' into bug3532 2016-04-22 12:08:23 +02:00
Axel Uhl 65b3d56128 Merge remote-tracking branch 'server/bug3532' into bug3532 2016-04-22 12:05:59 +02:00
Axel Uhl 61e6f1a113 replaced external IP address of RabbitMQ by rabbit.sapsailing.com
Change-Id: I877990fe29277884cd3251f187c8a284a4d25ea7
2016-04-22 11:49:24 +02:00
Axel Uhl 3b33a64609 Updated amazon ec2 (markdown) 2016-04-22 09:19:41 +00:00
Axel Uhl 1f1010ae95 don't mark translated message strings as translatable=false
Change-Id: Ic5d54754f8dbb1c087cbf85433c556fe1d67cffc
2016-04-22 10:24:56 +02:00
Axel Uhl 65ae7d3a81 added ESS-specific tests for knockout format
Change-Id: If35277865d4c0b49e6f9bfa3b94e49b03e1b71ab
2016-04-22 10:07:01 +02:00
Axel Uhl 9792d76ccd added more race filter tests
Change-Id: Ib7ab4693c633dddf2026772b1914f5f2410f2a5f
2016-04-22 09:48:03 +02:00
Axel Uhl 085e21a661 formatting only
Change-Id: Ibdba8b2793a585c34be878c235e6c83bee2d7850
2016-04-22 09:47:41 +02:00
Axel Uhl 222eb3beff made copying the allRaces structure fool-proof in CurrentRaceFilterImpl
Change-Id: I2eff873433cf1a3303ceb5bd3fb410fef244e000
2016-04-22 09:41:13 +02:00
Axel Uhl b3cfa3b87e refresh regatta structures on filter only when the set of all races has changed; only then does the filter need to be re-constructed;
the filter now also receives a *copy* of allRaces; this way, changes that the RaceListFragment performs on its mAllRaces collection
cannot lead to inconsistent implicit "live" updates in the CurrentRaceFilterImpl instance. When I think about it, I'd like to ensure
this in CurrentRaceFilterImpl itself...

Change-Id: I89617bc661d3940e5374536541fa07c16c42bbc9
2016-04-22 09:35:48 +02:00
Axel Uhl 47e0f90721 create view items only when the underlying set of races has changed; this improves the "tap" problem slightly, but it's still not good
Change-Id: I698eeb119a4dd3fd6067573c04ae7fb4be2093d0
2016-04-22 08:49:00 +02:00
Axel Uhl 5be09b667a added null check for filteredRaces
Change-Id: I0b2c32977cb539f772afc7ddbe26e24b52f83deb
2016-04-22 02:27:04 +02:00
Axel Uhl 360e2e34e8 added another non-trivial test for ISAF format which failed and pointed at the need for hiding FINISHED races
Change-Id: Iccd8ac79d4393858e795782aa7df6a17001bfed9
2016-04-22 01:47:20 +02:00
Axel Uhl eceedec6ce another league start test
Change-Id: I34cd8075b9fa14afda006ed7893a24c442a303be
2016-04-22 01:37:11 +02:00