Jens Rommel
6d3d8711d2
Merge branch 'master' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackYoutubeDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelectionDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/AbstractPopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopupWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubePopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubeWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/DialogBoxExt.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractMediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AudioPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2013-04-19 11:14:57 +02:00
Axel Uhl
91b86d18fa
fixing bug 1347: parallelize calculation of competitor chart data
2013-04-18 18:06:50 +02:00
Jens Rommel
bbb74c58b5
First running version of interactive video synch. Supports
...
- HTML5 video
- Youtube video
Pending:
- Interactive add Youtube video
- Interactive remove video
- Interactive audio synch
2013-04-18 17:36:09 +02:00
Jens Rommel
e62547bb4c
First running version of interactive video synch. Supports
...
- HTML5 video
- Youtube video
Pending:
- Interactive add Youtube video
- Interactive remove video
- Interactive audio synch
2013-04-18 17:34:33 +02:00
Axel Uhl
de45a6758d
fixed minor issue in how the root parameter for the RaceBoard.html links is produced in the leaderboard group / Spectator page
2013-04-17 15:37:42 +02:00
Axel Uhl
8010ce3ebc
moved ImagesBarCell to client.shared package so RegattaOverview can use it
2013-04-17 14:32:00 +02:00
Axel Uhl
dfbd669358
moved shared client UI gwt stuff from *.ui.shared.* (where we have the stuff shared between client and server) to *.ui.client.shared.*
2013-04-17 12:27:34 +02:00
Axel Uhl
f4a622d011
Merge branch 'master' into winregatta_resultimport
2013-04-16 23:05:51 +02:00
Axel Uhl
e6481496b1
added TODOs for parallelization of SailingServiceImpl.getCompetitorRaceData
2013-04-16 23:04:39 +02:00
Axel Uhl
609ac0e1f9
Merge branch 'master' into winregatta_resultimport
2013-04-16 22:54:38 +02:00
Axel Uhl
a551869059
added locking performance test
2013-04-16 07:46:28 +02:00
fmittag
cdbf910502
Made also the wind chart and the competitor charts in the raceboard "on/off switchable" via url parameters
2013-04-15 13:57:27 +02:00
fmittag
a70732aed3
fix for bug 1343: Enable switching on/off components in the RaceBoard entry point by URL parameter
...
+ some refactoring of the parameter reading in the RaceBoardEntryPoint
2013-04-15 13:18:01 +02:00
Axel Uhl
524b67dacd
Merge branch 'master' into winregatta_resultimport; needed to fix various line end style conflicts
...
Conflicts:
java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ResultImportUrlsManagementPanel.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.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/CompetitorRowImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/DefaultCompetitorEntryImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/RegattaScoreCorrectionsImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/impl/ScoreCorrectionForRaceImpl.java
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/pom.xml
2013-04-12 16:09:54 +02:00
fmittag
a815a91f37
upgraded gwt version from 2.5.0 to 2.5.1
2013-04-12 11:44:45 +02:00
Armin Zamani
a549394c60
Changed Course area comparison, (equals instead of ==)
2013-04-12 09:48:22 +08:00
Axel Uhl
3251d2dfd7
computing RaceInfoDTO based on domain model and not based on DTOs constructed from domain model;
...
this should also solve bug 1342 because this is no longer called for constructing a StrippedLeaderboardDTO
2013-04-11 19:00:34 +02:00
Axel Uhl
1a5530d20f
fixed typo in log message
2013-04-11 18:20:07 +02:00
Axel Uhl
1753127edc
regarding bug 1341, trying a patch that avoids the NPE due to missing RaceLog; needs to be reviewed by the Berlin team
2013-04-11 17:02:25 +02:00
Axel Uhl
34bab83ba2
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.serialization.test/build.properties
2013-04-11 14:13:34 +02:00
Axel Uhl
91af0a81ec
fixed serialization.test mockito dependencies; added logging for start of tracking
2013-04-11 13:57:15 +02:00
Armin Zamani
cc61f70b07
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/SettableScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/JsonExportTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonGetServlet.java
2013-04-11 13:39:51 +08:00
Armin Zamani
b501d1ca6f
Merge branch 'racecommittee_integrated' of
...
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Jens Rommel
6eea85c5a3
Merge remote-tracking branch 'external/master' into jens--media-synch
...
umn from SettableScoreCorrection to ScoreCorrection
2013-04-10 10:08:08 +02:00
fmittag
8a8657fd9b
Merge remote-tracking branch 'origin/master' into winregatta_resultimport
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.freg.resultimport.test/META-INF/MANIFEST.MF
java/com.sap.sailing.freg.resultimport.test/src/com/sap/sailing/freg/resultimport/test/SimpleHtmlParsingTest.java
java/com.sap.sailing.freg.resultimport/META-INF/MANIFEST.MF
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/CompetitorEntryImpl.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/CompetitorRowImpl.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/FregHtmlParser.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/RegattaScoreCorrectionsImpl.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionForCompetitorInRaceImpl.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionForRaceImpl.java
java/com.sap.sailing.freg.resultimport/src/com/sap/sailing/freg/resultimport/impl/ScoreCorrectionProviderImpl.java
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ResultImportUrlsManagementPanel.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/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorEntry.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/CompetitorRow.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/RegattaResults.java
java/com.sap.sailing.resultimport/src/com/sap/sailing/resultimport/UrlResultProvider.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
java/pom.xml
2013-04-08 14:20:52 +02:00
Armin Zamani
7850c2a218
RegattaOverview: The last flag is shown correctly now and better status
...
text is shown
2013-04-07 19:56:58 +02:00
Armin Zamani
3838e459bd
renamed the racelog analyzer package
2013-04-04 23:40:53 +02:00
Armin Zamani
c6cefb328b
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
2013-04-04 17:06:06 +02:00
fmittag
678e7d18cb
Merge remote-tracking branch 'origin/master' into leaderboardCache
2013-04-04 10:37:48 +02:00
Armin Zamani
931d2fe98e
Implemented the throughput of the TracTrac user name and password from
...
the AdminConsole to the CourseDesignChangeHandler in the TracTrac
adapter
2013-04-03 20:33:26 +02:00
Armin Zamani
8b7f8d15c4
added TracTrac username and password to TracTracEventManagementPanel in
...
the Admin Console
2013-04-03 19:29:32 +02:00
Armin Zamani
83231fe993
Added a course area column for the Leaderboard config panel to show the
...
name
2013-04-03 17:48:20 +02:00
Axel Uhl
1eb6b44a2b
fixed boat icons used when no leg type is known
2013-04-03 13:51:12 +02:00
fmittag
21610c3311
add a description column for the swiss timing races in the management panel
2013-04-03 11:04:28 +02:00
Armin Zamani
05651baffb
Merge branch 'master' into racecommittee_integrated
2013-04-02 13:41:18 +02:00
fmittag
9f82edfb7b
Merge remote-tracking branch 'origin/master' into leaderboardCache
2013-04-02 09:16:56 +02:00
Axel Uhl
13e6ae594d
ignore competitor/race combinations during official result import where no official score is provided for that competitor/race;
...
this at least provides a way to import results for split fleet races easily by selecting all of a column with one split fleet
selected, then selecting the other split fleet race and again selecting all
2013-04-01 23:43:03 +02:00
fmittag
349af00b1f
Merge remote-tracking branch 'origin/master'
2013-04-01 17:43:04 +02:00
fmittag
0ee030bca9
fix for bug 1322: In live mode, wind chart fetches data "from the future" and doesn't update accordingly anymore
2013-04-01 17:42:54 +02:00
Armin Zamani
8311db5637
Merge branch 'master' into racecommittee_integrated
2013-04-01 15:44:58 +02:00
Armin Zamani
19d9080b97
removed unused code
2013-04-01 15:20:37 +02:00
Axel Uhl
eebbf08023
working towards a fix for bug 1323 by storing a flag about explicit delay updates in Timer rather than the view components
2013-04-01 14:56:06 +02:00
Armin Zamani
35a5b72d41
Moved the timers and the event, venue and time labels to the panel,
...
implemented sorting for the columns of the regatta overview by clicking
on a column's header
2013-04-01 14:53:55 +02:00
fmittag
cf999d3f64
added a boatClass column for the list of swiss timing races for easier identification of the right race
2013-04-01 11:45:28 +02:00
Armin Zamani
ac1acc6d18
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
2013-04-01 01:01:12 +02:00
Armin Zamani
2829d8dc79
changed the folder name of flags racecommmittee (hoped to solve the
...
nocache.js problem), restructured the RegattaOverview page with a
master-detail-principle to display the course design of a selected race
2013-04-01 00:26:06 +02:00
fmittag
70442e58dd
Merge remote-tracking branch 'origin/master'
2013-03-31 14:08:17 +02:00
fmittag
27113eb711
advanced the calculation of "isLiveModePossible" for a race in the racetimepanel (reason:
...
in the swisstiming connector we don't get a startOfTracking event, but a startOfRace)
2013-03-31 14:08:06 +02:00
Jens Rommel
cd0a20c724
Added a new check for reachability of tracks --> listen for error event, then set UNREACHABLE, else leave UNDEFINED
...
Implemented a more relaxed way which tracks to offer in race board --> UNDEFINEDs are also offered.
2013-03-31 12:53:31 +02:00
Axel Uhl
f5a59eca01
Merge branch 'seleniumleaderboardtests'
2013-03-30 23:16:11 +01:00