fmittag
760524ee8f
Merge remote-tracking branch 'origin/master' into gwt2.5.1
2013-04-12 11:51:40 +02:00
fmittag
a815a91f37
upgraded gwt version from 2.5.0 to 2.5.1
2013-04-12 11:44:45 +02:00
Armin Zamani
6b10d3cc66
Merge branch 'master' into racecommittee_integrated
2013-04-12 16:46:18 +08:00
Armin Zamani
502a15d0a5
Changed getTrackedRegatta.getRegatta.getId to the tractrac event id,
...
given by getTracTracEvent
2013-04-12 16:40:49 +08:00
Simon Pamies
2c865cf37a
Make sure that automatic score corrections also update score correction metadata especially the timepoint
2013-04-12 11:52:19 +08:00
Armin Zamani
a549394c60
Changed Course area comparison, (equals instead of ==)
2013-04-12 09:48:22 +08:00
Armin Zamani
b634102de6
Merge branch 'master' into racecommittee_integrated
2013-04-12 08:19:44 +08:00
Armin Zamani
2b3c7990fd
more logging on the app about fragment changes
2013-04-12 08:17:42 +08:00
Axel Uhl
3251d2dfd7
computing RaceInfoDTO based on domain model and not based on DTOs constructed from domain model;
...
this should also solve bug 1342 because this is no longer called for constructing a StrippedLeaderboardDTO
2013-04-11 19:00:34 +02:00
Fabian Tschirschnitz
e66411772b
fixed bug when resetting the time of a race caused by 2 events written to the log with the same timestamp.
2013-04-11 18:34:23 +02:00
Axel Uhl
c06ebfc7e7
quick fix towards bug 1342. The lges.get(0) is a bit evil if there are no legs (empty course); still, it needs to be atomic without locking; use exception instead
2013-04-11 18:33:01 +02:00
Axel Uhl
1a5530d20f
fixed typo in log message
2013-04-11 18:20:07 +02:00
Axel Uhl
1753127edc
regarding bug 1341, trying a patch that avoids the NPE due to missing RaceLog; needs to be reviewed by the Berlin team
2013-04-11 17:02:25 +02:00
Axel Uhl
3b5539181c
added missing hamcrest dependency to android.test bundle
2013-04-11 16:00:37 +02:00
Axel Uhl
f83c624e58
added missing hamcrest dependency to manifest of mongodb.test bundle
2013-04-11 15:20:27 +02:00
Axel Uhl
7b6ef0f246
added missing hamcrest dependency to serialization.test manifest
2013-04-11 14:46:43 +02:00
Axel Uhl (Server)
a7a20edbc0
fixed line endings in buildAndUpdateProduct.sh
2013-04-11 14:22:48 +02:00
Axel Uhl
34bab83ba2
Merge remote-tracking branch 'server/master'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.serialization.test/build.properties
2013-04-11 14:13:34 +02:00
Axel Uhl
91af0a81ec
fixed serialization.test mockito dependencies; added logging for start of tracking
2013-04-11 13:57:15 +02:00
Armin Zamani
cc61f70b07
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/SettableScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/JsonExportTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonGetServlet.java
2013-04-11 13:39:51 +08:00
Armin Zamani
e77fc23f4b
changed the title of the max points reason dialog in app
2013-04-11 13:29:56 +08:00
Armin Zamani
8bda4f3b31
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-04-11 12:39:35 +08:00
Armin Zamani
81fe998237
Bug fixes in the app
2013-04-11 12:38:31 +08:00
Simon Pamies
bf1a97f7e3
Fixed nasty bug where races couldn't be added to a regatta
2013-04-11 12:26:41 +08:00
Lukas Niemeier
25d848848b
# Use getFleetByName to convert fleets for RaceGroups. This way all "default-fleet" objects will be assigned to the same converted fleet object
2013-04-11 04:21:23 +02:00
Armin Zamani
86f7225568
Fixed possible source of NPE in scoring check
2013-04-11 03:24:40 +02:00
Armin Zamani
6dfb770ac9
Merge branch 'racecommittee_integrated' of ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
2013-04-11 02:36:02 +02:00
Lukas Niemeier
5730d86b1c
# Jury flag button toggles filtering
2013-04-11 02:28:38 +02:00
Lukas Niemeier
1a847490f2
# DetailFragment is only changed when there is a real change
...
# EssStartPhaseFragment recovers its own ui state
2013-04-11 02:06:10 +02:00
Lukas Niemeier
287c198f08
# FinishingRaceFragment shows race time limit
2013-04-11 01:31:51 +02:00
Lukas Niemeier
9af8648107
# FinishedFragment shows Time Limit
2013-04-11 01:26:52 +02:00
Lukas Niemeier
063eb58a33
# PositioningFragment has confirm button...
2013-04-11 01:19:34 +02:00
Armin Zamani
c27c6a1733
commented time limit tritter dispatch action out
2013-04-11 00:37:42 +02:00
Lukas Niemeier
d1be9dc589
# Added button to FinishedRaceFragment for repositioning
...
# RaceDialogFragment now implements TickListener
2013-04-11 00:32:19 +02:00
Armin Zamani
b501d1ca6f
Merge branch 'racecommittee_integrated' of
...
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Armin Zamani
055c341ec1
Implemented a new replicating RaceColumnListener that listens for score
...
correction events in the racelog and checks if a score correction is
needed
2013-04-11 00:23:39 +02:00
Lukas Niemeier
e66f7ff58a
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-04-11 00:10:29 +02:00
Lukas Niemeier
cbf97b4120
# extracted positioning into own fragment
2013-04-11 00:10:13 +02:00
Axel Uhl
16e09507c1
first test for parsing XLSX result format for 505 in Barbados
2013-04-11 00:09:10 +02:00
Fabian Tschirschnitz
98d85cd4ce
added ess 175% rule for race finish.
2013-04-10 23:45:37 +02:00
Lukas Niemeier
7ae0f1bb3f
# display start, first boat and finished time in FinishedRaceFragment
...
# TimeLimit time still missing
2013-04-10 23:19:05 +02:00
Lukas Niemeier
59a4b81ad3
# prevent score correction comparison when there are no scores transmitted
2013-04-10 23:18:20 +02:00
Lukas Niemeier
dbf701e61c
# fixed set of ResetTime button
2013-04-10 19:18:33 +02:00
Lukas Niemeier
2ec698d8a7
# fixed references of old layout elements
2013-04-10 19:15:30 +02:00
Axel Uhl
9b0ff70e90
moved more of the default score correction implementation to the resultimport bundle to re-use between FREG and other importers
2013-04-10 18:14:37 +02:00
Axel Uhl
5f75cb9464
Merge branch 'master' into winregatta_resultimport
2013-04-10 16:17:55 +02:00
Axel Uhl (Server)
b2d41f24e3
Merge branch 'leaderboardCache'
2013-04-10 04:14:32 +02:00
Axel Uhl
002b680843
moved up hasScoreCorrection for an entire leaderboard column / RaceColumn from SettableScoreCorrection to ScoreCorrection
2013-04-09 15:22:43 +02:00
Armin Zamani
8fc90fdb92
added a TODO for a countdown label for Xray to be implemented (but will
...
survive without it too), refactoring
2013-04-09 11:46:45 +02:00
Armin Zamani
c7387ee5d9
Implemented UI handling of individual recall
2013-04-09 04:42:06 +02:00