Commit Graph
100 Commits
Author SHA1 Message Date
Armin Zamani 22dddc900f more simplifications for competitor serialization and deserialization 2013-04-01 21:02:06 +02:00
Armin Zamani 7e36c6e106 reverted the serialization of nationality, team and boat since the
domain factory does not support the creation well
2013-04-01 20:03:37 +02:00
Armin Zamani 71f07329c9 renamed competitorDeserializer to CompetitorIdDeserializer, implemented
the deserialization when a competitor id is given
2013-04-01 19:24:51 +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 8311db5637 Merge branch 'master' into racecommittee_integrated 2013-04-01 15:44:58 +02:00
Armin Zamani 19d9080b97 removed unused code 2013-04-01 15:20:37 +02:00
Armin Zamani 35a5b72d41 Moved the timers and the event, venue and time labels to the panel,
implemented sorting for the columns of the regatta overview by clicking
on a column's header
2013-04-01 14:53:55 +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
Armin Zamani 2829d8dc79 changed the folder name of flags racecommmittee (hoped to solve the
nocache.js problem), restructured the RegattaOverview page with a
master-detail-principle to display the course design of a selected race
2013-04-01 00:26:06 +02:00
Armin Zamani a21efacd34 Moved the race log course design finder from app code to the android
share bundle. on the GWT side the course design is converted to a
RaceCourseDTO and added to the RaceInfoDTO
2013-03-28 00:52:23 +01:00
Armin Zamani 88ae6c2e5e Merge branch 'master' into racecommittee_integrated 2013-03-28 00:10:31 +01:00
Armin Zamani 500d4c3a8c RegattaLeaderboards were not shown on the RegattaOverview since their
course area was not loaded, fixed this issue
2013-03-27 23:51:36 +01:00
Armin Zamani 9b8b3e2e30 added a getEventByIdAsString method for the RegattaOverview page. the
RegattaOverview page shows the event name and the venue name
2013-03-27 23:31:40 +01:00
Armin Zamani 9b1f71fbf9 Removed event id parameter check by converting the given id to
a UUID since GWT cannot handle UUIDs
2013-03-27 23:08:58 +01:00
Armin Zamani d73778feae Removed unnecessary RaceLogEventDTO, changed data to be loaded for
RegattaOverview: For a given event a list of all races on all course
areas with the regatta name and the RaceInfo is shown
2013-03-27 22:56:16 +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
Armin Zamani 5a07545444 Added some String constants for the course update code 2013-03-26 16:20:07 +01:00
Armin Zamani 5311c5d504 implemented start/pause for the regatta overview page, added a column
for fleets
2013-03-25 21:54:48 +01:00
Armin Zamani b8a201322f Added the field "name" for waypoints in the waypoint serialization since
TracTrac expects it for course design updates
2013-03-25 19:02:08 +01:00
Armin Zamani 0e385260f1 The pictures for the marks are shown now in the app 2013-03-23 23:44:55 +01:00
Armin Zamani 5aeb30b1c9 Merge branch 'master' into racecommittee_integrated 2013-03-22 15:13:45 +01:00
Armin Zamani 52b63e22f9 Changed event call address to /sailingserver/events instead of
/sailingserver/rc/events
2013-03-22 13:58:33 +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
Armin Zamani 6d0660120b Merge branch 'master' into racecommittee_integrated 2013-03-22 10:42:10 +01:00
Armin Zamani 2fd16e7499 adapted racegroup address path in the app 2013-03-21 22:48:43 +01:00
Armin Zamani 4e29bda14c fixed a couple of merge errors 2013-03-21 22:11:57 +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
Armin Zamani bb9a3d1ef6 Merge branch 'master' into racecommittee_integrated 2013-03-21 18:10:33 +01:00
Armin Zamani 2741727077 added a try catch for URL/IO exceptions while sending a course design 2013-03-21 17:06:37 +01:00
Armin Zamani 67efd32a79 implemented the connection to the TracTrac server to post a course
update
2013-03-21 17:02:24 +01:00
Armin Zamani e8742c504a Merge branch 'master' into racecommittee_integrated 2013-03-20 23:40:05 +01:00
Armin Zamani ab111912f9 the courseDesignUpdateURI is registered for RaceCourseReceiver in the
TracTrac Adapter
2013-03-20 20:40:30 +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
Armin Zamani 4382fc7656 fixed field row numbering in tractrac adminconsole panel 2013-03-20 17:47:11 +01:00
Armin Zamani 3f7aa1362a Added the tracTrac Course Update url entry field to the tractrac admin
console panel
2013-03-20 17:19:03 +01:00
Armin Zamani 804615979c Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated 2013-03-20 14:13:24 +01:00
Armin Zamani f2354ce6c1 the course design handler in the trac trac adapter serializes the course
design
2013-03-20 14:09:58 +01:00
Armin Zamani 00c51d6041 added the gateway serialization bundle to tractracadapter to be able to
serialize a received course design
2013-03-20 00:10:36 +01:00
Armin Zamani 8cb047681b implemented listener of tracking provider for course design changes 2013-03-19 23:57:31 +01:00
Armin Zamani 6274127bcb introduced a race log listener on TrackedRace to propagate changes on
the course design
2013-03-19 23:27:34 +01:00
Armin Zamani d97d442244 added race log specific bundles to run configuration again 2013-03-19 22:08:58 +01:00
Armin Zamani 44d78fadd9 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
2013-03-19 22:05:33 +01:00
Armin Zamani 48be0c1f5c organized import 2013-03-19 19:13:26 +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 fdff49ebb8 Changed the analyzers to read only after aquiring the read lock 2013-03-19 01:30:27 +01:00
Armin Zamani 212b2e2d82 minor changes to get the communication between app and server for course
design change events running
2013-03-19 00:43:32 +01:00
Armin Zamani a01d3ef70c implemented app specific domain factory 2013-03-18 23:10:08 +01:00
Armin Zamani b85b75100e implemented missing link to open course design dialog, minor bug fixes
while doing testings
2013-03-18 00:59:02 +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 c23dd5e6a6 Added a replication test for course design changed event in race logs 2013-03-17 22:16:54 +01:00
Armin Zamani 9df2ce5fec added a test for the serialization and deserialization of course design
change events
2013-03-17 21:32:55 +01:00
Armin Zamani f8688f1c94 Bug fix: For races that were loaded as TrackedRaces and race columns
were added in the default flexible leaderboard, the race log was missing
2013-03-17 19:32:17 +01:00
Armin Zamani 6c0ab235a0 Code cleanup 2013-03-17 19:12:25 +01:00
Armin Zamani cc7ca66121 Integrated Course design deserializer in common race log event
deserializer
2013-03-14 23:26:52 +01:00
Armin Zamani d107a242aa Implemented the deserializer for course change events 2013-03-14 21:23:28 +01:00
Armin Zamani 3e0743e959 implemented gate and controlpoint deserializer 2013-03-14 13:26:15 +01:00
Armin Zamani d3f0bad002 Added a serializer for the course Design changed event 2013-03-13 01:15:29 +01:00
Armin Zamani 36d98c5080 Introduced a persistence test for the course design changed events in
race logs
2013-03-12 17:45:31 +01:00
Armin Zamani c6d96504ab Implemented new race log event type for course changes 2013-03-12 12:34:25 +01:00
Armin Zamani 2ea27421d3 Further UI implementation for course design viewer 2013-03-12 10:11:54 +01:00
Armin Zamani 816c0e11c2 ported classes needed for the course designer in the integrated app 2013-03-11 16:35:59 +01:00
Armin Zamani ccc8f38819 Added RegattaOverview project to build.properties 2013-03-07 17:58:25 +04:00
Armin Zamani 8a09013584 Just formatting again 2013-03-07 17:50:54 +04:00
Armin Zamani a0f490835b Just formatting 2013-03-07 17:24:49 +04:00
Armin Zamani aaf73deea5 Extended Data Management in app to handle mark loading 2013-03-07 17:13:31 +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
Armin Zamani 31436bd4c2 content type of event and racegroup export is now application/json 2013-03-06 15:48:41 +04:00
Armin Zamani 13b27e65fc for race log event creation the race log Factory is used 2013-03-06 11:49:00 +04:00
Armin Zamani 77fb8a1dad removed unused import 2013-03-06 10:56:18 +04:00
Armin Zamani 1bea958c4d Merge branch 'master' into racecommittee_integrated
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
2013-03-06 10:30:22 +04:00
Armin Zamani 9d59848cf9 Merge branch 'racecommitte_integrated_com' into racecommittee_integrated 2013-03-03 23:07:11 +01:00
Armin Zamani 94944464f3 Fixed some errors after merge 2013-03-03 18:24:18 +01:00
Armin Zamani 79a39ef402 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateFlexibleLeaderboard.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateRegattaLeaderboard.java
2013-03-03 17:40:51 +01:00
Armin Zamani d3d8134398 Hope that BuildConfig.java from android glue project wont appear anymore 2013-03-03 17:01:08 +01:00
Armin Zamani e812e87452 Bug fix in GWT Admin Console: Select and unselect of an event works now
without bugs, tested several times
2013-03-03 15:50:04 +01:00
Armin Zamani b7f6803829 added Javadoc for SeriesWithRows 2013-03-03 15:01:34 +01:00
Armin Zamani 948569bb60 added Javadoc 2013-03-03 14:49:28 +01:00
Armin Zamani 76a249ad23 Added some Javadocs for explanation of our implementation and renamed
some methods
2013-03-03 14:02:32 +01:00
Armin Zamani 1dc5b89589 App: Changed OnlineDataManager to load URL from Shared Preferences 2013-03-02 17:54:28 +01:00
Armin Zamani 514a8864cb Added a test for storing and retrieving race log events on regattas,
set race log at regatta creation
2013-03-02 17:12:45 +01:00
Armin Zamani ad4e60fa89 added JavaDoc to Template 2013-03-02 15:36:10 +01:00
Armin Zamani 188a4a371d Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated 2013-03-02 14:04:48 +01:00
Armin Zamani 89445344ab changed sailinggwt.launch 2013-03-02 14:02:51 +01:00
Armin Zamani 4816dd2428 added new item in realm.properties 2013-03-02 00:23:03 +01:00
Armin Zamani 592ddf13f7 Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated 2013-03-01 22:13:17 +01:00
Armin Zamani 273c9fea04 Changed usage of Serializable as id for EventDTO in sailingService to
String usage
2013-03-01 22:12:52 +01:00
Armin Zamani 06c6679964 Changed german name of course area to "Regattabahn" 2013-03-01 21:22:51 +01:00
Armin Zamani df145e18e1 Fixed bug: ScoreCorrection for leaderboard must not be null 2013-03-01 21:12:16 +01:00
Armin Zamani 5b20286163 Named CourseArea id more clear in GWT ui bundle, distinct separation
between courseArea id as string in the GWT ui bundle and id as
serializable
2013-03-01 20:49:15 +01:00
Armin Zamani 6ddc28c27b GWT does not like the more readable version of launch file :( 2013-03-01 20:06:49 +01:00
Armin Zamani aaf35d1cf7 Fixed Bug 1248: Null check for event in regatta creation dialog was
missing, when no event is selected anymore
2013-03-01 19:49:25 +01:00
Armin Zamani a96e692b5f changed SailingGWT.launch again after merge, removed wrong and
unnecessary additional workspace_bundles key
2013-03-01 15:52:25 +01:00
Armin Zamani 67375f2a5b Solved some errors after merge 2013-03-01 15:47:43 +01:00
Armin Zamani b254437be3 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Course.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/CourseImpl.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.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
2013-03-01 15:10:49 +01:00
Armin Zamani 06688a5483 Changed formatting of list of GWT Components to start in
SailingGWT.launch for better readability and mergeability
2013-03-01 14:41:22 +01:00
Armin Zamani d7f9bbbaf9 Just formatting: Changed tabs to spaces by formatting hole files (Ctrl +
I in Eclipse) that we might have touched while developing on this branch
2013-03-01 14:33:37 +01:00
Armin Zamani 05fb3a9549 bug fix after merge, test of mongo escaping for raceLogIdentifier 2013-02-27 12:50:38 +01:00