Commit Graph
1215 Commits
Author SHA1 Message Date
D049941 9577657f9e Isssue with windStore fixed which was introduced during the creation of
the test support bundle.
2014-02-11 10:13:36 +01:00
D049941 ea47512811 Merge branch 'master' into riccardo-selenium
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
	java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.selenium.test/com.sap.sailing.selenium.test (No
Proxy, GWT Codesvr).launch
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/AdminConsolePage.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/FlexibleLeaderboardCreationDialog.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/LeaderboardConfigurationPanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/TracTracEventManagementPanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/gwt/widgets/CellTable.java
	java/org.openqa.selenium.osgi/build.properties
	java/org.openqa.selenium.osgi/selenium-java-2.39.0.jar
2014-02-11 09:39:27 +01:00
Fredrik Teschke 5c714e5a31 restructured race log tracking: moved to racelogtrackingadapter bundles, renamed packages, moved some interfaces 2014-02-10 16:42:36 +01:00
Frederik Petersen 1da11a140a Merge branch 'master' into masterdataimport-bug1765 2014-02-10 13:45:39 +01:00
Frederik Petersen dd7df6bdef Moved DummyTrackedRace
to avoid package-bundle-name problem
2014-02-10 12:17:55 +01:00
Fredrik Teschke 0e8d95f887 Merge branch 'racelog-tracked-race' into gpsfixstore-independent-of-race
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.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
2014-02-10 09:25:52 +01:00
Fredrik Teschke 14645e968d Merge branch 'devicetype-identifier-json-serialization' into racelog-tracked-race 2014-02-10 04:39:21 +01:00
Fredrik Teschke b11ef1f439 load and store fixes through the RacingEventService 2014-02-09 18:47:12 +01:00
Frederik Petersen 89385d802f Moved TopLevelMasterData to domain package
removed unused master data json facilities
2014-02-09 16:08:59 +01:00
Fredrik Teschke 35c8ba7c1a added loading and storing of GPSFixes/tracks to persistence bundle 2014-02-09 15:42:31 +01:00
Frederik Petersen ea5dae85a2 Fixed race log import in master data import
one test still fails due to competitor resolving
2014-02-08 17:44:17 +01:00
Frederik Petersen 627df08d9e Changed master data import to use java.io serialization
scorecorrections don't seem to work yet
2014-02-08 13:58:04 +01:00
Axel Uhl 88b7b90971 added comment on why it's now 8 tolerated process decreases in the TracTrac connector; update Proxy/8889 launch config 2014-02-07 16:42:27 +01:00
Frederik Petersen 12c6451c8b Started changing master data export to use java binary object serializ. 2014-02-07 16:31:52 +01:00
Lennart Hensler 33ce9f5ec0 Extracted a DataMiningService from the SailingService 2014-02-05 17:46:06 +01:00
Lennart Hensler 56adffdb49 Extracted the domain independent parts of datamining.shared 2014-02-05 16:12:33 +01:00
fmittag 48b9e4d061 Merge remote-tracking branch 'origin/master' 2014-02-04 16:17:36 +01:00
fmittag d10e60d938 added simple racelog viewer in the admin console (LeaderboardConfigPanel) 2014-02-04 16:17:08 +01:00
Simon Pamies fedd6fb18c Renamed LineLengthAndAdvantage to LineDetails to make the purpose clear 2014-02-04 10:08:47 +01:00
Axel Uhl 2eb97b49cf moved line geometry to LineLengthAndAdvantage[Impl] to keep TrackedRace clear of too much line handling detail 2014-02-04 02:16:30 +01:00
Simon Pamies 36040ca024 Made getStarboardMarkOfStartlinePosition public to be able to use it.
Also introduced getStarboardMarkOfStartline to be able to get the
detected starboard mark of the start line.
2014-02-03 13:19:32 +01:00
Fredrik Teschke b48bae009d Merge branch 'master' into devicetype-identifier 2014-02-02 09:48:06 +01:00
Fredrik Teschke 2e1f43236c refactoring of the OSGI based service type finder
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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingTrackingLogEventData.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-02-02 09:21:44 +01:00
Frederik Petersen 1116bb9440 Added overwrite info for master data import
The success dialog of the master data import now includes information
about overwritten regattas, so he/she knows which races need to be
retracked.
2014-01-29 14:21:57 +01:00
Fredrik Teschke eaf266e228 changed how deviceTypeServiceFinder is set (Axel's changes)
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
2014-01-28 22:06:46 +01:00
Fredrik Teschke ed9d3fef8c deleted unused exception and used other runtime exception to alert when no deviceMapper found 2014-01-28 21:06:00 +01:00
Fredrik Teschke 0879ca7600 added DeviceTypeIdentifier and related files from cmd-android-tracking branch 2014-01-28 18:12:21 +01:00
Axel Uhl f0bd78abd6 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2014-01-27 17:21:33 +01:00
Axel Uhl 4f733b9b9d Merge remote-tracking branch 'server/master' 2014-01-25 20:27:48 +01:00
Axel Uhl b46f65469a removing an old default regatta for which a new one has been created fixes bug 1725 2014-01-25 00:45:52 +01:00
Axel Uhl 4bb12ebc26 formatting only 2014-01-25 00:18:51 +01:00
Axel Uhl a1833d51e9 re-formatted comment 2014-01-25 00:03:29 +01:00
Axel Uhl be11e19ef8 fixing bug 1725 by introducing locking for raceTrackersByID that still allows for maximum concurrency 2014-01-24 22:41:37 +01:00
Simon Pamies 38dcb578d8 Extended comment to clarify that method can return null 2014-01-24 13:47:01 +01:00
Simon Pamies 9fbe539615 Added xmlexport to startup 2014-01-24 12:30:57 +01:00
Frederik Petersen 2246814e79 Fixed possible conc. mod. error in master data override 2014-01-24 11:52:27 +01:00
Frederik Petersen b6cdeae717 Merge branch 'master' into masterdataimport-bug1708 2014-01-24 10:31:20 +01:00
Axel Uhl c75c24535d Merge remote-tracking branch 'server/master' into racecommittee_app 2014-01-24 09:04:39 +01:00
Simon Pamies fb31e6fda5 Removed GetStartAdvantage 2014-01-23 23:14:16 +01:00
Frederik Petersen d89b19e1d3 Merge branch 'master' into masterdataimport-bug1708 2014-01-23 16:32:59 +01:00
Frederik Petersen ed6d224a1c Carried points, score corrections, suppressed competitors
are all imported even if no corresponding race is loaded on
the exporting side.

also fixed competitor id serialization
2014-01-23 16:10:00 +01:00
Axel Uhl 394c02b3a4 Merge branch 'master' into racecommittee_app 2014-01-23 12:45:43 +01:00
Lennart Hensler 06ecf6aae7 Cleaned the signature of two methods of TrackedRace 2014-01-22 18:24:25 +01:00
Simon Pamies 6689927305 Added new method getDistanceFromStarboardSideOfStartLine that computes
result based on given timepoint - this is useful if you want to compute
the distance before the start of the race
2014-01-22 16:45:30 +01:00
Frederik Petersen 971983d0e1 Suppressed competitors will not be imported if they are resolved to null
this fixes the null pointer in bug 1705
note that the supressed competitors are not exported, if the race is not
tracked on the exporting side. Just like the score corrections.
2014-01-22 13:35:28 +01:00
Frederik Petersen 0c26f164a9 Fixed override behavior for master data import
concerning bug 1708

tracked races are now relinked for flexible leaderboards
they are removed for regatta leaderboards
2014-01-22 10:53:30 +01:00
Axel Uhl 37b609d25a Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	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/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/TvView.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2014-01-21 22:51:44 +01:00
Axel Uhl b200cdc51d Merge remote-tracking branch 'server/master' 2014-01-21 20:25:12 +01:00
Axel Uhl 93e57ce471 follow-up for bug 1707: don't update regatta nor leaderboard in DB when race was removed; it only "releases" the connection
but keeps the race identifier attached to the column
2014-01-21 17:31:40 +01:00
Simon Pamies 335b2d0a06 Important change: From now on score corrections coming from the race committee always are persisted even when tracking provider has delivered correct results. 2014-01-21 16:48:51 +01:00