Commit Graph
1393 Commits
Author SHA1 Message Date
Axel Uhl 6f1979b756 Merge branch 'master' into newhome
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch (added Search.html entry point to SailingGWT.launch)
2014-06-05 09:04:08 +02:00
Axel Uhl 7111ff7921 Merge branch 'master' into tracapi 2014-06-05 00:42:27 +02:00
Axel Uhl 94637ec512 Merge branch 'master' into newhome 2014-06-05 00:42:13 +02:00
Axel Uhl 6f99f073bf Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
2014-06-05 00:36:12 +02:00
Axel Uhl b4e257f666 added a demo entry point Search.html to test and demonstrate the search features 2014-06-05 00:03:55 +02:00
Axel Uhl feb287bde1 started to add LeaderboardBase to make the LeaderboardSearchResult consistent with EventBase, LeaderboardGroupBase and then LeaderboardBase 2014-06-04 18:27:13 +02:00
Axel Uhl cef959a91f adding leaderboard group context to search results 2014-06-04 17:22:06 +02:00
fmittag a9bcaa5146 Merge remote-tracking branch 'origin/master' into newhome
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/EventDTO.java
	java/com.sap.sse.gwt/META-INF/MANIFEST.MF
2014-06-04 16:19:04 +02:00
Axel Uhl 7d89f168da added Event to LeaderboardSearchResult 2014-06-04 16:11:07 +02:00
Benjamin Ebling d46376eb40 Merge branch 'master' into usermanagement
Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	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/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-06-04 15:49:02 +02:00
Benjamin Ebling e2fc77b46c Added accounts and settings 2014-06-04 15:40:47 +02:00
Axel Uhl c204bece9c search service now works based on leaderboards, not regattas 2014-06-04 12:07:31 +02:00
Axel Uhl a01aac197c started with a search test setup; a first test fails because of duplicate regattas... strange... 2014-06-03 16:45:35 +02:00
Axel Uhl afc5945847 added start time based ranking for search results 2014-06-03 11:58:24 +02:00
Axel Uhl 7fb0dfcf99 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.java
	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/AbstractReceiverWithQueue.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	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/MarkPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceStartedAndFinishedReceiver.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
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-06-03 01:47:08 +02:00
Axel Uhl e5d99b38a9 started implementing a RegattaByKeywordSearchService 2014-06-03 00:46:55 +02:00
Axel Uhl 53a0b36e8e consolidated all Util stuff in com.sap.sse.common.Util now 2014-06-03 00:01:14 +02:00
Axel Uhl cb9354b1a0 moved Util from com.sap.sailing.common to com.sap.sse.common 2014-06-02 23:57:16 +02:00
Axel Uhl 5b038779db pulled up all but the Named-related methods from com.sap.sailing.common.Util to com.sap.sse.common.Util; further prepared for Regatta search on RacingEventService 2014-06-02 23:51:49 +02:00
Axel Uhl 0c47e86304 moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common 2014-06-02 23:31:26 +02:00
Axel Uhl c4cea6660d introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util 2014-06-02 23:17:49 +02:00
Axel Uhl f65533cef2 fixed compile errors regarding LeaderboardGroupBase JSON serialization; added baseURL to EventDTO 2014-06-02 16:41:00 +02:00
Axel Uhl 6ecc711ea6 stripped leaderboard group (ID, name, description) is now JSON-serialized with Event 2014-06-02 15:32:24 +02:00
Axel Uhl cf736e945f Merge branch 'master' into newhome
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
2014-05-31 02:10:44 +02:00
Axel Uhl 3267116a38 Merge branch 'master' into tracapi 2014-05-31 02:08:51 +02:00
Axel Uhl 71d97063ec made constant for polling interval for remote servers a constant field 2014-05-31 01:50:12 +02:00
Axel Uhl a941269bd6 show image URLs and video URLs in events table; fixing validation for course area names, image URLs and video URLs in event dialog 2014-05-31 00:33:52 +02:00
Axel Uhl e32e69accd consider event's image URLs and video URLs during master data import 2014-05-30 17:09:09 +02:00
Axel Uhl 152f305ea6 added image and video URLs to EventDTO and exchange them between client and server 2014-05-30 17:05:39 +02:00
Axel Uhl f37e431368 Merge branch 'master' into bug1970 2014-05-30 14:36:27 +02:00
Axel Uhl 035731d2a2 Merge branch 'master' into newhome
Conflicts:
	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, winddbTest).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/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
2014-05-30 14:35:48 +02:00
Axel Uhl 772fc78172 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackedRacesExportTest.java
2014-05-30 14:30:46 +02:00
Axel Uhl 0d0ae3f060 added deckman adapter bundle to launch configs; implemented a GPSFixImporter based on the Deckman CSV export format 2014-05-30 10:59:39 +02:00
Axel Uhl b81acbe086 more of the leaderboard group assignment table stuff working; back-end service in place 2014-05-29 20:39:29 +02:00
Axel Uhl 588e19f227 added some very bare-bones test support for Event-->LeaderboardGroup link establishing during master data import 2014-05-29 13:43:29 +02:00
Axel Uhl c55f723065 added support for establishing the Event-->LeaderboardGroup links during master data import 2014-05-29 13:37:26 +02:00
Axel Uhl 29eb11916c added TODO for applying diffutils to provide a minimal patch for updating the LeaderboardGroup list of an Event 2014-05-29 00:35:20 +02:00
Axel Uhl 807f5c0c21 removed duplicate replication of UpdateEvent operation; use LeaderboardGroup instead of regatta name for event update 2014-05-29 00:30:24 +02:00
Axel Uhl 73281a291e trigger persistence from within AddLeaderboardGroupToEvent and RemoveLeaderboardGroupFromEvent operations; support multi-LeaderboardGroup operations 2014-05-28 21:56:24 +02:00
Axel Uhl c593a32f52 handled persistence for the links from event to leaderboard group, adding a collection for the links 2014-05-28 21:36:46 +02:00
Axel Uhl db05658286 use UUID as id for LeaderboardGroup which now implements WithID; preparing for the use of this UUID by Event in persistence to reference LeaderboardGroups 2014-05-28 18:02:41 +02:00
Axel Uhl 306ecbbe3e enable and test replication of the modification operations for Event.leaderboardGroups 2014-05-28 16:32:32 +02:00
Benjamin Ebling e520ed7249 Merge branch 'master' into usermanagement 2014-05-28 11:55:13 +02:00
Axel Uhl 9102c0fb92 added getter, adder and remover for leaderboard group collection on Event[Impl] 2014-05-28 11:45:41 +02:00
Benjamin Ebling 4e7586b375 Added role management and login panel 2014-05-27 17:04:45 +02:00
Axel Uhl 7a7c6e1fa4 Merge branch 'master' into tracapi 2014-05-26 13:24:00 +02:00
Axel Uhl 33081b3cd3 Merge branch 'master' into newhome
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
2014-05-26 13:21:49 +02:00
Simon Pamies c66621a56f Added marinapi to launch 2014-05-26 09:35:22 +02:00
Simon Pamies 008fee66cb Renamed launch config and included cache property 2014-05-26 09:34:18 +02:00
Axel Uhl 3a2fa3af83 added sailing.gwt and sailing.gwt.home to launch configurations 2014-05-21 15:00:11 +02:00