 Frederik Petersen
|
1116bb9440
|
Added overwrite info for master data import
The success dialog of the master data import now includes information
about overwritten regattas, so he/she knows which races need to be
retracked.
|
2014-01-29 14:21:57 +01:00 |
|
 Axel Uhl
|
f0bd78abd6
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
|
2014-01-27 17:21:33 +01:00 |
|
|
Axel Uhl
|
28fa8c528b
|
fixed a bunch of NPE issues in the RCapp
|
2014-01-27 10:26:59 +01:00 |
|
|
Axel Uhl
|
37b609d25a
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.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/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Leaderboard.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/LeaderboardEditing.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RaceBoard.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/RegattaOverview.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Spectator.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/TvView.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/UserManagement.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
|
2014-01-21 22:51:44 +01:00 |
|
 Simon Pamies
|
3c18d2e0ae
|
Extended LeaderboardEdit page with uncorrected net points. This is
especially useful to see differences between corrected and uncorrected
scores.
|
2014-01-21 17:55:30 +01:00 |
|
|
Axel Uhl
|
31074ccf2d
|
fixed bug regarding reading of passing instructions from course's metadata
|
2014-01-20 15:12:13 +01:00 |
|
 Nick Klose
|
a172d69861
|
Edits after review for merge with master.
|
2014-01-17 11:36:28 +01:00 |
|
|
Nick Klose
|
5b68ed3e99
|
Went back to old incremental calc after finding the real problem: start time ecomes later than request.
|
2014-01-10 17:31:44 +01:00 |
|
|
Nick Klose
|
af926ebfd4
|
Merge branch 'master' into mark-rounding-inference
|
2013-12-18 17:47:19 +01:00 |
|
 Lennart Hensler
|
a2ff94406d
|
Added distance to start line and beat angle to the competitor charts
|
2013-12-18 17:03:11 +01:00 |
|
|
Nick Klose
|
aaad94801c
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
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
|
2013-12-16 10:45:28 +01:00 |
|
|
Nick Klose
|
45bbc603f7
|
Added valueOfWithoutCase() method to PassingInstruction to allow the parsing of Metadata from TracTrac.
|
2013-12-12 11:58:08 +01:00 |
|
|
Axel Uhl
|
4ad6594a25
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
|
2013-12-10 09:30:41 +01:00 |
|
|
Axel Uhl
|
6510d8643b
|
first steps towards an Igtimi accounts management panel in the AdminConsole
|
2013-12-10 00:54:28 +01:00 |
|
|
Axel Uhl
|
bca2a9b982
|
fixed serialization/deserialization for null colors
|
2013-12-09 23:08:02 +01:00 |
|
|
Axel Uhl
|
1404c18f67
|
replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO
|
2013-12-09 22:06:29 +01:00 |
|
|
Axel Uhl
|
2b472d1c02
|
extracted HTML-mapping of colors into abstract color class
|
2013-12-09 21:19:11 +01:00 |
|
|
Nick Klose
|
3018bd8bfe
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
|
2013-12-09 18:35:16 +01:00 |
|
|
Nick Klose
|
96075f5cc1
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.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.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
|
2013-12-09 13:22:09 +01:00 |
|
 fmittag
|
6d543b46b4
|
renamed new attribute displayColor of competitor back to color
|
2013-12-07 16:25:54 +01:00 |
|
 Lukas Niemeier
|
009a7ce32f
|
# using UUID in for RegattaDTO, CourseAreaDTO, AbstractLeaderboardDTO, LeaderboardDescriptor
|
2013-12-07 00:55:26 +01:00 |
|
|
Lukas Niemeier
|
0efcd2dec9
|
better comment
|
2013-12-06 23:07:03 +01:00 |
|
|
fmittag
|
62b3a9c6ae
|
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-12-06 19:19:09 +01:00 |
|
|
fmittag
|
d037441787
|
added load/store/editing of the new attribute displayColor for a competitor
|
2013-12-06 18:40:15 +01:00 |
|
|
Lukas Niemeier
|
56c4b7ce0c
|
# extract to local var
|
2013-12-06 17:06:17 +01:00 |
|
|
Nick Klose
|
547e304f73
|
Merge branch 'master' into mark-rounding-inference
|
2013-12-06 15:26:56 +01:00 |
|
|
Axel Uhl
|
1efebeef57
|
Merge branch 'master' into racecommittee_app
|
2013-12-06 14:49:01 +01:00 |
|
|
Lukas Niemeier
|
dc25f9ccb5
|
# removed the "any" DeviceConfigurationMatcher
|
2013-12-06 03:04:43 +01:00 |
|
|
Lukas Niemeier
|
e50c4f7de7
|
# qr code is encoded in a way that allows it to be used as an URL for first-time installation of the app
|
2013-12-06 02:22:48 +01:00 |
|
|
Axel Uhl
|
5f4a3b0b9c
|
added test case for wind fix extraction from Igtimi basic fixes
|
2013-12-06 00:04:28 +01:00 |
|
|
Axel Uhl
|
f4102ac8c2
|
first Igtimi WindTrack implementation that would act as a BulkFixReceiver which can be used for web socket live as well as resource stored data
|
2013-12-05 15:41:00 +01:00 |
|
|
Nick Klose
|
e511cd7f2f
|
Merge branch 'master' into marks
Conflicts:
java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
|
2013-12-04 10:18:59 +01:00 |
|
|
Lukas Niemeier
|
5b238f500a
|
Merge branch 'master' into racecommittee_app
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/CompetitorMasterDataDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/LeaderboardGroupMasterDataJsonDeserializer.java
|
2013-12-03 18:34:33 +01:00 |
|
|
Nick Klose
|
5a6a105c10
|
Gave NaturalComparator the boolean caseSensitive, allowing the choice wether the two Strings should be compared regarding their case.
|
2013-12-03 16:05:37 +01:00 |
|
|
Lukas Niemeier
|
04e8671a11
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
|
2013-11-29 18:24:13 +01:00 |
|
|
Nick Klose
|
3481baa03b
|
Merge branch 'master' into mark-rounding-inference
|
2013-11-29 10:50:04 +01:00 |
|
|
Lukas Niemeier
|
c7339875bc
|
# added simple DeviceConfiguration UI
# added synchronization of device identifier and server url via QRCode
|
2013-11-29 01:52:20 +01:00 |
|
|
Axel Uhl
|
18ad066e35
|
added fix types for all Igtimi formats known so far
|
2013-11-27 10:59:36 +01:00 |
|
|
Nick Klose
|
93b06f64f2
|
Changed Test to pass in fixes one by one.
|
2013-11-25 14:47:54 +01:00 |
|
|
Lukas Niemeier
|
2b1a1d17d8
|
# added new RacingProcedure BASIC
|
2013-11-25 02:34:46 +01:00 |
|
|
Lukas Niemeier
|
773670d608
|
# revamped the configuration system to support remote configuration of racing procedures
|
2013-11-25 00:01:25 +01:00 |
|
|
Lukas Niemeier
|
953eaaa668
|
Merge branch 'racecommittee_app' into racecommittee_app_startphases
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/RegattaMasterData.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/masterdata/impl/RegattaMasterDataJsonDeserializer.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/operationaltransformation/ImportMasterDataOperation.java
|
2013-11-20 12:25:57 +01:00 |
|
|
Nick Klose
|
01bda88649
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
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
|
2013-11-19 10:06:28 +01:00 |
|
|
Axel Uhl
|
a4441ee2c6
|
Merge remote-tracking branch 'server/master'
|
2013-11-18 17:33:17 +01:00 |
|
|
Axel Uhl
|
a310193eff
|
no change
|
2013-11-18 17:32:44 +01:00 |
|
|
Axel Uhl
|
cf6aeba9d6
|
use a filtering output stream for initial load serialization, so that on the server we can see the data volume caused by the initial load
|
2013-11-18 17:24:36 +01:00 |
|
|
Nick Klose
|
76c2d1198b
|
Merge branch 'master' into textbox
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
|
2013-11-18 16:49:54 +01:00 |
|
|
Lukas Niemeier
|
9b030ae4e4
|
# added remote configuration of course names
|
2013-11-16 17:19:23 +01:00 |
|
|
Lukas Niemeier
|
58efde4c15
|
# default racing procedure and default course designer configurable for regtattas
|
2013-11-16 16:32:30 +01:00 |
|
|
Lukas Niemeier
|
bca2fb06d7
|
# rewritten the preference ui with new api (better tablet support, support for several screen sizes,...)
|
2013-11-15 19:40:23 +01:00 |
|