Axel Uhl
42dedcecfd
bug 2467 #19 : passing through RacingEventService as RaceLogResolver; added as transient field to TrackedRace, restored after initial load in RacingEventServiceImpl
2015-06-20 23:57:50 +02:00
Simon Pamies
a7e3ba15a6
Fixing bug preventing JSON to be parsed
2015-06-19 13:21:24 +01:00
Axel Uhl
c76eb1f74e
Merge branch 'master' into ribdashboard
2015-06-19 02:06:30 +02:00
Axel Uhl
535654593c
Merge branch 'master' into jbross-dependent-race-start
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
2015-06-18 13:45:50 +02:00
Axel Uhl
17a13599f3
fixed unescaping of SimpleRaceLogIdentifier
2015-06-03 18:44:00 +02:00
Jan Broß
02f29d1eea
Change return type of StartTimeFinder
2015-06-03 12:13:57 +02:00
Alexander Ries
c2a11cfd3b
Solved master merge conlicts in TrackedRace and Regatta plus some of their mocks
2015-06-02 09:29:08 +02:00
Axel Uhl
f4370ecd0d
made new field RaceStateSerializer.regattaLike final
2015-05-31 23:45:44 +02:00
Axel Uhl
bc897e982d
Merge branch 'master' into jbross-dependent-race-start
2015-05-31 16:34:33 +02:00
Axel Uhl
4365699ea6
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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_cn.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-05-30 06:41:22 +02:00
fmittag
b642a882fa
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 18:30:33 +03:00
fmittag
c78b41d8bd
Merge remote-tracking branch 'origin/master'
2015-05-29 18:28:20 +03:00
fmittag
56ac918faf
fixed missing utf-8 encoding of 4 race committee app servlets
2015-05-29 18:27:38 +03:00
Axel Uhl
8c411bf6e2
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 16:51:59 +02:00
Jan Broß
acef2a0613
Rename DependentStartTimeFinder to StartTimeFinder
2015-05-29 13:11:47 +02:00
Jan Broß
636272b053
Merge remote-tracking branch 'origin/master' into jbross-dependent-race-start
2015-05-29 08:46:47 +02:00
Axel Uhl
9c5bf2c3b1
switched from "windward distance to leader" to "windward distance to competitor farthest ahead"
2015-05-28 17:10:04 +02:00
Axel Uhl
f522527d65
accelerated chart calculations by pre-calculating RankingInfo beforehand, then sharing
2015-05-28 16:12:09 +02:00
Frederik Petersen
18ec962a05
Merge both tacks in polar service
2015-05-28 14:24:32 +02:00
Axel Uhl
82757a685c
pass RankingInfo through to getLegGapToLegLeaderInOwnTime as a preparation for a performance fix
2015-05-28 10:54:39 +02:00
Axel Uhl
38d757e9ff
Merge branch 'master' into bug1018
2015-05-28 10:18:12 +02:00
Steffen Schaefer
e07c585934
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-28 09:55:11 +02:00
Alexander Ries
e1fb488635
Merge remote-tracking branch 'origin/master' into ribdashboard
2015-05-28 09:20:27 +02:00
Axel Uhl
6a20efa1d9
fixing bug 2906: wind listeners didn't get de-registered proprely when removing a race and when re-starting the wind status servlet;
...
this should solve the problem with duplicate key exceptions hammering the DB
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java
2015-05-27 17:57:20 +02:00
Axel Uhl
a6fa795f1f
enhanced Javadoc and REST API doc for target time estimation
2015-05-27 17:29:07 +02:00
Axel Uhl
c236a3d0bf
fixed initialization problem by using readResolve() on owners of race execution order caches (RegattaImpl and FlexibleLeaderboardImpl)
2015-05-27 11:06:03 +02:00
Steffen Schaefer
595ff56c49
Bug 2816: Changed more font-family declarations to use the new "Open
...
Sans" @font-face
2015-05-26 15:02:38 +02:00
Jan Broß
45563b88db
Introduce RaceLogResolver and RaceLogDependentStartTimeFinder
2015-05-22 16:00:00 +02:00
Jan Broß
74b03b597e
Introduce StartTimeFinderStatusEnum for StartTimeFinder
2015-05-19 11:41:45 +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
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
Frederik Petersen
b0bf4950d8
Merge branch 'master' into bug2716
2015-05-12 22:35:09 +02:00
Frederik Petersen
f9d72d8227
Added RESTlet for target time estimation
2015-05-12 14:45:09 +02:00
Axel Uhl
cfdac2743f
Merge branch 'master' into bug1018
2015-05-10 20:43:44 +02:00
fmittag
fdf5a1d293
fix for Bug 2827 - special chars in competitor names in 'confirm positions' dialog not supported
...
set the right response header with utf-8 content type
2015-05-09 10:49:23 +02:00
Axel Uhl
1dfc055e34
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
2015-05-08 18:27:39 +02:00
Frederik Petersen
8fece8f5ca
Merge branch 'master' into bug2659
2015-05-07 09:51:37 +02:00
Axel Uhl
ece7378c4f
Merge branch 'master' into bug1018
2015-05-07 09:26:04 +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
2420a11519
addressing bug 2770, adding displayName field to RaceGroup and its serialized JSON form
2015-05-05 21:53:51 +02:00
Axel Uhl
181e5ee5b9
Merge branch 'master' into ubilabs--tracking_app--develop
2015-05-04 23:14:52 +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
Frederik Petersen
1cb580c589
Merge branch 'master' into bug2659
2015-04-30 13:37:40 +02:00
Frederik Petersen
a3dba5041b
GPSFixes of GPSFixStore are now imported during master data import
...
should fix bug 2659
2015-04-30 13:34:38 +02:00
Bennet Brunsen
639d109e39
Revert "adding white space mess "
...
This reverts commit ec12301feee614dc356732850564b754e0bfc33a.
2015-04-30 11:54:47 +02:00
Steffen Schaefer
89fd4e4471
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/server/SailingServiceImpl.java
2015-04-29 17:00:53 +02:00
Bennet Brunsen
ff1b0c6f87
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-28 13:47:56 +02:00
Axel Uhl
0f7a9a23af
removed a few more unnecessary "throw NoWindException" cases; eliminated corresponding try/catch where possible
2015-04-28 08:39:23 +02:00
Axel Uhl
aced04e1af
added an implementation of getDurationToReachAtEqualPerformance for time-on-time/time-on-distance;
...
this is the basis needed to estimate the total windward distance and duration that one competitor needs
to reach the windward position of another competitor that position-wise (but not necessarily corrected-time-wise)
is ahead.
2015-04-28 00:34:11 +02:00
Axel Uhl
Simon Pamies
Jan Broß
Alexander Ries
fmittag
Frederik Petersen
Steffen Schaefer
Peter Siegmund
Bennet Brunsen