Axel Uhl
10faa84ca3
Merge branch 'master' into bug1018
2015-05-18 14:41:27 +02:00
Axel Uhl
1193fcd467
fixing bug 2847 by issuing a UUID for new GateDTO objects already in the client-side editor thanks to Lennart's fix allowing us to issue random UUIDs on the client
2015-05-18 14:40:29 +02:00
Axel Uhl
ec861bebba
fixing bug 2858 by comparing ControlPoint *and* PassingInstruction
2015-05-18 14:16:25 +02:00
Axel Uhl
8b6f420b73
fixed name for copied course
2015-05-18 13:10:22 +02:00
Axel Uhl
0923fb203d
added some null-safety to CandidateFinderImpl; see also bug 2857
2015-05-18 12:48:05 +02:00
Axel Uhl
3511a1f978
added more null-safety to TimeOnTimeAndDistanceRankingMetric
2015-05-18 12:47:47 +02:00
Axel Uhl
0262ae2657
trying to fix sporadically failing testStoreAndUpdateCompetitor test by adding a WriteConcern.SAFE to the competitor collection drop() method
2015-05-18 00:19:32 +02:00
Axel Uhl
8359e80f62
Merge branch 'master' into bug1018
2015-05-18 00:05:22 +02:00
Axel Uhl
f9b0b8a41c
some aftermath to bug 2846, factoring the race log analysis of the "from" race log out of the loop that copies it to the other race logs
2015-05-18 00:00:24 +02:00
Axel Uhl
df57dd1cb4
Merge branch 'master' into bug1018
2015-05-17 23:55:00 +02:00
Axel Uhl
e36ba93827
avoid NPE in time-on-time/time-on-distance leg comparator if no competitor is in that leg yet
2015-05-16 20:04:10 +02:00
Jan Broß
f9009fc0b3
Fixes broken build and bug 2684
2015-05-16 17:06:18 +02:00
Jan Broß
5c052fb7a7
Merge branch 'bug2684'
2015-05-16 15:13:06 +02:00
Jan Broß
309e7410b9
Fixes bug2684
2015-05-16 15:12:07 +02:00
Jan Broß
f60e4dcf26
Fixes bug 2846
2015-05-16 14:25:49 +02:00
Axel Uhl
1b15c463ec
handled a bunch of null cases for TimeOnTimeAndDistance... ranking metric; there are more, e.g., in case no boats are in a leg for which a comparator is needed
2015-05-14 23:36:39 +02:00
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
5885a03e33
Merge branch 'master' into bug1018
2015-05-13 18:52:43 +02:00
Axel Uhl
3e71dbe0a4
Merge remote-tracking branch 'server/master'
2015-05-13 18:51:30 +02:00
Axel Uhl
cb6168e7fa
use CONSTRUCTOR fields to avoid serialization problems in test fragments
2015-05-13 14:53:24 +02:00
Axel Uhl
0c72ff9619
introduced fields for RankingMetric subclass constructors to avoid class loader issues in test fragments
2015-05-13 14:49:19 +02:00
Jens Rommel
7a2c02716f
- Added filter logic to exclude media tracks not related to the scope of the current master data export.
...
- Extended tests.
2015-05-13 13:53:44 +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
a8f19bddd8
fixing compile errors by exporting new package from shared.android bundle
2015-05-12 23:40:20 +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
Frederik Petersen
b0bf4950d8
Merge branch 'master' into bug2716
2015-05-12 22:35:09 +02:00
Axel Uhl
a9f43bf2f3
fixing bug 2849 by fixing the mismatch of username vs. e-mail address parameter semantics for MailService.sendMail
2015-05-12 22:19:31 +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
Frederik Petersen
f9d72d8227
Added RESTlet for target time estimation
2015-05-12 14:45:09 +02:00
Frederik Petersen
dea7c91476
Added up&downwind tests for target time estimation
...
also fixed bug. Now intersection that is nearer is used, instead of the
one far away.
2015-05-12 13:53:18 +02:00
Axel Uhl
3b571bc17f
fixed test case; problem was that conversion from seconds to MillisecondDurationImpl was missing the factor 1000.
2015-05-12 13:38:04 +02:00
Axel Uhl
d66df2f633
fixed passing through of RankingMetricConstructor in test case
2015-05-12 13:32:57 +02:00
Frederik Petersen
80612972cd
Added test case for reaching target time estimation
2015-05-12 13:19:06 +02:00
Axel Uhl
1a9ce82928
fixed NPE in handicap tests
2015-05-12 11:15:38 +02:00
Axel Uhl
b7e4b9bcbf
Merge branch 'master' into bug1018
2015-05-12 10:49:55 +02:00
Axel Uhl
33c63530c4
Merge remote-tracking branch 'server/master'
2015-05-12 10:40:52 +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
Jan Broß
Jens Rommel
Frederik Petersen