Lukas Niemeier
5df89c7e7e
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/MarkImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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/FlexibleLeaderboardDialog.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/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
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/pom.xml
2013-02-18 16:53:55 +01:00
Lukas Niemeier
a229765845
# moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android
...
# updated com.sap.sailing.domain to Java 1.7 again
# split of Event (see EventData) and Course (see CourseData) to minimize shared code with android
# to avoid sharing RaceColumn and Leaderboard (and its dependencies) Android projects work with RaceGroups (consisting of SeriesWithRows -> consisting of RaceRows -> consisting of RaceCells -> consisting of RaceLogs). A RaceGroup is basically a data-only view on transposed RaceColumns. See RaceGroupFactory for conversion from Leaderboard to RaceGroup. Future work: use Regatta instead of Leaderboard to convert to RaceGroup
2013-02-18 13:26:32 +01:00
Lukas Niemeier
a744ad6c86
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddToRaceLogJsonExportServlet.java
2013-02-18 02:27:48 +01:00
Armin Zamani
1e78be1dae
Changed replication behaviour to new implementation
2013-02-18 02:19:35 +01:00
Armin Zamani
ddea60f570
Removed RaceLogStore from RaceColumn implementations and all subsequent
...
classes
2013-02-18 01:34:14 +01:00
Lukas Niemeier
2763d11782
# removed obsolete servlets
2013-02-17 14:44:33 +01:00
Lukas Niemeier
e03d4cfe0c
# better racelogevent dispatching for serialization and persistence
2013-02-17 14:32:49 +01:00
Lukas Niemeier
9053a8eab0
# added serializer and deserializer logic for RaceLogRaceStatus...
2013-02-12 20:24:22 +01:00
Armin Zamani
2835d31357
added the record race log event operation
2013-02-11 00:03:13 +01:00
Armin Zamani
8ac062f3f2
Introduced RaceLogStore to RaceColumnInSeries
2013-02-10 21:42:05 +01:00
Lukas Niemeier
b872aa1499
# minor code clean ups
2013-02-10 02:17:10 +01:00
Lukas Niemeier
b806ed9e5e
# Readded servlet to receive RaceEvents
2013-02-09 20:01:25 +01:00
Lukas Niemeier
1fefd2ea17
# Added a (for now empty) shared domain bundle
...
# Another round of changes in the communication between app and server
# This time actual "race rows" are transmitted to the application - created by "transposing" the RaceColumns of a Leaderboard
# Each RaceRow contains it Fleet and several RaceCells. A RaceCell consists of a name and a RaceLog
# Removed a bunch of now unused data structures and serialization facilities
2013-02-09 19:02:46 +01:00
Armin Zamani
7d6d72785e
removed all RaceLog methods from TrackedRace and TrackedRaceImpl and
...
DynamicTrackedRace
changed TrackedRaceImpl constructor again, all calling methods are
changed appropriately
2013-02-09 01:10:39 +01:00
Lukas Niemeier
61dec32f17
# moved some code in gateway
2013-02-08 11:17:04 +01:00
Lukas Niemeier
ca61dc52e5
# cleaned up some EventsJsonExportServlet code
2013-02-08 01:31:24 +01:00
Axel Uhl
ca498cb1e3
removed rome stuff from build.properties
2013-02-07 18:40:28 +01:00
fmittag
7285fecebc
fixed manifest.mf for import of rome.jar
2013-02-07 16:45:01 +01:00
Simon Pamies
55f333b55a
Deleted rome.jar
2013-02-07 16:09:03 +01:00
Simon Pamies
acf2c74fc4
Moving rome library to target platform
2013-02-07 16:08:44 +01:00
fmittag
5c4fa62df7
added .csv export for ESS40
...
added details parameter for html export of overall leaderboards
2013-02-07 14:55:51 +01:00
Lukas Niemeier
9ab84c5eb0
# working towards receiving racelogs...
2013-02-06 17:33:49 +01:00
fmittag
48ce5e2e05
created overall leaderboard and added totalPoints column to both leaderboards
2013-02-06 14:45:04 +01:00
Lukas Niemeier
ba03950f23
# removed unused servlet
2013-02-05 19:30:23 +01:00
Lukas Niemeier
339f930a83
# reworked serialization to use Leaderboards rather than Regatta.getRaces...
...
# deserialization of all relevant types on app side
2013-02-05 19:29:12 +01:00
fmittag
810af99c80
moved ESS40 specific leaderboard files to new bundle com.sap.sailing.server.gateway.ess40
2013-02-05 18:45:06 +01:00
fmittag
35dbd8033d
some minor css fixes
2013-02-05 16:32:50 +01:00
Marcus Kammer
760b9681f1
Merge branch 'csv_html_export' of ssh://kielweek.web4sap.com/home/trac/git into csv_html_export
2013-02-05 14:28:09 +01:00
Marcus Kammer
03b2fde66f
Change styles
2013-02-05 14:27:58 +01:00
Marcus Kammer
d9809e2296
Addstyles for last-row
2013-02-05 14:27:46 +01:00
Marcus Kammer
d2c7d360dc
Add styeles for last-row
2013-02-05 14:07:27 +01:00
Marcus Kammer
f7a8cddee0
Set absolute width to Rank cell.
2013-02-05 14:07:06 +01:00
Lukas Niemeier
c40ca74218
# small fix in SeriesOfRegattaExtensionSerializer
...
# moved some code to method local vars
2013-02-05 14:01:12 +01:00
Lukas Niemeier
e2842c4b68
# serialization of FleetWithRaces
...
# used in regatta api of server
2013-02-05 12:28:39 +01:00
fmittag
d34da5b1a3
Merge remote-tracking branch 'origin/csv_html_export' into csv_html_export
2013-02-05 12:21:22 +01:00
Marcus Kammer
bd3eaf7422
Add styles.
2013-02-05 12:16:53 +01:00
Marcus Kammer
000a96e413
Add styles
2013-02-05 12:14:08 +01:00
Marcus Kammer
113f8cea02
Add td background image.
2013-02-05 12:13:52 +01:00
Marcus Kammer
418f094e8e
Add styles.
2013-02-05 12:13:03 +01:00
Marcus Kammer
a9e598a892
Set colour of sorting arrows to white
2013-02-05 12:12:58 +01:00
Marcus Kammer
f5de902986
Add background gra[hic for leaderboard
2013-02-05 10:50:11 +01:00
fmittag
2110bdf724
little cleanup
2013-02-04 17:37:07 +01:00
fmittag
10a8c86a08
leaderboard export as html with sorting
2013-02-04 15:45:48 +01:00
Lukas Niemeier
23a7aa41c6
# removed example event code
2013-02-03 00:39:51 +01:00
Lukas Niemeier
ad6b6fa37c
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/RaceCommitteeEventFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/impl/RaceCommitteeEventFactoryImpl.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogEventTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogFlagEventSerializerTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogStartTimeEventSerializerTest.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeFlagEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeStartTimeEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BaseRaceLogEventSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeEventSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeStartTimeEventSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogFlagEventSerializer.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventTrackJsonExportServlet.java
2013-02-03 00:13:16 +01:00
Lukas Niemeier
c5241f3468
# Prepared: RegattaRaces API filters by course area
...
# More app code migrated from old version into new code base
2013-02-02 23:48:46 +01:00
Armin Zamani
a2231263f7
Sailing Events are fully replicated when created/added, added
...
replication test for event creation
2013-02-02 19:04:24 +01:00
Armin Zamani
02b225f307
Renamed RaceCommittee to RaceLog
2013-02-02 16:34:53 +01:00
Lukas Niemeier
061e695815
# events serializing ids of competitors (field involvedBoats)
2013-02-02 15:14:50 +01:00
Lukas Niemeier
e45040db9b
# added CourseAreaChangedEvent and serializers
2013-02-02 15:01:03 +01:00
Lukas Niemeier
Armin Zamani
Axel Uhl
fmittag
Simon Pamies
Marcus Kammer