Commit Graph
892 Commits
Author SHA1 Message Date
Steffen Schaefer 237ae6cdd3 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RaceDetailPanel.java
2015-05-27 17:18:55 +02:00
Axel Uhl 73bce9c196 renamed "PIRAT" boat class master data to "PIRATE" 2015-05-27 09:35:19 +02:00
Papick Garcia Taboada 1e0f861344 Introduced fullscreen viewer for home, moved necessary media classes to sse 2015-05-26 17:09:52 +02:00
Papick Garcia Taboada 1504cd0bb7 Merge commit 'd21d6ae84566964e31112c9be830398006ddc934' into design2015-media
* commit 'd21d6ae84566964e31112c9be830398006ddc934': (522 commits)
  Adapted Util for Iterable realated stuff in HomeService
  use PassingInstruction.None during TracTrac control point construction
  fixing SwissTimingAdapter DomainFactoryImpl which now has to use PassingInstruction.None to produce equal ControlPoint/PassingInstruction pairs
  trying to fix bug 2860 by first obtaining the course read lock before obtaining the mark passing lock
  Adapted current version of footer styling
  Adapted current version of social footer styling
  Adapted current version of main.gss
  fixing bug 2847 by issuing a UUID for new GateDTO objects already in the client-side editor thanks to Lennart's fix allowing us to issue random UUIDs on the client
  fixing bug 2858 by comparing ControlPoint *and* PassingInstruction
  fixed name for copied course
  added some null-safety to CandidateFinderImpl; see also bug 2857
  some aftermath to bug 2846, factoring the race log analysis of the "from" race log out of the loop that copies it to the other race logs
  Fixes broken build and bug 2684
  Fixes bug2684
  Fixes bug 2846
  Adapted styling of the current design for solutions page
  Fixed search icon styling
  Implemented current desing of socialFooter
  - Added filter logic to exclude media tracks not related to the scope of the current master data export. - Extended tests.
  Fix to implement sticky footer
  ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/HomeServiceImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2015-05-20 00:08:50 +02:00
Papick Garcia Taboada 873d9c9de5 Mediapage initial implementation 2015-05-19 23:37:58 +02:00
Axel Uhl a35a5909a2 added boat class PIRAT to BoatClassMasterData, also adding image, solving bug 2850 2015-05-12 23:21:06 +02:00
Frederik Petersen dea7c91476 Added up&downwind tests for target time estimation
also fixed bug. Now intersection that is nearer is used, instead of the
one far away.
2015-05-12 13:53:18 +02:00
Frederik Petersen 708770d5af Added new target time method using polar service
see bug2716
2015-05-11 11:58:15 +02:00
Axel Uhl 181e5ee5b9 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-04 23:14:52 +02:00
Lennart Hensler 216ca225b1 Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/SmartphoneApplicationClientFactory.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/app/TabletAndDesktopApplicationClientFactory.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
2015-04-30 13:28:48 +02:00
fmittag a48ced46f5 Merge remote-tracking branch 'origin/master' into bug2483 2015-04-29 11:19:41 +02:00
Bennet Brunsen ff1b0c6f87 Merge branch 'master' into ubilabs--tracking_app--develop 2015-04-28 13:47:56 +02:00
Christopher Ronnewinkel (D036654) 47f5a4ae51 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.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/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java
2015-04-23 14:33:48 +02:00
Axel Uhl 18997d1159 Merge branch 'master' into ubilabs--tracking_app--develop 2015-04-22 14:55:23 +02:00
Lennart Hensler e3901e50fd Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataRetrieverChainDefinitionProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/FilterSelectionProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/QueryDefinitionProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/PlainFilterSelectionPresenter.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/MultiDimensionalGroupingProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RetrieverLevelFilterSelectionProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleDataRetrieverChainDefinitionProvider.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatisticProvider.java
2015-04-22 12:52:57 +02:00
fmittag 0ef68c4da6 Merge remote-tracking branch 'origin/master' into bug2483 2015-04-20 19:57:13 +02:00
fmittag eaa3320293 Merge remote-tracking branch 'origin/master' into bug1963 2015-04-20 18:32:53 +02:00
Lennart Hensler a3a25daab8 Restructured the datamining shared bundle 2015-04-18 11:07:17 +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 3be144894c introduced more settings types; introduced AbstractSettings 2015-04-15 14:14:27 +02:00
Axel Uhl 36b963638e moved Settings interface and Component micro framework to SSE 2015-04-14 17:26:33 +02:00
Axel Uhl 80a6b05af9 introduced Settings interface 2015-04-14 15:50:49 +02:00
Axel Uhl e3c0c02d0c Merge branch 'master' into bug489 2015-04-09 22:18:49 +02:00
Axel Uhl 86bfd9aeb6 Merge remote-tracking branch 'server/bug2693' 2015-04-09 22:16:51 +02:00
Axel Uhl 70db98d4d2 Merge branch 'master' into bug489
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2015-04-09 09:10:50 +02:00
Axel Uhl 2b8e57dc6f removed unused event_name constant 2015-04-08 20:09:22 +02:00
Jan Broß 3df730852f Fixes bug 2693 2015-04-08 14:24:25 +02:00
Jan Broß 6335160fdf Add event-id to checkin url of buoy-tender app 2015-04-08 10:29:45 +02:00
Axel Uhl 0ea7e2f106 basic map functionality without rotation up and running 2015-04-07 21:28:21 +02:00
Axel Uhl a23b7e2040 reverted effects of c76c2153ac, removing custom field serializer for RaceColumnInSeriesDTO again (superclass field serialization was unclear) 2015-04-04 18:35:47 +02:00
Axel Uhl 417887afa1 treated WindSourceImpl and WindSourceWithAdditionalID with a custom field serializer, allowing them to have final fields and not having a no-arg constructor 2015-04-04 01:14:25 +02:00
Axel Uhl c76c2153ac treated RaceColumnInSeriesDTO with a custom field serializer; can now have final fields and doesn't need a no-arg constructor 2015-04-04 01:07:56 +02:00
Axel Uhl e7ec7403ef introduced custom field serializers for com.sap.sse.common types in com.sap.sse.gwt;
This avoids a direct dependency of com.sap.sse.common on GWT code. The custom field serializers are
bundled in a new module "SSECommonSerializers" which is inherited by the SSESharedGWT module and hence
exposed to all modules inheriting SSESharedGWT.

Further classes in com.sap.sailing.domain.common could have final fields and no no-arg constructor.
Started with ImageSizeImpl. The corresponding custom field serializers can go to com.sap.sailing.gwt.ui
which is the GWT-dependent module using the com.sap.sailing.domain.common stuff.
2015-04-04 01:00:02 +02:00
Axel Uhl 9686605f2c added CustomFieldSerializer for CompactPosition in CompactWindImpl 2015-04-03 16:29:39 +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 6972ac9171 replaced PositionDTO by Position and DegreePosition 2015-04-02 12:06:39 +02:00
Axel Uhl cd2d94d8b1 encapsulate fields of PositionDTO, preparing its replacement by Position 2015-04-02 11:47:24 +02:00
sailing ada387d273 Merge remote-tracking branch 'origin/master' into raceboard-simulation 2015-04-01 10:33:12 +02:00
Axel Uhl 75b04d8048 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-30 22:09:02 +02: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
Christopher Ronnewinkel (D036654) 3acbf62b62 Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation 2015-03-26 12:41:16 +01:00
Christopher Ronnewinkel (D036654) 9a3df037cc Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
2015-03-24 09:44:09 +01:00
Axel Uhl 7500d8ed96 fixing the broken test for mark pinging; improved how mark tracks are located when pinging and how outlier avoidance is implemented 2015-03-23 21:33:56 +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 60e1499b50 changed format and raceColumn parameter name for marks listing service 2015-03-23 17:25:45 +01:00
Axel Uhl f8c16d1049 Merge branch 'jbross-buoy-tender' into bug2724
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.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
2015-03-23 16:18:37 +01:00
fmittag ca0f192621 improved and unified the way the live state for a race or a raceColumn is calculated 2015-03-22 14:23:59 +02:00