Commit Graph
9481 Commits
Author SHA1 Message Date
Axel Uhl 059df3b17f added columns to competitor table for handicap data 2015-05-14 21:09:54 +02:00
Axel Uhl 39c22eee86 fixed Double box creation in DataEntryDialog to also accept null/Double instead of double only 2015-05-14 20:30:05 +02:00
Axel Uhl ba1fceecaa added fields to capture time-on-time / time-on-distance on competitor and pass values through all constructors and operations and JSON serialization 2015-05-14 20:10:20 +02:00
Axel Uhl 744ea21d59 added ranking metric to the regatta creation dialog and map it through to the createRegatta call 2015-05-13 11:47:11 +02:00
Axel Uhl 7fd8e25083 fixed compile error (missing stringMessages) 2015-05-13 01:12:19 +02:00
Axel Uhl 1796bce690 use formatter for RankingMetric type name in RegattaListComposite column 2015-05-13 01:11:31 +02:00
Axel Uhl d1ad77ea1a fixed display of regatta detail panel by fixing the number of rows 2015-05-13 01:09:06 +02:00
Axel Uhl 19d570e49a added formatter for ranking metrics and use it in regatta details panel 2015-05-13 00:56:34 +02:00
Axel Uhl 869967f5b6 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.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/TrackedLegImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java

The merge conflict was largely caused by the introduction of target time estimation which conflicted with a few
new methods introduced on branch bug1018
2015-05-13 00:21:21 +02:00
Axel Uhl 7542348d17 avoided the same locking issue previously fixed for revokeEvent now for closeOpenEndedDeviceMapping 2015-05-13 00:02:57 +02:00
Axel Uhl 06dfd7d56f fixed a potential locking issue and avoided type cast problem 2015-05-12 23:52:32 +02:00
Axel Uhl e4e5b48b39 Merge branch 'master' into bug2686 2015-05-12 23:33:49 +02:00
Axel Uhl 7874d8a3e3 added 140x140px comment in BoatClassImageResolver 2015-05-12 23:30:20 +02:00
Axel Uhl 01e7fae911 fixed PIRAT.png image size (140x140 is the default size for boat class images) 2015-05-12 23:29:18 +02:00
Axel Uhl a35a5909a2 added boat class PIRAT to BoatClassMasterData, also adding image, solving bug 2850 2015-05-12 23:21:06 +02:00
Axel Uhl acb3b69878 added column to RegattaListComposite showing RankingMetric; moved a separate RankingMetrics enum to common to keep gwt.ui Java8-free 2015-05-12 22:04:45 +02:00
Axel Uhl c576fafc98 fixing DynamicTrackedRaceImpl.recordWind interval check; avoid overflow in case endOfTracking equals end of time 2015-05-12 10:39:16 +02:00
Axel Uhl 3c0555eb0f added persistence support for Regatta.getRankingMetric() and pulled the constructor parameter through many more constructor layers 2015-05-12 09:49:38 +02:00
Axel Uhl ada309e959 extracted interfaces for RankingInfo and CompetitorRankingInfo to prepare lazy implementation for OneDesignRankingMetric 2015-05-11 06:58:10 +02:00
Jan Broß aa042b7fc8 Allow to close open ended device mappings and to revoce events on regattalog 2015-05-10 21:03:53 +02:00
Axel Uhl ece7378c4f Merge branch 'master' into bug1018 2015-05-07 09:26:04 +02:00
Axel Uhl d4012e2d44 added an optional sample URL for the result providers 2015-05-06 15:47:42 +02:00
Peter Siegmund 125ff95d12 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-06 08:57:26 +02:00
Axel Uhl 85e7b143e4 Merge branch 'master' into bug1018 2015-05-05 22:58:13 +02:00
Axel Uhl 173d76f3e5 Merge remote-tracking branch 'server/master' 2015-05-05 22:51:31 +02:00
Axel Uhl ec7e4f848e improved release notes 2015-05-05 22:49:40 +02:00
Christopher Ronnewinkel (D036654) ce852fc363 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-05-05 15:21:37 +02:00
Christopher Ronnewinkel (D036654) 39538bf219 fix getCenter() in wind-grid-canvas along date line; 2015-05-05 15:16:56 +02:00
Axel Uhl 181e5ee5b9 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-04 23:14:52 +02:00
Jan Broß 1c708bc16a Fixes 2797 (i18n missing for DeviceConfigurationDetailComposite) 2015-05-04 17:20:48 +02:00
Axel Uhl 1625c7eb82 Merge branch 'master' into bug1018 2015-05-04 11:37:11 +02:00
Papick Garcia Taboada 57f9129cbd proposed fix for bug2805 applied to fakeseries 2015-05-01 23:17:00 +02:00
Axel Uhl 48955bf318 removed autoRefreshTimer field from EventRegattaActivity 2015-05-01 23:06:33 +02:00
Axel Uhl cd19b87535 proposed fix for bug2805 2015-05-01 22:54:05 +02:00
Axel Uhl c86f1b8f1b more code formatting 2015-05-01 22:43:36 +02:00
Axel Uhl 696b240996 whitespace / formatting changes only 2015-05-01 22:06:59 +02:00
Axel Uhl a3d2fe771d Merge branch 'master' into bug1018 2015-05-01 13:33:13 +02:00
Christopher Ronnewinkel (D036654) 109f948388 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-05-01 10:02:27 +02:00
Christopher Ronnewinkel (D036654) 61b93257aa update simulator-notes "what's new"; 2015-05-01 10:00:26 +02:00
Axel Uhl 20481e6fbe Merge branch 'master' into bug1018 2015-04-30 14:10:04 +02:00
Axel Uhl eaf7bed53f Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-04-30 14:08:03 +02:00
Lennart Hensler 51c48b73d6 Fixed the entry point definitions. 2015-04-30 13:50:32 +02:00
Lennart Hensler 5624af32fe Merge remote-tracking branch 'origin/master' into dataMining 2015-04-30 13:39:46 +02:00
Axel Uhl 1cf3fe2113 Merge branch 'design2015' 2015-04-30 13:31:13 +02:00
Lennart Hensler 216ca225b1 Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/SmartphoneApplicationClientFactory.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/TabletAndDesktopApplicationClientFactory.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2015-04-30 13:28:48 +02:00
Lennart Hensler dd4d2c95ec Reduced the amount of available data updates 2015-04-30 13:24:43 +02:00
Papick Garcia Taboada 5f201a5ef7 Merge branch 'design2015' of ssh://sapsailing.com/home/trac/git into design2015
# By Christopher Ronnewinkel (D036654) (42) and others
# Via Christopher Ronnewinkel (D036654) (20) and others
* 'design2015' of ssh://sapsailing.com/home/trac/git: (101 commits)
  fixing bug 2789 (device configuration caption panel e-mail uneditable)
  adjusted message texts for "uploaded file" instead of "uploaded image" only
  fixed re-opened bug 1963 comment #23 by showing the flag image, not the competitor image, in the nationality/sail number column in leaderboard if present
  fixed rendering of competitor image and flag image in admin console competitor table wrapper; see bug 1963 comment #23
  fixing bug 2780 by adding flag URI change handling to listener interface and CompetitorImpl setter implementation; leaderboard cache handling updated
  Fixed Leaderboard positioning for lower resolutions
  Fixed aligment of event overview year title
  Added design2015 messages to StringMessages_cn.properties
  added missing dashboard StringMessageProperties to cn file and removed not used ones
  handle sparse-simulation-data-exception; further improvement for finish-phase of opportunist-360;
  consolidated imports
  replaced remove icon by text to make button porpose clearer
  bug1963: also offer image upload for flag image; fixed swapping problem of competitor image and flag image
  Fixed bug2762
  New polars maneuver api uses ManeuverType rather than LegType
  check for zero-speed due to missing wind or polar data; extend get-even-timed-path for the case of two cornerpoints per step; scale turning step of finish-phase 1-turner to layline; fix plausibility check;
  fix finish-phase of opportunist-360 to avoid steep-angle-steps;
  Added chinese translation
  support start-line initialization in tree-grow-360; fix orientation in initial steps of opportunist-360;
  Fixed errors after merge
  ...
2015-04-30 13:19:01 +02:00
Papick Garcia Taboada f020b70934 Fixed facebook url 2015-04-30 13:18:39 +02:00
Lennart Hensler 510cdf5a18 Fixed an NPE caused by statistic changes 2015-04-30 13:14:34 +02:00
Axel Uhl f70326abae re-added extend-property + set-property for locale settings after checking back with OIO 2015-04-30 13:12:35 +02:00