Commit Graph
685 Commits
Author SHA1 Message Date
Steffen Schaefer d162abc47a Added dependency to make LocaleInjectionFilter visible in
com.sap.sailing.dashboards.gwt
2017-12-12 09:42:42 +01:00
Frank Mittag ab250e131b Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/preliveraceloop/leaderboard/PreLiveRaceLeaderBoardWithImagePresenterImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/statistics/AbstractStatisticsBoxPresenter.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
2017-12-08 11:52:11 +01:00
Kai Boernert 25af934a66 Merge branch 'bug4210' 2017-12-06 11:22:46 +01:00
Frank Mittag d45de24610 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Steffen Schaefer 1cd933bb7e Bug 4374: Activated fragment merging for the GWT compiler in Maven and
Eclipse
2017-11-22 11:23:38 +01:00
Benjamin Barth eaf2044e7b Merge branch 'master' into bug4210 2017-11-13 10:26:28 +01:00
Frank Mittag 9489a2dc72 some cleanup of the CompetitorDTO/BoatDTO creation methods 2017-11-08 14:38:50 +01:00
Steffen Schaefer b2dade82b4 Merge branch 'master' into bug4210 2017-11-07 15:45:20 +01:00
Benjamin Barth bde829c9f0 Merge branch 'master' into bug4312 2017-11-06 14:57:27 +01:00
Axel Uhl e8fbd1f5f6 added ExpeditionConnectorCommon module to the inherits list of the Dashboard app
Change-Id: I6aa376b2841aa5e901932dd262de55e476b4fb68
2017-10-26 14:23:13 +02:00
Steffen Schaefer f151694c8f Bug 4032: Initial implementation of a filter that transfers a user's
preferred language using a Cookie
2017-10-26 13:37:37 +02:00
Steffen Schaefer 94bfa841cb Bug 4303: Updated version of GWT bundles 2017-10-24 09:15:15 +02:00
Benjamin Barth c4661c3470 Fixed broken run configurations so they work properly on Windows again 2017-10-23 15:07:48 +02:00
Simon Pamies b36f652a44 Moved away from custom average speed computation and now being in line with calculation used by LeaderboardPanel 2017-10-20 10:15:04 +02:00
Kai Boernert e792b1fa5d deletion of bootstrap 2017-09-21 15:47:43 +02:00
Frank Mittag 4159c57e63 Introduced a 'RaceCompetitorSelectionModel' which extends 'CompetitorSelectionModel' to provde some race specific functions and also provide a way to store boat information for the managed competitors 2017-09-14 11:53:17 +02:00
Frank Mittag ae05146712 first step to use only CompetitorDTO instead of mixture of CompetitorDTO and CompetitorWithoutBoatDTO 2017-08-30 11:55:47 +02:00
Frank Mittag 68ae4f561c Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.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/base/impl/CompetitorImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
#	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/base/impl/AbstractRaceColumn.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.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/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.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.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
2017-08-28 16:12:00 +02:00
Steffen Schaefer 9f4c97a114 Bug 4199: Minor adjustment of the estimated duration overlay in case no
header is shown in the RaceMap
2017-07-27 13:31:43 +02:00
Steffen Schaefer d0601b2c4c Bug 4199: Added missing styles to fix a GWT compiler error 2017-07-20 10:28:52 +02:00
Kai Boernert 89f122c549 cleaned up variable naming 2017-07-19 13:35:41 +02:00
Steffen Schaefer 5f3c50dc27 Bug 4199: Code formatting 2017-07-17 14:35:47 +02:00
Kai Boernert 16197cbaac added target time estimation option 2017-07-11 10:49:34 +02:00
Frank Mittag 78bcf32976 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
#	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/comparators/CompetitorSailIdComparator.java
#	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
2017-06-21 13:50:36 +02:00
Steffen Schäfer e3c9305a92 Merge branch 'bug2822_boatcolors' into
bug2822_boatcolors_merged_with_eol_changes

# Conflicts:
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
2017-06-20 13:02:02 +02:00
Frank Mittag bc8a71f058 Next step of the removal of Competitor.getBoat()
As this affects also CompetitorDTO.getBoat() I introduced as an intermediate step CompetitorWithoutBoatDTO (CompetitorDTO extends CompetitorWithoutBoatDTO) for simpler refactoring.
Added also some new RaceLog and RegattaLog events for adding a competitor/boat pair
2017-06-19 21:21:31 +02:00
Axel Uhl a68014fd33 bug 4175: using leaderboard to determine "quick ranks" if available;
in the process, I've adjusted the naming of what used to be the
list of competitors ordered by windward distance traveled to simply
"from best to worst." I had changed these semantics some time ago but
never had adjusted the naming accordingly.

Change-Id: I203840842eedf050f5c2ed8a3e052e4bc4d7772d
2017-06-10 00:14:40 +02:00
Steffen Schäfer 67d310df4b Merge branch 'master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
#	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Axel Uhl 1637d64e9d only CR/LF changes due to gitconfig change
Change-Id: I40eef60b8ab376a622bf637965917f2e15e01b09
2017-04-29 09:30:13 +02:00
Steffen Schaefer 7839416608 Updated GWT to version 2.8.1 2017-04-27 14:35:37 +02:00
Steffen Schaefer 58894af21f Consistently using JavaSE-1.8 as execution environment for all UI
projects
2017-04-25 13:42:37 +02:00
Steffen Schaefer ab19b81b98 Merge branch 'master' into bug3529
Conflicts:
	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/RaceTableWrapper.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java
2017-04-06 13:19:12 +02:00
Steffen Schaefer 743269203c Merge branch 'master' into bug3529
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
2017-04-04 09:05:53 +02:00
Frank Mittag 358b733fd6 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
#	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2017-03-30 18:05:51 +02:00
Kai Boernert 2860e60ced Merge branch 'master' into bug3985 2017-03-30 10:42:44 +02:00
Steffen Schaefer 1571624849 Setting consistent ports for DevMode launch configurations to make
Selenium tests work locally without adjustments
2017-03-28 10:04:20 +02:00
Kai Boernert 49b9efed47 style warnings cleanup 2017-03-20 11:24:13 +01:00
Frank Mittag 31e8164166 Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
#	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
#	java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
#	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh_CN.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java
2017-03-08 16:03:56 -03:00
Axel Uhl adf1cf63ed upgraded TracAPI from 3.4.0 to 3.4.1, fixing issue with parallel loading
Change-Id: I762c4e0c76cf01277c32d6ca7c80d1f4c20c8c32
2017-02-20 17:32:06 +01:00
Lennart Hensler 152fa24042 Moved the general clusters from sailing.datamining to sse.datamining 2017-02-16 14:42:25 +01:00
Steffen Schaefer 7153165edd Merge branch 'master' into bug3529 2017-02-14 11:34:44 +01:00
Papick Garcia Taboada 2a6584e65a Removed entry in build.properties poiting to resources 2017-02-14 11:32:56 +01:00
Papick Garcia Taboada 382d672975 Fixed project settings for empty resources folder 2017-02-14 11:29:09 +01:00
Kai Boernert 0e23aab161 Merge branch 'master' into bug3529 2017-02-14 11:23:35 +01:00
Papick Garcia Taboada dc668df5f4 Moved GWT compile sources to the sources folder 2017-02-08 14:34:51 +01:00
Papick Garcia Taboada 56ef7a9490 Updated build script and gwt files 2017-02-02 12:32:20 +01:00
Papick Garcia Taboada d288b26892 Streamlined localization settings across gwt modules 2017-02-01 18:53:35 +01:00
Kai Boernert 3daa58a1e3 Added new way of persisting that modifies the json directly, keeping parts of non existant components
Merge branch 'bug3961' of ssh://trac@sapsailing.com/home/trac/git into bug3961

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
2017-01-26 14:52:39 +01:00
Kai Boernert 5d4a32f9ea Settings parent system changed to allow dynamic useage 2017-01-24 08:17:41 +01:00
Axel Uhl e78f81a707 removed igtimi.client.redirecturi system property; use https://www.sapsailing.com/... for a default Igtimi redirect URI;
use the client side Window.Location base URL as the redirect URI for Oauth web-based account adding;
this usually has problems with non-matching redirect URIs with the app
described on Igtimi's side, but it will help avoid accidentally adding
accounts to the archive server

Change-Id: Id2a6c34bb8846d5675d4c9e3b6bd1397cf149da0
2017-01-11 14:30:06 +01:00