Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 60dbb42d67 working towards bug 3798: implemented scoring specials, optionally limiting the number of discards in a series
Change-Id: Ifa5ec9e14791aac6bfc9648450d91e80a49039ad
2016-07-20 16:46:15 +02:00
Axel Uhl 0450b59fa0 formatting
Change-Id: I8deb0461f8d94f2cc7eac3f35712d7c2e95f0ced
2016-07-20 14:44:10 +02:00
Axel Uhl 6a807cff29 Merge branch 'raceboardmodes' 2016-07-20 14:43:58 +02:00
Axel Uhl 6f68b4921a Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandableSortableColumn.java

Change-Id: I9eee210b53c442a807d51662d80e548a5105a5c5
2016-07-20 14:28:50 +02:00
Axel Uhl f6fd637c99 suggestion regarding always setting the "in progress" to false and resetting the "busy" indicator
Change-Id: Ica225b6a44d1f70968d09bb37a76fc23956c0fea
2016-07-20 13:57:43 +02:00
Axel Uhl e595841051 fixed test error after an incorrect test "refactoring"
Change-Id: I3e88b55a4ab590ddeba0148c6e9a04aea12ad214
2016-07-20 13:48:18 +02:00
Axel Uhl 59244825e0 using leaderboard display name in e-mail invitations if available, plus the event name
Change-Id: I9f670dd1adc3b562e12e8fb27a9f1f47bb1ae1da
2016-07-20 11:45:52 +02:00
Axel Uhl c3596bb5ee Merge branch 'bug3794' into bug3794-failing-test
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RaceLogScoringReplicator.java

Change-Id: Ib5000c43c003dfc791f34306ea0fe9d208e0f3e4
2016-07-20 11:08:50 +02:00
Axel Uhl 352c007a49 a failing test case for bug3794, trying to push scores through the race log into the leaderboard's score corrections
Change-Id: I35bc58c25f032e254932b157790557c6f07d3621
2016-07-20 11:07:25 +02:00
Axel Uhl f0c75e7a13 Merge branch 'master' into bug3794 2016-07-20 09:51:36 +02:00
Axel Uhl 2d30f19415 added "Juliet" in addition to "Juliett" as possible course area name
Change-Id: Ice3d56a6f1f63718d31e389be68707d95884be59
2016-07-20 01:12:06 +02:00
Axel Uhl 1951e335d0 added "Alfa" as the international name for a course area; fixed spelling of "Foxtrot" course area (was "Foxtrott")
Change-Id: Ib492dc2338b7bcb80d0474446c0f4695ea75daed
2016-07-20 01:08:06 +02:00
Axel Uhl e84fd7ff01 removed the commented code, some formatting issues, use Util.equalsWithNull(...) 2016-07-19 23:49:49 +02:00
Axel Uhl 27ae517fca Merge branch 'master' into bug3794 2016-07-19 22:36:33 +02:00
Axel Uhl e1a4058809 Merge remote-tracking branch 'server/bug3790' 2016-07-19 17:27:39 +02:00
Axel Uhl dc5f42baa1 Merge remote-tracking branch 'server/ubilabs--tracking_app--bug-3769' 2016-07-19 17:02:05 +02:00
Axel Uhl 31e8e248ff avoid warnings
Change-Id: I8794623bed951e84a9d1405d5d3fe01234f6ea52
2016-07-19 17:01:36 +02:00
Axel Uhl 8f8a9a938d Merge branch 'master' into bug3786 2016-07-19 13:04:25 +02:00
Axel Uhl 8e2f6a7b46 added LowPointTieBreakBasedOnLastSeriesOnly
Change-Id: I7ad5d0d33e8fba35fb4d67f934af29d719f1f0b0
2016-07-18 18:25:57 +02:00
Axel Uhl 7b6376d9a7 added scoring scheme LOW_POINT_TIE_BREAK_BASED_ON_LAST_SERIES_ONLY
Change-Id: I471fb6c882406414940d39ff43f1a4b5dd598baf
2016-07-18 17:48:18 +02:00
Axel Uhl f1aa6c8d36 Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes 2016-07-18 13:02:27 +02:00
Axel Uhl 8d36f52620 Merge branch 'master' into raceboardmodes 2016-07-18 10:01:50 +02:00
Axel Uhl e08b6c1622 Merge remote-tracking branch 'server/master' 2016-07-18 10:01:32 +02:00
Axel Uhl fead633e77 Merge branch 'master' into raceboardmodes 2016-07-17 23:15:55 +02:00
Axel Uhl 9147d7cca8 create the wind simulator thread as a daemon thread to not keep VM from shutting down if requested 2016-07-17 23:15:02 +02:00
Axel Uhl 4e55229115 stop receiving triggers in RaceBoardModes when no longer necessary 2016-07-17 23:09:27 +02:00
Axel Uhl 279f03e062 Merge branch 'master' into raceboardmodes 2016-07-17 18:12:45 +02:00
Axel Uhl 559c768175 pause timer if in live mode for start analysis; addresses comment #23 of bug 3779 2016-07-17 17:48:30 +02:00
Axel Uhl 80531e5fba for winning lanes mode, fixed trigger() method which has to wait for the competitors in race before selecting them 2016-07-17 17:19:53 +02:00
Axel Uhl 1ea6443aad trying to increase the probability that the StartModeAnalysis view shows the chart and the map reasonably well 2016-07-17 14:27:36 +02:00
Axel Uhl 4a081c5776 fixed issue in SimpleRaceMetadataDTO for RUNNING race state, causing Start Analysis menu item to appear properly
Change-Id: I66221118a4e7e1c7764c55a243b49e38345cc434
2016-07-16 23:47:10 +02:00
Axel Uhl 100ea8c30f aftermath for 8387f3379d: needed to expose Raceboard sources to Home.gwt.xml module to make RaceBoardModes enum visible
Change-Id: Id305a9dd2e0dc301d708b0ec41336cedd7d3bcf5
2016-07-16 23:46:38 +02:00
Axel Uhl 8387f3379d use enum literals to produce RaceBoardMode parameter
Change-Id: I728a2f41e244707a62359c9e6c2812f7b0d8440a
2016-07-16 22:54:39 +02:00
Axel Uhl c44d6eeb14 use leaderboard for specific time point to perform competitor selection update in RaceBoardModes
Change-Id: I2963c155d9cca018f86cb6953e115280ae50dfac
2016-07-16 22:47:01 +02:00
Axel Uhl 6cdd32bbbf structured the RaceBoardModes such that only those that need CompetitorsInRace notifications will have them
Change-Id: I43a2ec87ded4133b9d2a15771e1ddbf856e62a97
2016-07-16 15:37:18 +02:00
Axel Uhl 0a666baf6e unsubscribe from competitors-for-race updates in those PlayerModes that don't need it
Change-Id: Ib0eabc33e29e0dbecfa4b86b2991d86aa8dc6a21
2016-07-16 15:33:26 +02:00
Axel Uhl dae3acd2e9 an untested attempt to re-structure the PlayerModes
Change-Id: I7685f7018899551941f2d6a7b3297687b653fc9d
2016-07-16 15:31:52 +02:00
Axel Uhl 82d9b3cf63 Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes 2016-07-16 12:57:27 +02:00
Axel Uhl 53df4fa00f formatting only
Change-Id: Ic363fefd6a62719d485faecc09f0092ffa7e7fd5
2016-07-16 12:57:15 +02:00
Axel Uhl d206558bf1 Merge remote-tracking branch 'origin/predefined-analysis' into raceboardmodes 2016-07-16 01:04:48 +02:00
Axel Uhl 939c86addf in TrackedRaceImpl.isLive(), consider delay to live in addition to grace time
Change-Id: Ib81ce0e95bf3eefc7069e99e30ea2e7876244031
2016-07-15 16:17:37 +02:00
Axel Uhl 2ecc1c0ed7 formatting and comments only
Change-Id: I5846ca73696b6d55982c06421ee4ff64515477d5
2016-07-15 12:22:18 +02:00
Axel Uhl d6ab714e25 Merge branch 'translation' 2016-07-15 11:26:06 +02:00
Axel Uhl 7b56eecb4c copied _zh_CN properties files after translation step onto the _zh properties files
Change-Id: I5f65b50d83c919b4655c188d1fec86db47c1302f
2016-07-15 11:25:35 +02:00
Axel Uhl 7ccd3b030f removed redundant _en.properties files again that were accidentally added during the translation process
Change-Id: Ibaf40ee35895ccf13b1d6338905f44e6e56ee50c
2016-07-15 11:12:00 +02:00
Axel Uhl c073f312c4 needed to also make updateLeaderboard public in LeaderboardPanel subclass
Change-Id: I7dab7f0acff64c033e65049323860f9b547df1a5
2016-07-15 10:41:32 +02:00
Axel Uhl ba350fda09 Merge branch 'ubilabs--tracking_app--bug-2688' 2016-07-15 10:40:27 +02:00
Axel Uhl 5bd5f29566 allow for start analysis driving the Timer when in live mode; timer is put into replay then, leaderboard is updated
Change-Id: I0e7cd020c696543697d3b5562ec16e31deb21b73
2016-07-15 10:37:16 +02:00
Axel Uhl a42f2cdcec Merge branch 'master' into raceboardmodes 2016-07-15 00:24:11 +02:00
Axel Uhl e4ba3e2832 fixed a few remaining executors to use only daemon threads so the VM can be shut down cleanly when needed
Change-Id: I1aaa83a01dba167df169ab0c28aa40d2c1617319
2016-07-15 00:24:00 +02:00
Axel Uhl c1f973def1 fixed a few remaining executors to use only daemon threads so the VM can be shut down cleanly when needed
Change-Id: I1aaa83a01dba167df169ab0c28aa40d2c1617319
2016-07-15 00:21:53 +02:00
Axel Uhl 0bdc11bbc2 Merge branch 'master' into raceboardmodes 2016-07-14 22:47:46 +02:00
Axel Uhl 9a5b405ded Merge remote-tracking branch 'server/bug3784'
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values/ids.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/ManagedRaceListAdapter.java

Change-Id: I9d6d7898e62e3382fed70ea98b19c7441e1f851d
2016-07-14 22:29:46 +02:00
Axel Uhl 2d1609586a clean-up of merge conflicts in Race Manager app's RaceStateService
Change-Id: I9c01cfa3930ddb48a0ca5693f22022444ad46a1d
2016-07-14 22:25:54 +02:00
Axel Uhl 7e953bb85b consolidated imports
Change-Id: I6c8e0c1fc0be72276245cce47187f6f2aa6f994b
2016-07-14 22:25:46 +02:00
Axel Uhl b9dd5f2aa2 Merge remote-tracking branch 'server/bug3727'
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java

Change-Id: I56bd30b78ffd28daa26793415351938e07af7ae9
2016-07-14 22:12:36 +02:00
Axel Uhl 6755744183 Merge remote-tracking branch 'server/bug3741' 2016-07-14 22:01:39 +02:00
Axel Uhl 37f1ff20e1 Merge branch 'ubilabs--tracking_app--bug-2688' 2016-07-14 21:58:28 +02:00
Axel Uhl 8d3df4fc17 use normal priority for data mining threads
Change-Id: Idcc2c1d4d64df766d80effe39c92b6209939de2d
2016-07-14 21:51:17 +02:00
Axel Uhl 012fcb586f use a thread factory creating daemon threads in DataMiningExecutorService
Change-Id: I2661605711b82c43f1bd2bbf8b7ec51babcf52f7
2016-07-14 21:50:26 +02:00
Axel Uhl 5f1978aaf4 Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes 2016-07-14 16:27:06 +02:00
Axel Uhl 51fbcae88d in Igtimi WebSocketConnector handle the case where client is null
Change-Id: I64f5e8cd4adaef72ac02df05784edf0c19c504f4
2016-07-14 16:24:01 +02:00
Axel Uhl 04cd1627b3 account for the possibility that the leaderboard is not yet defined
Change-Id: I4f9a634f6203061ab52fea22895964d4d2aa529f
2016-07-14 16:23:43 +02:00
Axel Uhl 79448ce4f4 when showing boats on the map, filter by current getCompetitorsToShow() as it may have changed since an asynchronous call was made
Change-Id: Ibfa144153dda911e5d5bc8425cea27c4775c789e
2016-07-14 16:22:53 +02:00
Axel Uhl af293f2f90 trigger listeners on RaceCompetitorSet properly
Change-Id: I1321e386344d13601220a1e318cf8233a026434c
2016-07-14 16:01:53 +02:00
Axel Uhl bddefaa3cb don't set null as selection when the LeaderboardPanel doesn't find a row for a competitor that was selected in the underlying selection model
Change-Id: I964a9c1189ff1e1ab0e5d131a360582f431d0603
2016-07-14 15:25:23 +02:00
Axel Uhl 5cf8f4c21c for split-fleet races, race board modes now should correctly identify the top-N competitors within the pre-selected race
Change-Id: Ie7f6f4cce683d8f7639c131bd374b02e4c0bd177
2016-07-14 14:55:13 +02:00
Axel Uhl a30acdc45f Merge branch 'master' into ubilabs--tracking_app--bug-2688 2016-07-13 21:14:19 +02:00
Axel Uhl 5c350d6f8a turned all Timer usages into daemon threads to ensure clean VM shut-down
Change-Id: I933cda5e4a9b6b5c9f7a7090e0dad9b00154bd35
2016-07-13 18:34:16 +02:00
Axel Uhl abd40620b7 german translation of the instructions for the Race Manager app
Change-Id: Ibf30a89784299d89cbf6fafbffd56828ff3feb16
2016-07-13 18:17:22 +02:00
Axel Uhl 92b6bc192d upgraded TracAPI from 3.2.0 to 3.2.1, fixing issue with hanging subscriber threads
Change-Id: Iaf84e0f0d45b9bfda67c0529934f9ecb51c2ca8b
2016-07-13 18:02:55 +02:00
Axel Uhl 8c3e2ec0a2 Merge remote-tracking branch 'server/ubilabs--tracking_app--bug-2688' into ubilabs--tracking_app--bug-2688 2016-07-13 17:57:00 +02:00
Axel Uhl ba8f731904 Merge branch 'master' into ubilabs--tracking_app--bug-2688 2016-07-13 17:56:36 +02:00
Axel Uhl ed28a559aa removed listDataProvider field from RefreshableSingleSelectionModel where it seemingly wasn't needed
Change-Id: Iab920a920d3086abf29e9a847f433432106d9e48
2016-07-13 12:59:15 +02:00
Axel Uhl 97e044cbb6 Merge branch 'master' into bug3725_2 2016-07-13 11:37:02 +02:00
Axel Uhl 35b368b7e4 fix for bug 3780 part 2
Change-Id: Ifa574e4ff70e9f73fa968f159fa6d57947d3b4da
2016-07-13 11:19:51 +02:00
Axel Uhl c7648331bd wired the RS* and Splash boat class icons in BoatClassImageResolver
Change-Id: If46cc3a7205e2893c332b4cc86fb415db7389051
2016-07-13 10:32:03 +02:00
Axel Uhl 38c459e3ff fix for bug 3780: NPE due to an issue with a null/null time range when a competitor was added to a selection for charting
Change-Id: Ie8373c829c2dd3ae5cb81aa6a870662c3e99b8c6
2016-07-13 10:19:02 +02:00
Axel Uhl cc903f0522 for raceDetailsExecutor use a thread factory that produces daemon threads
Change-Id: I8f0a69aa11f02514346e62b1bd0378ed560e764a
2016-07-13 10:16:46 +02:00
Axel Uhl ebe8191da2 Merge branch 'master' into raceboardmodes 2016-07-13 00:20:55 +02:00
Axel Uhl fe4273739c Merge remote-tracking branch 'server/master' 2016-07-13 00:15:59 +02:00
Axel Uhl e4fcb163f8 added boat class logos for RS?00, RSAero and Splash boat classes
Change-Id: Ifcf9f5a5c5f06648a1f000f31b14120597d5b100
2016-07-13 00:04:11 +02:00
Axel Uhl 4793e00027 fixed start analysis mode, extended to 30s before and after start and use wind-up mode
Change-Id: I3176e045cb484ade3498fd823d68a20b944331a4
2016-07-12 17:52:53 +02:00
Axel Uhl f02fe79472 adjusted numbers of competitors for winning lanes mode
Change-Id: I2c41e5fdd48cde5d2b326671db0938a662b65c87
2016-07-12 17:46:00 +02:00
Axel Uhl 61333e4946 rotating the map works more reliably if two redraw() calls are performed
Change-Id: Ide0696ffc32c0a2a4dae7ab537305c90d6ed683e
2016-07-12 17:02:26 +02:00
Axel Uhl 3fbd2eb03e redraw the map only if updateCoordinateSystemFromSettings() hasn't already redrawn it
Change-Id: If5fe09c1aedcb3e0c44bd3724f859e0fdae9efdf
2016-07-12 17:00:57 +02:00
Axel Uhl b3ebfcf31e consolidated imports
Change-Id: I6024f9f5abaf82812e6e2967b866cf8b9f3f6ca8
2016-07-12 09:14:31 +02:00
Axel Uhl 9118e713b2 load only the tails of the top n competitors for the winning lanes for better performance; the use may still decide to load more
Change-Id: I33d14f6fa3467e290b3d2fa9f2f1b2b9edf1d922
2016-07-11 18:37:11 +02:00
Axel Uhl ac13b99bd4 implemented a first version of the "Winning Lanes" analysis as a race board mode
Change-Id: I8c04397c7cec4fa561e1a0d5ca9677f5dc308d5c
2016-07-11 18:09:59 +02:00
Axel Uhl f7d7e98d0e Merge branch 'master' into raceboardmodes
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java

Change-Id: I66de9360466ceffa60e28705467052fa63739d79
2016-07-11 16:57:17 +02:00
Axel Uhl 74a25a91a8 fix for bug 3774: deadlock trying to close device mapping interval from the UI
Change-Id: I9a171c2f5279196dba9daa638409e13eda6b31b9
2016-07-08 15:44:19 +02:00
Axel Uhl 6c4adcc963 described the new capability of entering a time stamp for a fixed mark position in the admin release notes
Change-Id: I521c2c7c9726778ed4850668c258aae11edd3467
2016-07-08 12:51:29 +02:00
Axel Uhl b39eee43d2 Merge branch 'master' into foiling 2016-07-08 11:16:54 +02:00
Axel Uhl 6e24edfc16 Merge branch 'master' into ubilabs--tracking_app--bug-2688 2016-07-08 11:14:17 +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
Axel Uhl a85518a267 formatting only
Change-Id: I014716a2b4d5ea6c49279f43c4120b549595660a
2016-07-08 11:12:41 +02:00
Axel Uhl add635a082 Merge remote-tracking branch 'server/ubilabs--tracking_app--bug-2688' into ubilabs--tracking_app--bug-2688 2016-07-08 10:28:58 +02:00
Axel Uhl 6f7ab7ce1e Merge branch 'master' into ubilabs--tracking_app--bug-2688 2016-07-08 10:28:45 +02:00
Axel Uhl 90afb9d6f7 Merge remote-tracking branch 'server/master' 2016-07-08 10:22:00 +02:00
Axel Uhl e14a21df6f enable entering a time point with a fixed mark position
Change-Id: Iac029f294b774ef3707e5540f091b09f159d3b5a
2016-07-08 10:17:31 +02:00