Commit Graph
157 Commits
Author SHA1 Message Date
Simon Pamies f7256ce8bb Added uncorrected points (eq tracked rank) to json. This makes debugging
of issues easier when score corrections have already been entered.
2013-04-14 00:56:50 +08:00
Axel Uhl f0d7c550e2 Changed "final" semantics for leaderboard JSON export such that it never exports a started but not yet finished race;
other fixes include creation of regattas which need to be created with no RaceColumns attached to the Series yet because
it otherwise breaks assumptions asserted by "assert" statements, hence breaking tests when executed with -ea.
2013-04-12 20:44:22 +02:00
fmittag 737d4fa7d2 Changed the timepoint calculation for the "final" result state in the LeaderboardJsonGetServlet to avoid getting results from live races 2013-04-12 18:02:20 +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
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 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
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
fmittag 49d078d64b improved the JsonExport tests and added a test for bypassing the leaderboardCache if the url parameter useCache=false is used 2013-04-08 17:20:09 +02:00
fmittag c734dd4c6f added a 'useCache' (default is true) url parameter to the leaderJsonGetServlet as a fallback if the cache creates problems. 2013-04-08 13:15:54 +02:00
fmittag f0e38af278 Merge remote-tracking branch 'origin/master' into leaderboardCache 2013-04-08 11:29:20 +02:00
Armin Zamani e03e69d8f3 Resolved a warning in the system regarding the gateway bundle 2013-04-08 05:26:42 +02:00
Armin Zamani c6cefb328b Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
2013-04-04 17:06:06 +02:00
fmittag 1726f07f12 corrected calculation of time difference between two times in expedition status servlet 2013-04-04 13:51:45 +02:00
fmittag 678e7d18cb Merge remote-tracking branch 'origin/master' into leaderboardCache 2013-04-04 10:37:48 +02:00
Armin Zamani fa0a308436 Changed the mark export for the app: Only marks that have a UUID as an
id are serialized
2013-04-03 20:49:38 +02:00
Armin Zamani 931d2fe98e Implemented the throughput of the TracTrac user name and password from
the AdminConsole to the CourseDesignChangeHandler in the TracTrac
adapter
2013-04-03 20:33:26 +02:00
fmittag 1b88e4d764 added a message if no expedition wind source is available in the expedition wind status servlet 2013-04-03 16:00:31 +02:00
fmittag ff3e799e49 added a "time since last message" output to the expedition wind status servlet 2013-04-03 13:45:28 +02:00
fmittag 1c06923a9c little output adjustment for the Expedition wind status servlet 2013-04-03 13:21:35 +02:00
fmittag 37f485cbc4 added a simple status viewer servlet for expedition messages 2013-04-03 12:40:13 +02:00
Armin Zamani 31b6b49a97 added the competitor list field to RaceCell and its implementation.
adapted the serializer and deserializer appropriately
2013-04-02 19:49:23 +02:00
fmittag 9f82edfb7b Merge remote-tracking branch 'origin/master' into leaderboardCache 2013-04-02 09:16:56 +02:00
Armin Zamani 22dddc900f more simplifications for competitor serialization and deserialization 2013-04-01 21:02:06 +02:00
Armin Zamani 1c16a630a7 implemented competitor serialization (team is serialized, boat
serialized, nationality serialized)
2013-04-01 19:16:28 +02:00
Armin Zamani ac1acc6d18 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/DomainObjectFactoryImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
2013-04-01 01:01:12 +02:00
Simon Pamies 3b497e7e95 Moved away from calling logger.throwing because this logs with level FINER that is not catched in most logging configurations. Used logger.log(level, message, throwable). 2013-03-29 15:19:03 +01:00
Armin Zamani 68d6b4f833 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/EventsJsonGetServlet.java
2013-03-27 16:00:08 +01:00
fmittag aea3060fde refactoring of LeaderboardJsonGetServlet to support also "empty leaderboards" with no results. In this case the leaderboardCache is not used (as there is nothing to calculate and there is no "result" timestamp we could use for the caching) 2013-03-26 12:14:04 +01:00
fmittag 7db566ebae added (failing) test case for smartfuturechache in leaderboard json export 2013-03-25 16:10:02 +01:00
fmittag d61d7f8644 Merge remote-tracking branch 'origin/master' into leaderboardCache
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonGetServlet.java
2013-03-25 12:37:37 +01:00
fmittag e3df4ea5dd added a json servlet for exporting wind data (similar to the showWind action from the AdminApp but with more parameters)
some renaming of the json servlets
2013-03-22 17:22:24 +01:00
Armin Zamani 6b4efe7af5 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/EventsJsonExportServlet.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
2013-03-22 13:51:55 +01:00
fmittag a36606226f added sample json files for all json exports 2013-03-22 11:47:02 +01:00
fmittag e4a4219624 replaced EventDataJsonExportServlet accessible via /rc/events with more general EventsJsonExportServlet via /events 2013-03-22 10:54:21 +01:00
fmittag 4681e78b61 Merge remote-tracking branch 'origin/master' into leaderboard_json_doc_and_test
Conflicts:
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
2013-03-22 10:45:34 +01:00
Armin Zamani d2eb988050 remaining changes after merge 2013-03-21 21:19:57 +01:00
Armin Zamani 6abba47d29 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/CourseDataJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseBaseJsonSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseDataJsonSerializer.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventDataJsonExportServlet.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/EventsDataParser.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/FleetIdentifierImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-03-21 21:19:27 +01:00
Armin Zamani d1f64c456d renamed "CourseData" to "CourseBase", "EventData" to "EventBase" and
"SeriesData" to "SeriesBase", and their impl-classes accordingly,
renamed "CourseDataJsonSerializer" to "CourseBaseJsonSerializer"
2013-03-21 18:30:30 +01:00
Armin Zamani c97edeb46b Renamed AddToRaceLogJsonExportServlet to
AddEntryToRaceLogJsonPostServlet, renamed path /rc/leaderboards to
/rc/racegroups
2013-03-21 18:28:13 +01:00
fmittag 887b2ec5dd added a json export servlet for sailing events 2013-03-21 18:05:48 +01:00
fmittag 9e0b09fab7 added test cases for json export of a leaderboard with "Live" and "Final" result state 2013-03-21 14:37:58 +01:00
Armin Zamani f924559542 introduced the course design update URI as part of the constructors for
tractrac race creation
2013-03-20 19:31:23 +01:00
fmittag 123e58bc3d initial commit for documentation of gateway web services (json exports) 2013-03-20 12:09:45 +01:00
Armin Zamani 619f0fead9 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
2013-03-19 19:08:36 +01:00
Armin Zamani 671ef2c3af Bug fix: Race Log of tracked races for flexible leaderboards could not
be loaded because of different default fleet objects
2013-03-17 23:18:30 +01:00
Armin Zamani cc7ca66121 Integrated Course design deserializer in common race log event
deserializer
2013-03-14 23:26:52 +01:00
Axel Uhl 148ebdc2b4 don't evict leaderboard JSON cache but only trigger re-calculation for the time points already contained 2013-03-08 18:18:13 +04:00
Axel Uhl 4f08b79220 cache invalidation looking quite good for JSON Leaderboard export 2013-03-07 15:33:19 +04:00
Armin Zamani 027cd64a08 Added new marks json servlet to receive the marks in the app 2013-03-07 15:18:57 +04:00