eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-09 22:01:02 +00:00
Code Activity
25,638 Commits 274 Branches 252 Tags
33f2c86858f5e7eee9a42d04d9f41a9f0da62892
Commit Graph
954 Commits
Author SHA1 Message Date
fmittag e10236faee added some more boat classes to masterdata class 2015-06-17 15:22:26 +02:00
Axel Uhl 3a698ab60d Merge branch 'master' into ubilabs--rcapp--develop 
Conflicts:
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
 2015-06-17 01:05:03 +02:00
fmittag 732d45c1be added another alternative name for the 2.4mR boat class 2015-06-16 22:04:03 +02:00
Peter Siegmund 4e1db79fa9 Merge branch 'master' into ubilabs--rcapp--refactoring 2015-06-01 16:28:19 +02:00
Axel Uhl 4365699ea6 Merge branch 'master' into bug1018 
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	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_cn.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-05-30 06:41:22 +02:00
Axel Uhl 3f354f6417 fixed column list, fixing RACE_CALCULATED_TIME_AT_ESTIMATED_ARRIVAL_AT_COMPETITOR_FARTHEST_AHEAD 2015-05-29 14:22:35 +02:00
Axel Uhl 9c5bf2c3b1 switched from "windward distance to leader" to "windward distance to competitor farthest ahead" 2015-05-28 17:10:04 +02:00
Peter Siegmund db29aab39e Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--refactoring 2015-05-28 16:39:40 +02:00
Peter Siegmund d0523ff71e Merge branch 'master' into ubilabs--rcapp--develop 2015-05-28 10:54:21 +02:00
Axel Uhl 38d757e9ff Merge branch 'master' into bug1018 2015-05-28 10:18:12 +02:00
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
Axel Uhl 9bf55da87d added MediaType enum literal case statements for image and unknown; 
my impression is that so far, MediaType was primarily for video source identification, not for images; this may be a mismatch
 2015-05-22 19:15:29 +02:00
Axel Uhl 777a96aeb8 Merge branch 'yes2015' into yes2015-with-design2015; removed unused MediaType.image and MediaType.unknown enum literals again for now 
Conflicts:
	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
 2015-05-22 19:07:08 +02:00
Axel Uhl cd6174e3f0 Merge branch 'yes2015' into yes2015-with-design2015 2015-05-22 13:39:30 +02:00
Axel Uhl c1cbff5a23 Merge branch 'bug1018' into yes2015 2015-05-22 13:36:36 +02:00
Axel Uhl 22aa447f62 four decimals for time-on-time factor in leaderboard 2015-05-22 13:36:04 +02:00
Axel Uhl 10317ea2bd Merge remote-tracking branch 'server/design2015-overview' into yes2015-with-design2015 
Conflicts:
	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_cn.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-05-22 11:18:10 +02:00
Axel Uhl 8edad8e397 Merge branch 'bug1018' into yes2015 
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
 2015-05-22 00:29:46 +02:00
Axel Uhl 6304504e3c added column for correctedTimeAtEstimatedArrivalAtCompetitorFarthestAhead (see bug 2862) 2015-05-21 12:58:46 +02:00
Axel Uhl 542c296f14 added ToT factor and ToD allowance columns to leaderboard (see bug 2862) 2015-05-21 11:25:40 +02:00
Axel Uhl 1a319c228c added timeOnTimeFactor and timeOnDistanceAllowance of CompetitorDTOImpl to equals/hashCode 2015-05-21 09:22:23 +02:00
Axel Uhl f7d72e7ab3 added corrected time columns (see bug 2862) 2015-05-20 22:45:42 +02:00
Axel Uhl 96988ae292 an untested attempt to compute the gap to leader for a leg for TimeOnTimeAndDistanceRankingMetric; still square effort; extraction of pre-calculation still missing 2015-05-20 16:13:09 +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 958ecaba1a added cache to gap calculation for LegEntryDTO 2015-05-19 10:07:13 +02:00
Peter Siegmund 2209ac62c2 Merge branch 'master' into ubilabs--rcapp--develop 2015-05-18 08:42:11 +02:00
Axel Uhl ba1fceecaa added fields to capture time-on-time / time-on-distance on competitor and pass values through all constructors and operations and JSON serialization 2015-05-14 20:10:20 +02:00
Axel Uhl 869967f5b6 Merge branch 'master' into bug1018 
Conflicts:
	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/tracking/TrackedLeg.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/TrackedLegImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java

The merge conflict was largely caused by the introduction of target time estimation which conflicted with a few
new methods introduced on branch bug1018
 2015-05-13 00:21:21 +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
Axel Uhl acb3b69878 added column to RegattaListComposite showing RankingMetric; moved a separate RankingMetrics enum to common to keep gwt.ui Java8-free 2015-05-12 22:04:45 +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 ece7378c4f Merge branch 'master' into bug1018 2015-05-07 09:26:04 +02:00
Peter Siegmund e8feee3df4 Merge branch 'master' into ubilabs--rcapp--develop 2015-05-06 11:32:59 +02:00
Axel Uhl 181e5ee5b9 Merge branch 'master' into ubilabs--tracking_app--develop 2015-05-04 23:14:52 +02:00
Peter Siegmund 0620a83ea9 Merge branch 'master' into ubilabs--rcapp--develop 2015-04-30 14:34:59 +02:00
Axel Uhl 20481e6fbe Merge branch 'master' into bug1018 2015-04-30 14:10:04 +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
Axel Uhl 10c7da6e36 Merge branch 'master' into bug1018 2015-04-30 00:47:46 +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
Axel Uhl 5fcb99964e Merge branch 'master' into bug1018 
Conflicts:
	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/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
 2015-04-27 10:26:45 +02:00
Peter Siegmund feceb90995 Merge branch 'master' into ubilabs--rcapp--develop 2015-04-27 10:05:00 +02:00
Axel Uhl 857822e302 added Uniform and India+Zulu start flags 2015-04-23 22:52:22 +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