eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Merge branch 'master' into translation

Browse Source
This commit is contained in:
Axel Uhl committed 2016-09-26 10:02:10 +02:00
2 parents b68bb3d808 76d68fd76f
commit c90e3ea059
167 files changed
+9671 -7222
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RaceLogScoringReplicator.java
+3 -5
View File
@@ -123,8 +123,6 @@ public class RaceLogScoringReplicator implements RaceColumnListener {
* last {@link RaceLogFinishPositioningListChangedEvent} event with {@link CompetitorResults} is looked up and its
* results are used.
*
* TODO bug 3420: also extract the optional score / finishing time / comment and make good use of it
*
* @param timePoint
* the TimePoint at which the race committee confirmed their last rank list entered in the app.
*/
@@ -148,7 +146,7 @@ public class RaceLogScoringReplicator implements RaceColumnListener {
int rankByRaceCommittee = getRankInPositioningListByRaceCommittee(positionedCompetitor);
correctScoreInLeaderboard(leaderboard, raceColumn, timePoint, numberOfCompetitorsInRace,
competitor, rankByRaceCommittee, positionedCompetitor.getScore());
setMaxPointsReasonInLeaderboardIfNecessary(leaderboard, raceColumn, timePoint, positionedCompetitor, competitor);
setMaxPointsReasonInLeaderboardIfNecessary(leaderboard, raceColumn, timePoint, positionedCompetitor.getMaxPointsReason(), competitor);
}
// Since the metadata update is used by the Sailing suite to determine the final state of a race, it has to
// be triggered, even though no score correction may have been performed
@@ -157,10 +155,10 @@ public class RaceLogScoringReplicator implements RaceColumnListener {
}
private boolean setMaxPointsReasonInLeaderboardIfNecessary(Leaderboard leaderboard, RaceColumn raceColumn,
TimePoint timePoint, CompetitorResult positionedCompetitor, Competitor competitor) {
TimePoint timePoint, MaxPointsReason maxPointsReason, Competitor competitor) {
boolean scoreHasBeenCorrected = false;
MaxPointsReason oldMaxPointsReason = leaderboard.getMaxPointsReason(competitor, raceColumn, timePoint);
MaxPointsReason maxPointsReasonByRaceCommittee = positionedCompetitor.getMaxPointsReason();
MaxPointsReason maxPointsReasonByRaceCommittee = maxPointsReason;
if (!Util.equalsWithNull(maxPointsReasonByRaceCommittee, oldMaxPointsReason)) {
applyMaxPointsReasonOperation(leaderboard, raceColumn, competitor, maxPointsReasonByRaceCommittee, timePoint);
scoreHasBeenCorrected = true;
java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java
-1
View File
@@ -294,7 +294,6 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic
public void notifyUserOnCompetitorPassesFinish(Competitor competitor, TrackedRace trackedRace,
Leaderboard leaderboard, RaceColumn raceColumn, Fleet fleet) {
doWithEvent(leaderboard, (event, leaderboardGroup) -> {
mailQueue.addNotification(new NotificationSetNotification<Competitor>(competitor, competitorResults) {
@Override
protected NotificationMailTemplate getMailTemplate(Competitor objectToNotifyAbout, Locale locale) {