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
Axel Uhl
a8f19bddd8
fixing compile errors by exporting new package from shared.android bundle
2015-05-12 23:40:20 +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
b54bdccb16
added regatta log analyzers for handicap events
2015-05-10 20:38:15 +02:00
Axel Uhl
704575bb2f
added persistence for regatta log handicap events; added regatta log handicap event implementations
2015-05-08 09:45:07 +02:00
Axel Uhl
ff4bb7e95e
added handicap methods also on IsRegattaLike implementations (delegation pattern); added RegattaLogEvents placeholders to override handicaps per regatta
2015-05-08 09:20:18 +02:00
Axel Uhl
e5b8da8e4b
removed unused RegattaLogEventImpl; added handicap methods on IsRegattaLike, with default implementations in BaseRegattaLikeImpl
2015-05-08 09:06:55 +02:00
Axel Uhl
26d178b3d9
added time-on-time and time-on-distance fields and listener pattern on Competitor/DynamicCompetitor
2015-05-07 09:56:16 +02:00
Axel Uhl
785072036e
whitespace removal only
2015-05-07 09:20:12 +02:00
Peter Siegmund
125ff95d12
Merge branch 'master' into ubilabs--tracking_app--develop
2015-05-06 08:57:26 +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
fmittag
53d24c0054
fix for broken LeagueRacingProcedure
2015-05-01 13:40:48 +02:00
Axel Uhl
c78fc9d4e8
fixing bug 2780 by adding flag URI change handling to listener interface and CompetitorImpl setter implementation; leaderboard cache handling updated
2015-04-29 23:23:39 +02:00
fmittag
8d4f723a8e
added a comment
2015-04-24 19:06:39 +02:00
fmittag
f3a434aa8b
implemented configuration for the league racing procedure
2015-04-24 10:26:35 +02:00
Axel Uhl
18997d1159
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-22 14:55:23 +02:00
fmittag
0ef68c4da6
Merge remote-tracking branch 'origin/master' into bug2483
2015-04-20 19:57:13 +02:00
fmittag
59248fcf49
added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags
2015-04-16 17:38:08 +02:00
Axel Uhl
1026bfeafb
first draft implementation for a LeagueRacingProcedure with Class Up (3min), Papa Up (2min), Papa Down (1min), Class Down
2015-04-16 13:07:08 +02:00
Bennet Brunsen
e28dec03fc
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-16 11:02:40 +02:00
Axel Uhl
094234b654
moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it
2015-04-03 16:12:21 +02:00
Axel Uhl
58bd451481
moved other Position implementations to common packages to share them with GWT and make then GWT-serializable
2015-04-02 16:42:10 +02:00
Axel Uhl
75b04d8048
Merge branch 'master' into ubilabs--tracking_app--develop
2015-03-30 22:09:02 +02:00
Axel Uhl
297f91a098
Merge branch 'master' into mark-rounding-inference
2015-03-29 17:37:34 +02:00
Axel Uhl
cd86e0b13d
fix for bug 2742: recognize gate start by not applying fallback racing procedure but only actual racing procedure specifications
2015-03-29 17:23:52 +02:00
Axel Uhl
fd0f6eadcf
fixed use of time point from fixed mark passing specification when reading from race log; minor refactoring saving a few HashMap look-ups
2015-03-27 16:28:50 +01:00
Axel Uhl
3bfe5c149a
added short info to mark passing-related race log events; formatting; refactored common parts in CandidateFinderImpl
2015-03-27 15:36:59 +01:00
Axel Uhl
e1e047bd75
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
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/WindTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.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/DynamicTrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.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/client/StringMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2015-03-26 14:51:48 +01:00
Axel Uhl
f8f3170daf
some comment changes
2015-03-23 22:48:58 +01:00
Axel Uhl
911cdeb86b
Merge branch 'master' into jbross-buoy-tender
...
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2015-03-23 20:52:00 +01:00
Axel Uhl
fe46823c24
fixing bug 2724 by introducing Set to collect marks
2015-03-23 17:39:37 +01:00
Axel Uhl
60e1499b50
changed format and raceColumn parameter name for marks listing service
2015-03-23 17:25:45 +01:00
Axel Uhl
30a62a68fb
started to work on bug2715 by adding a method on TrackedLegOfCompetitor and support method on TrackedRace to calculate distance travled specifically for gate starts
2015-03-20 11:27:03 +01:00
Jan Broß
966b17b178
PingMark Endpoint now takes a single GPSFix and should solemnly be used for pinging a mark
2015-03-20 10:14:14 +01:00
Axel Uhl
4b62fa899f
Merge branch 'master' into bug2652
...
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java
2015-03-13 22:27:27 +01:00
Axel Uhl
330a889dd4
Merge branch 'master' into ubilabs--tracking_app--develop
2015-03-04 16:46:28 +01:00
Axel Uhl
56b75890d2
first working version of competitor image upload
2015-02-27 22:01:30 +01:00
Lennart Hensler
3fa30e7f1e
Introduced the HasMarkPassingContext as data type
2015-02-26 15:21:29 +01:00
Fredrik Teschke
54739ed42f
add endpoint for pinging marks via regattalog
2015-02-14 12:53:33 +01:00
Fredrik Teschke
9c375a3ae4
Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
...
Conflicts:
.gitignore
java/com.sap.sailing.server/SailingServer (No Proxy).launch
mobile/com.sap.sailing.android.shared/.classpath
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
2015-02-13 11:16:50 +01:00
Fredrik Teschke
4cb7b535c8
Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Axel Uhl
98d5235b47
upgraded all Mongo-using bundles to 2.13.0 driver
2015-02-12 16:00:15 +01:00
Nicolas
7e3aab3a33
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
...
Conflicts:
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
2015-02-11 17:58:59 +01:00
Axel Uhl
325d308482
simplified implementation of CompetitorImpl.hasEmail()
2015-02-11 16:26:07 +01:00
Fredrik Teschke
523ad4cc3e
Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' into jbross-email-invitation
2015-02-10 03:10:29 +01:00
Fredrik Teschke
c861fcbd74
upgrade poms of shared and common bundles to 1.7 compiler level
2015-02-10 03:09:27 +01:00
Fredrik Teschke
04608c2ae7
add email to constructor of CompetitorImpl and fix bug (competitor email not loading on startup)
2015-02-10 00:49:53 +01:00
Jan Broß
7900b27805
First draft of E-Mail sending service
2015-02-05 23:12:44 +01:00