Commit Graph
100 Commits
Author SHA1 Message Date
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 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
Axel Uhl 245bfc9b0b the next non-trivial test case for league race filtering after starting the first race
Change-Id: I2a4d0dc85700a8c6781af5a9be62eff6dbdb1721
2016-04-22 01:34:43 +02:00
Axel Uhl 27ddfd4d80 added the first meaningful tests for filtering in non-trivial regatta structures with different formats, all races UNSCHEDULED
Change-Id: Idb59b34701a50b9ca67741aba30539c15974d179
2016-04-22 01:03:39 +02:00
Axel Uhl 82efec87b9 cleaned up after merging bug3532 branch
Change-Id: I22e052688104113d1c13e3ca85fa7fadd5d5e4cc
2016-04-22 00:30:35 +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 99c9642e2e renamed a test
Change-Id: I12a8be8feda02e0a7066f29bb7b26083fee6fd08
2016-04-22 00:20:12 +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 47ec06cffd a first working trivial test case which checks the basic test fixture, set-up and race retrieval with status update
Change-Id: I8de10018477bca6bd5b9a51003acc7bcfc5df285
2016-04-22 00:04:51 +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
Axel Uhl 4781e03531 formatting only
Change-Id: I2a85ba37e507c9ab94e413b29e9c189275a72c33
2016-04-21 20:57:19 +02:00
Axel Uhl 139f5b4ad4 a first version of a nav drawer that uses a majorly refactored filter and sorting design; filter implementation still empty, test not compiling
Change-Id: I2711757df7d4e72f6c627d2daacabb7b22e6e16f
2016-04-21 18:23:05 +02:00
Axel Uhl a833c463c6 preparing filter and comparator, adding stuff to FilterableRace
Change-Id: I8a1e54c5cadb8626a28a5647cc8c53a485e0d309
2016-04-21 14:49:15 +02:00
Axel Uhl 02fefbac8b Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-21 13:14:04 +02:00
Axel Uhl bbc94b82dc fixing PlayerActivity after introducing initialDurationAfterRaceStartInReplay
Change-Id: Iaf34f7d5098c731ffa012b8b4f0a36077b65a908
2016-04-21 13:12:39 +02:00
Axel Uhl 7681341db7 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-21 13:09:39 +02:00
Axel Uhl 2c064e9855 added a parameter "t" to the RaceBoard.html entry point that accepts a time after the start as [[hh:]mm:]ss to position the timer in replay mode
Change-Id: Id2e05ba3524e41e00e765c7e689a668093be15d7
2016-04-21 13:03:52 +02:00
Axel Uhl 2fe8099f61 added zeroBasedIndexInFleet to FilterableRace and ManagedRaceImpl
Change-Id: I0d14a949d1905ded6d84107f2f4de3af30d512b3
2016-04-21 12:40:29 +02:00
Axel Uhl 3ff77640e8 equipped RaceCell with a field zeroBasedIndexInFleet
Change-Id: Ic09d225dcfce73b747424f73fae794e9043c512d
2016-04-21 11:14:25 +02:00
Axel Uhl 8aff222bcc Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-21 10:47:12 +02:00
Axel Uhl c44fea4c40 moved Series.isFleetsRunInParallel to SeriesBase
Change-Id: Ied47989eae6cee647a90ec8373fd5b5fb48cba16
2016-04-21 10:36:37 +02:00
Axel Uhl ca2a399aee as a first step towards solving bug 3532 this adds Series.isFleetsRunInParallel() with a default result of true
Change-Id: I1d81055fbe22c690ef7a4214f8156ac6de07142f
2016-04-21 10:33:26 +02:00
Axel Uhl 681c9fa84f Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-21 00:48:38 +02:00
Axel Uhl 4b32ef5187 in case the mimeType is not set for a video, let the user still remove it in the RaceBoard media editor
Change-Id: Iffbb0991357b623f8ea11fd45ace09ebefefe8d6
2016-04-21 00:09:36 +02:00
Axel Uhl 8e2db4a366 secure MediaPanel against NPEs caused by null start times
Change-Id: I2a9cb3de51891dc756fc195b1eaa2fd768e04ea7
2016-04-20 23:41:01 +02:00
Axel Uhl c3f91ccc4c extend initial connection timeout from 10s to 10min; for Master Data Import it used to be 60s and even that was close...;
this partly reverts a "refactoring" that was none (938e1e8cbc) which replaced
an explicit 60s timeout with a util call that uses 10s

Change-Id: I1dbda0314550dcc77c7d69c3513d1de8430eae07
2016-04-20 22:34:14 +02:00
Axel Uhl 6eb5b3d191 check connection for null before trying to disconnect to avoid NPE in finally clause
Change-Id: I53c44c7ce95b27b73dbe6b7270b2dbdb86eef12e
2016-04-20 22:32:16 +02:00
Axel Uhl b39d958fcf renamed raceName to raceColumnName where appropriate
Change-Id: I3fdc09864245543f4b40a1e0a1bdfb8441706e32
2016-04-20 18:50:09 +02:00
Axel Uhl d416b90b50 Merge branch 'master' into ubilabs--rcapp--bug_3011 2016-04-20 18:03:01 +02:00
Axel Uhl 4e35f40159 reverted launch config that was changed accidentally
Change-Id: I8feb182dca1193081edec454af36620c151bf42b
2016-04-20 18:01:45 +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 18e89d6e23 Merge branch 'master' into ubilabs--tracking_app--develop 2016-04-20 16:38:08 +02:00
Axel Uhl 1cbb2531d3 Merge remote-tracking branch 'server/master' 2016-04-20 15:17:10 +02:00
Axel Uhl 0a417c1f88 handling null as checkin data to avoid NPE as reported by bug 3616
Change-Id: Ie047e91211ea0e875e140a6afada19aca8baa661
2016-04-20 15:10:49 +02:00
Axel Uhl 78dbffad2d Merge branch 'ubilabs--rcapp--master' 2016-04-20 13:29:54 +02:00
Axel Uhl 8e7d44f67f Merge branch 'ubilabs--rcapp--bug-3570' into ubilabs--rcapp--develop 2016-04-20 13:11:58 +02:00
Axel Uhl 3d52c3628e upgraded versions of Android apps
Change-Id: I393f5a77eff683c56e8e2dd1ff31f26629fb883a
2016-04-19 19:38:46 +02:00
Axel Uhl 075e329065 Merge branch 'ubilabs--rcapp--master' 2016-04-19 15:16:42 +02:00
Axel Uhl 671b266e2d Merge branch 'ubilabs--rcapp--master' 2016-04-19 14:18:14 +02:00
Axel Uhl 4bf415e864 Merge remote-tracking branch 'server/fix_autoupdate_for_playstore' into ubilabs--rcapp--develop 2016-04-19 13:19:32 +02:00
Axel Uhl dff84353ac removed preference for ws: over wss: in Igtimi connector because Jetty 9.2.2 can handle wss: just fine
Change-Id: I5fb059daf27278a16fb3256d04b73a94cd7f28c8
2016-04-19 00:48:23 +02:00
Axel Uhl 37158839b5 shuffle Igtimi server list so a fail-over will eventually end up at a working server
Change-Id: Id29af12d9c57060b6a2d8463db2f3173f0762a03
2016-04-19 00:18:22 +02:00
Axel Uhl 5da5e4738c removed unused logging TAG declaration
Change-Id: I8ff27b5f627f9fc6c504bb6cd617a459a312887c
2016-04-18 23:46:00 +02:00
Axel Uhl f00e91075f use constants for exception message construction and matching
Change-Id: I3df736af045d46f1f39dbc0a36a9c0824122b6a8
2016-04-18 23:44:51 +02:00
Axel Uhl f1fedb1d0e fixed exception message text
Change-Id: I18ef82f89058202bed4806bc43e95d5fca0c1ed7
2016-04-18 23:43:10 +02:00
Axel Uhl c73462c3d0 Updated mail relaying (markdown) 2016-04-18 21:27:41 +00:00
Axel Uhl 255c4c198c Merge branch 'translation' into ubilabs--rcapp--develop 2016-04-18 21:27:17 +02:00
Axel Uhl 3d69ff2cd4 removed another redundant _en file
Change-Id: I0708a52b978bc35ce814356f4eb74287b94242f2
2016-04-18 21:22:02 +02:00
Axel Uhl 29453c91e5 removed redundant _en file
Change-Id: Iade51020e0aa71dcad50bd39c3124c3ded279760
2016-04-18 21:21:24 +02:00
Axel Uhl 358adc0865 re-introduced Unicode escapes where we had them
Change-Id: I57750746cd79c32945584bec1234923d123d3a7c
2016-04-18 21:19:49 +02:00
Axel Uhl 9ccd8a8714 removed redundant StringMessages_en.properties
Change-Id: I48fc3210c1a9eab465053068713b205ac4c33690
2016-04-18 21:11:22 +02:00
Axel Uhl aa36952e12 removed redundant TextMessages_en.properties; it duplicates TextMessages.properties and kills proper Unicode escapes
Change-Id: Ia84f86f8f6cc21899e1b7ec916e1fc684d6245fb
2016-04-18 21:06:38 +02:00
Axel Uhl 38d65f22ba Merge branch 'master' into translation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties

Change-Id: I3ff3966a8ebb007d14f37ea96fc6cdcc46a17dd5
2016-04-18 20:58:27 +02:00