Commit Graph
1280 Commits
Author SHA1 Message Date
Axel Uhl c5370ad0be consolidated imports
Change-Id: Ia96ff4e252ee741da2bdc018bd0ca91a0420e94a
2018-04-20 11:42:41 +02:00
Axel Uhl f13e517f66 removed unused requestTimePoint parameter
Change-Id: I66d383b27bc6cdd3f148be523c1bbf5d8cb6b138
2018-04-20 11:40:56 +02:00
Frank Mittag 8b355d710d fixed value of 'resultTimepoint' for live leaderboards json exports -> take leaderboardDTO.timepoint instead of requested timepoint as only the leaderboard calculation determines the real result timepoint. 2018-04-20 11:24:32 +02:00
Axel Uhl ab0efda1ba removed redundancies between the two leaderboard service variants
Change-Id: I7186fbc350809c9acccec5cc99d82cf6d2565fff
2018-04-19 22:11:47 +02:00
Axel Uhl 96677487af use LeaderboardType enum literals' name() representation, not toString(), for leaderboard type field
Change-Id: I3c8b04d498c1774efb35bf29d0f51991a0a9bcb8
2018-04-19 21:31:55 +02:00
Axel Uhl c8561c8f6c serialize boats separately only if competitors can change boats; remain compatible and serialize boats with competitors if they can't
Change-Id: I0d7b93b83d8b8046aa56c71b4ca675b5152eb09d
2018-04-19 21:28:13 +02:00
Axel Uhl 9b1518520a formatting/whitespace changes only
Change-Id: Id0cfe3f3a65069ebc3625c27419dd37839bd20c8
2018-04-19 21:28:01 +02:00
Axel Uhl 452b5ff205 Merge branch 'master' into bug4514
Change-Id: Id1ca0e271319ee209a1a3d7dc486ed1c7a6a25a6
2018-04-19 20:50:47 +02:00
Axel Uhl 18c777a99f adjusted SwissTiming connector to accomodate UUIDs for mark devices and competitors
Change-Id: Ieaca20de4eacbbc5c64e218fb557045f2590e6f6
2018-04-19 17:24:54 +02:00
Frank Mittag 746c173799 another small fix 2018-04-18 18:36:32 +02:00
Frank Mittag 8a614c3027 little bug fix 2018-04-18 18:18:27 +02:00
Frank Mittag ec7e0993dd Writes the attribute 'boat' (of type boatDTO) which can be part of LeaderboardRowDTO or LeaderboardEntryDTO to the leaderboard json API 2018-04-18 18:03:03 +02:00
Kai Börnert c89476091c Merge branch 'bug4371_2' 2018-04-18 16:47:43 +02:00
Frank Mittag d3db54a7e6 Merge remote-tracking branch 'origin/master' into bug4514 2018-04-18 16:18:46 +02:00
Kai Börnert 92f29288cb added description for /v1/boats endpoint with example 2018-04-18 16:00:01 +02:00
Kai Börnert b757403d97 adjusted api documentation for leaderboard checking/checkout to show all
3 types of requests properly
2018-04-18 15:02:03 +02:00
Frank Mittag af353909e5 added 'canBoatsOfCompetitorsChangePerRace' and 'type' on leaderboardResource 2018-04-18 12:28:46 +02:00
Frank Mittag 13b2b41341 Merge remote-tracking branch 'origin/master' into bug4514 2018-04-18 11:24:01 +02:00
Frank Mittag 242a672faf Changed RegattaJsonSerializer to write also 'canBoatsOfCompetitorsChangePerRace' attribute and (optinally) the boats used in the regatta 2018-04-18 11:22:59 +02:00
Steffen Schaefer 28d433bf1e Merge branch 'master' into bug4371_2 2018-04-18 08:50:49 +02:00
Steffen Schaefer c84b83c99a Formatting change only 2018-04-17 15:23:20 +02:00
Steffen Schaefer 578509135e Bug 4371: Improved I18n 2018-04-17 15:23:06 +02:00
Vladislav Chumak 9db575b1a5 Added position to CompleteManeuverCurveWithEstimationData 2018-04-17 14:35:22 +02:00
Kai Börnert b21d0fb7b1 bug4371 properly abort reversegeocoder after a venue was found 2018-04-17 14:27:32 +02:00
Kai Börnert 1ae53ea89e bug4371 initial reverse geocoding of venue 2018-04-17 14:06:45 +02:00
Kai Börnert af71ab1c7e bug4371 extend the event if necessary, to enclosure newly added tracks 2018-04-17 11:43:03 +02:00
Steffen Schaefer 0de6631ce1 Bug 4371: In case of import for a new competitor there may be multiple
affected races
2018-04-17 09:47:45 +02:00
Kai Börnert 9b1b2f88b4 bug4371 allow multiple races to be returned, eg for retracking them
after competitor matching
2018-04-16 19:01:31 +02:00
Kai Börnert f33ed40e6f bug4371 added messages bundle and german/english translation 2018-04-16 15:28:16 +02:00
Kai Börnert 4d80223c64 Merge branch 'bug4371_2' of ssh://trac@sapsailing.com/home/trac/git into
bug4371_2

Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImportServlet.java
2018-04-16 14:28:27 +02:00
Kai Börnert 9cdb26baca use i18n for allInOneImporterServlet 2018-04-16 14:20:36 +02:00
Steffen Schaefer b9c351234f Bug 4371: Added locale parameter for expedition all in one importer as
preperation for I18n of error messages
2018-04-16 11:41:57 +02:00
Steffen Schaefer acdc8be87f Merge branch 'master' into bug4371_2
# 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
2018-04-16 11:04:41 +02:00
Kai Börnert 91e352880a Merge branch 'bug4425'
Conflicts:
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/event/EventConfigurationPanelPO.java
2018-04-16 09:17:59 +02:00
Vladislav Chumak c585833459 Merge remote-tracking branch 'origin/master' into maneuver_refactoring 2018-04-13 16:35:41 +02:00
Steffen Schaefer c2d0f1bc92 Merge branch 'master' into bug4425 2018-04-13 11:29:45 +02:00
Steffen Schaefer 3ef48460df Bug 4371: Removed unnecessary comment 2018-04-13 09:58:02 +02:00
Steffen Schaefer 2acd4d045b Bug 4371: Refactored parts to new methods in ExpeditionAllInOneImporter 2018-04-13 09:56:40 +02:00
Axel Uhl b4f1c8fb10 more getCompetitorStore()-->getCompetitorAndBoatStore() renames
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Steffen Schaefer b4bf6ac134 Bug 4371: Refactored parts to new methods in ExpeditionAllInOneImporter 2018-04-13 08:53:31 +02:00
Steffen Schaefer 7b3d916540 Bug 4371: Improved method name 2018-04-13 08:43:11 +02:00
Vladislav Chumak 56b5551864 estimation data - extended json api, added deserializers, refactored 2018-04-13 02:21:04 +02:00
Vladislav Chumak 5758fd17b7 Introduced DetailedBoatClassJsonSerializer for wind estimation data 2018-04-12 23:10:48 +02:00
Axel Uhl be4f1d3197 don't track an Expedition log file's race with wind tracker
Change-Id: I98137ea3f6508ad4a8cdb620bfc7e3a05be817f7
2018-04-12 20:55:32 +02:00
Axel Uhl f4a8ed1106 Merge branch 'master' into bug4425
Change-Id: I431c2aefe52d83c7f63a0962d265a45cf23ef9bb
2018-04-12 20:08:37 +02:00
Steffen Schaefer b6dbacee06 Merge branch 'master' into bug4371_2
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ExpeditionAllInOneAfterImportHandler.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogCompetitorRegistrationDialog.java
2018-04-12 15:20:34 +02:00
Axel Uhl 4c319f5f6c renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Steffen Schaefer 6c65d7975a Merge branch 'master' into bug4425
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPresenterImpl.java
2018-04-12 14:01:06 +02:00
Steffen Schaefer 7f69d2823c Bug 4371: Removed legacy TODO 2018-04-12 13:51:11 +02:00
Steffen Schaefer 4f2a938303 Bug 4371: Improved JavaDocs 2018-04-12 13:42:53 +02:00