Frank Mittag
7ba23e179d
Implemented usage of CompetitorAndBoatDeserializer in rcApp -> Peter to check this now
2018-02-12 10:32:36 +01:00
Peter Siegmund
a1d35afc2f
rewrite of leaderboard loading (use pair instead of competitor)
2018-02-06 16:12:33 +01:00
Peter Siegmund
cb3b33e486
add neutral button to "no connection screen"
2018-02-06 12:15:56 +01:00
Peter Siegmund
622fa945bb
remove warning in Android Studio
2018-02-02 14:14:36 +01:00
Peter Siegmund
fe03cac6c7
add third layer of protest time duration (in case of no server value)
2018-02-02 14:14:10 +01:00
Peter Siegmund
ad013ac979
load regatta specific configuration, if available
2018-02-02 08:00:31 +01:00
Peter Siegmund
8c4928d44a
remove static function calls
2018-02-01 19:41:31 +01:00
Peter Siegmund
b10ce0a5d7
fixed "summary" values in regatta specific configuration
2018-02-01 19:15:42 +01:00
Peter Siegmund
5628ea0b36
revert wrong parameter type in english string resource
2018-02-01 12:03:33 +01:00
Axel Uhl
ae70f96104
use Duration for protest time defaults in regatta configuration
...
Change-Id: Ie0554276aa96bd304a2787b7f297e69f84df371a
2018-02-01 10:54:31 +01:00
Axel Uhl
4013c54b0f
Merge branch 'master' into bug4239
...
Change-Id: I951ec81f47dde52a3f3bea17e80cdd5119ab2aba
2018-02-01 09:16:57 +01:00
Frank Mittag
e9e52697a6
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
2018-01-31 15:04:09 +01:00
Peter Siegmund
b9239c60c5
Merge branch 'bug4232'
2018-01-30 11:35:42 +01:00
Axel Uhl
a20ce70fb3
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
...
Change-Id: I0f5333eae69540da5d87c4a7cdb0c2bef9988b38
2018-01-26 09:21:02 +01:00
Joel Bürkle
9698567cc1
Merging master with branch 'bug4420'
2018-01-22 08:39:23 +00:00
Peter Siegmund
ad418d25fb
show merge error hint in edit dialog
2018-01-19 17:14:18 +01:00
Peter Siegmund
257515074a
check for competitor id (not with object equal)
2018-01-19 16:50:18 +01:00
Peter Siegmund
6030e90085
remove id tag for demo overlay in tablet version
2018-01-19 12:02:18 +01:00
Peter Siegmund
b67ccb4d8a
fixed missing "publish" issue in trackinglist
2018-01-19 11:57:05 +01:00
Peter Siegmund
6b33e400e1
fixed issue with "no configuration found" in login
2018-01-19 11:40:10 +01:00
Peter Siegmund
0408b5e92d
Merge branch 'master' into bug4232
2018-01-18 14:53:51 +01:00
Peter Siegmund
f0f39e2ed7
reset merge state on "apply"
2018-01-18 14:51:10 +01:00
Peter Siegmund
fc247ec919
don't reset visible data after publish
2018-01-18 13:48:13 +01:00
Peter Siegmund
234585dde9
also show marker for published data
2018-01-18 13:12:03 +01:00
Peter Siegmund
dcd3d82d47
Merge branch 'bug4269'
2018-01-17 16:09:17 +01:00
Peter Siegmund
19e0f16508
fixed english wording
2018-01-17 15:45:29 +01:00
Peter Siegmund
568a35c186
change error alert wording
2018-01-17 15:31:12 +01:00
Peter Siegmund
303d173c14
add annotation for Eclipse build
2018-01-17 15:03:50 +01:00
Frank Mittag
be9dc21f40
fixed a case where getShortInfo() can be null
2018-01-17 10:36:59 +01:00
Joel Bürkle
25e399ae49
Creating dummy files inside res-folders for bug 4420
2018-01-17 09:13:38 +00:00
Peter Siegmund
f4d50868cf
No result (e.g. offline or timeout) for hello-call throws an IOException
...
-> show retry AlertDialog instead of user credentials
2018-01-16 15:46:21 +01:00
Frank Mittag
debd0b04ba
some little fixes regarding usage of competitor.getShortInfo()
2018-01-16 15:21:37 +01:00
Axel Uhl
dcb43721e6
don't use "instanceof CompetitorWithBoat" because of live migration;
...
when a tracked race is loaded into a regatta with changing boats and the
competitor has a boat, it is migrated "in place" with its boat reference
set to null; this way it is possible to have a CompetitorWithBoat object
that returns false from hasBoat(). Therefore, hasBoat() must be
preferred over a type check
Change-Id: Ic74441bfb48566e66cb88391b52537303638d564
2018-01-16 12:43:30 +01:00
Axel Uhl
5073ea75d7
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
...
Change-Id: I61c922f7a1d7ece025ace4cd6277ccce3640d055
2018-01-16 11:24:13 +01:00
Peter Siegmund
13f8b7d437
add "demo mode" overlay to race view
2018-01-16 11:23:41 +01:00
Peter Siegmund
424a068dc6
Merge branch 'master' into bug4239
2018-01-16 08:15:34 +01:00
Peter Siegmund
b46e0409e9
save and transfer default protest time to Android
2018-01-16 08:10:48 +01:00
Axel Uhl
842d215d93
Merge branch 'master' into bug4232
...
Change-Id: I6734e53d0ed9e39fd76d93fc15ec95af25d84d7f
2018-01-12 18:05:40 +01:00
Peter Siegmund
95484d63a4
save accessToken to preferences in QRHelper
...
(single point to save from QR code)
2018-01-12 11:10:29 +01:00
Peter Siegmund
ba71cf1ee7
fixed blocking lint warnings while "./gradlew build" for all apps
2018-01-05 14:20:49 +01:00
Peter Siegmund
d975e5f806
Merge branch 'master' into bug4177
2018-01-05 13:52:17 +01:00
Peter Siegmund
ea69065f1b
check publish button after cancel edit dialog (click outside)
2017-12-07 11:21:04 +01:00
Peter Siegmund
bca631cb8b
show warning sign on publish button
2017-12-07 10:16:09 +01:00
Peter Siegmund
0e2888203e
don't use unconfirmed finish list for confirming - use concrete list
2017-12-06 10:35:43 +01:00
Peter Siegmund
de1480974e
change none dirty items
2017-12-01 11:50:30 +01:00
Peter Siegmund
3abdfbd527
remove Eclipse warning
2017-12-01 11:49:44 +01:00
Axel Uhl
11e8eee958
Merge branch 'master' into bug4232
2017-11-23 18:02:38 +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
Axel Uhl
50364849bc
made the new CompetitorResult.getMergeState() null-safe for compatibility with deserialized old versions
...
Change-Id: Iee3325eb884cd70fc90c974ade05969d7321a9dd
2017-11-20 13:19:20 +01:00
Peter Siegmund
59d85d12d9
removed warnings
2017-11-14 15:17:32 +01:00
Frank Mittag
Peter Siegmund
Axel Uhl
Joel Bürkle