Commit Graph
298 Commits
Author SHA1 Message Date
Axel Uhl 523ebdd36a Merge branch 'master' into permission-vertical
Change-Id: If8263dddd1412bb282fa7504ae56e5cf653eec58
2018-12-07 09:14:11 +01:00
Axel Uhl 4eef1fc182 fixed issues with BoatClassSerializer in case no additional data is present
Change-Id: I0858788ddcd786e60bc8dcde7dd5183a79c8dd0f
2018-12-07 09:13:20 +01:00
Axel Uhl 3e1fd4d89e Merge branch 'master' into permission-vertical
Change-Id: I7d8d8c2baa05eb066997de41f9e643e8f1128c01
2018-12-07 00:31:39 +01:00
Axel Uhl 0262e5268a aligned boat class icon file names with BoatClassMasterdata enum literals and expose icons through gwt.ui web bundle;
added icon URLs and further fields to BoatClassesResource

Change-Id: Ib0bc71521fbe173883ff9d55524a338f0b672f5b
2018-12-07 00:28:56 +01:00
Steffen Schäfer 9c2ff665a7 Merge branch 'master' into permission-vertical
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
	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/jaxrs/api/RestApiApplication.java
	java/com.sap.sailing.server.gateway/webservices/api/v1/index.html
	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java
	java/com.sap.sse.security/META-INF/MANIFEST.MF
2018-10-23 13:10:46 +02:00
Kai Börnert c08e8b4369 bug4768 added multiple parts that will explicitly set permissions,
created an interface to allow most ownable objects to directly return
the QualifiedObjectIdentifier
2018-10-10 13:16:16 +02:00
D067890 7708222141 bug4104: First approach of implementing image service 2018-09-25 16:05:56 +02:00
Axel Uhl 19627ee2fe Merge branch 'master' into permission-vertical;
converted uses of Mode.* to DefaultModes.*

Change-Id: I2790463b1df68a1616971996d20aa4bd5dbbe1d7
2018-09-13 17:55:24 +02:00
RobinFleige ec60c3d679 Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4104 2018-09-13 15:04:17 +02:00
Simon Pamies 770b65da3a Added null checks as value returned by JSON might be empty 2018-09-07 21:12:42 +02:00
Simon Pamies c5a9b737bb Making deserialization more robust against different types of numbers 2018-09-07 17:49:51 +02:00
Henri Kohlberg af5e57c9a2 Bug 4104: Improved JavaDoc coverage and removed unused classes. 2018-09-05 15:05:29 +02:00
D067890 3780459f64 bug4104: Private tags are nor stored in the user storage 2018-08-27 18:37:20 +02:00
D067890 bd52f60cd8 bug4104: Public/Private works 2018-08-16 15:55:49 +02:00
D067890 c79f6d2cee bug4104: While creating tag or button you can set isVisibleForPublic 2018-08-16 13:38:16 +02:00
D067890 208f5663ed bug4104: Tags contain boolean isPublic field 2018-08-16 11:47:57 +02:00
Axel Uhl f213912fec Merge branch 'master' into permission-vertical 2018-07-19 23:18:44 +02:00
Henri Kohlberg 028caf907a Bug 4104: Removed username from RaceLogTagEvent as this information is laready saved in author object. 2018-07-19 17:02:32 +02:00
Henri Kohlberg 85855bfec7 Merge branch 'bug4104' of ssh://sapsailing.com/home/trac/git into bug4104
# Conflicts:
#	java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogTagEventSerializer.java
2018-07-19 08:36:49 +02:00
Henri Kohlberg c42d2bb40b Bug 4104: Tags will show up in right side panel if they were tagged before the current position of time slider (already displayed tags won't be hidden when scrolling back in time), extracted TagDTO to an own class, tags will be stored like other race log events (structure in database) 2018-07-19 08:30:43 +02:00
D067890 7c193d0d9f bug4104: Fixed serialization of RaceLogTagEvents, test is green now 2018-07-18 16:36:57 +02:00
D067890 cadabc0a82 Merge branch 'master' into bug4104
# Conflicts:
#	java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
#	java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2018-07-18 16:16:58 +02:00
D067890 13107bba7b bug4104: RaceLogTagEvents now contain a user name 2018-07-13 10:53:36 +02:00
D067890 902be52661 bug4104: changed type of imageURL to String 2018-07-12 15:43:47 +02:00
D067890 f63e5923dc bug4668: updated deserializer and serializer to turn tests green 2018-07-12 10:25:15 +02:00
D067890 ab00677503 Updated wrong parameter 2018-07-10 12:35:43 +02:00
D067890 b9a21503ae Added access to Deserializer and added further visit method 2018-07-10 10:50:08 +02:00
D067890 0ede320c21 Added RaceLogEvent for tagging, added fitting visit methods 2018-07-09 16:21:25 +02:00
Peter Siegmund 3ad383d42d Merge branch 'master' into bug4239 2018-06-21 12:56:16 +02:00
Axel Uhl 6127967114 Merge branch 'master' into permission-vertical
Change-Id: I056fa53fd62de0aefbcbcb0e52c824f4764e2a27
2018-06-12 22:04:26 +02:00
Maximilian Groß 37917a50a4 Merge branch 'master' into bug4491
# Conflicts:
#	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
#	java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.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/client/StringMessages_fr.properties
#	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
#	java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
2018-05-28 08:35:21 +02:00
Axel Uhl 00c80cb3c3 fixed de-serialization of anniversary race details 2018-05-19 11:32:26 +02:00
Axel Uhl 412836671e Merge branch 'master' into permission-vertical
Change-Id: I96dfc85a9d7aeb76d3e7aa20783da121f207d360
2018-05-15 18:16:39 +02:00
Maximilian Groß e977678869 Merge branch 'master' into bug4491
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
#	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.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_es.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
#	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/jaxrs/api/LeaderboardsResource.java
2018-04-20 13:10:37 +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
Axel Uhl 837004e765 Merge branch 'bug4509' 2018-04-14 10:38:46 +02:00
Axel Uhl df3fc3ffe6 made boat JSON deserialization backward compatible by using competitor ID as default boat ID
Change-Id: I7b6c0431ebe4085d035bd9a64d9b1f4dadad192f
2018-04-13 21:11:55 +02:00
Axel Uhl 4819b285ae Merge branch 'master' into permission-vertical
Change-Id: I34c3acf3abc16da5f37319b0e128a567fda24ab2
2018-04-12 14:29:32 +02:00
Maximilian Groß ed1fae0c8f divided datamining from sailing specific classes 2018-04-12 07:40:59 +02:00
Axel Uhl 1cf923a027 use DynamicCompetitor and DynamicBoat where necessary
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Axel Uhl 07105f65d8 let CompetitorWithBoatRefJsonDeserializer inherit from CompetitorJsonDeserializer
Change-Id: I177b2c1a5a96bb9e9313e86d3535ecd4cc70cce7
2018-04-11 14:19:43 +02:00
Axel Uhl e4e9cdb22c changed CompetitorAndBoat[De]Serializer such that it is backward compatible for CompetitorWithBoat
Change-Id: Ia5717bdef5d9db7833b8d44df061dce524cecf85
2018-04-09 18:23:33 +02:00
Axel Uhl 06447318e5 bug4500: consolidated the two Competitor Json (De-)Serializers into one
Change-Id: I517a2649b6175f11f5e1c7b35fdc439f1982dca4
2018-04-09 16:39:17 +02:00
Axel Uhl 827824f699 re-added "boat" field to competitor serialization for backward compatibility
Change-Id: I01c2d405b5d261b032caefb261f0be18b2f9d026
2018-04-06 17:31:05 +02:00
Axel Uhl 806a4d5c28 Merge branch 'master' into permission-vertical 2018-03-30 23:03:03 +02:00
Axel Uhl 360f72a6a7 Merge branch 'master' into bug2822_boatcolors 2018-03-24 08:49:11 +01:00
Axel Uhl bd90f921dd added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule 2018-03-24 01:45:37 +01:00
Axel Uhl 8f1e5e4229 making it absolutely clear by renaming idClass to competitorIdClass
Change-Id: Ia287e4ae15b1c6aec98dc61dae76e1429c14c8d8
2018-03-19 22:59:26 +01:00
Axel Uhl 3bcff4e918 inserted a block to ensure locality of idClass
Change-Id: I84e1c9f920371d5f15f173b7de90922464e403ee
2018-03-19 22:58:59 +01:00
Axel Uhl 78a1f4caf1 log replacement of a Competitor object with another one with equal ID
Change-Id: I6e35dc8c2160377dec58cba032b33c08e3774445
2018-03-19 21:17:11 +01:00