eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 13:45:42 +00:00
Code Activity

Merge branch 'master' into bug5773

Browse Source 
# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
This commit is contained in:
Udo Wessels
2023-07-31 09:09:27 +02:00
parent ce2bbdd988 47ee95cb37
commit 4ba619cd66
71 changed files with 752 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/MaxPointsReason.java
+3 -3
View File
@@ -32,7 +32,7 @@ public enum MaxPointsReason {
/** Disqualification for gross misconduct not excludable under rule 90.3 (b) */
DGM(/* discardable */ false, /* advanceCompetitorsTrackedWorse */ true, /* appliesAtStartOfRace */ false),
/** Redress given */
RDG(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ false, /* appliesAtStartOfRace */ false),
RDG(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ false, /* appliesAtStartOfRace */ true, /* calculateScoreDuringRace */ true),
/** Black Flag Disqualified */
BFD(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ true, /* appliesAtStartOfRace */ true),
/** Did Not Compete */
@@ -40,7 +40,7 @@ public enum MaxPointsReason {
/** Retired After Finishing */
RAF(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ true, /* appliesAtStartOfRace */ false),
/** Discretionary Penalty Imposed by the race committee */
DPI(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ false, /* appliesAtStartOfRace */ false),
DPI(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ false, /* appliesAtStartOfRace */ true, /* calculateScoreDuringRace */ true),
/** Retired */
RET(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ true, /* appliesAtStartOfRace */ false),
/** Uniform Flag Disqualification */
@@ -60,7 +60,7 @@ public enum MaxPointsReason {
* A9b: "points equal to the average, to the nearest tenth of a point (0.05 to be rounded upward), of her points in
* all the races before the race in question"
*/
SCA(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ false, /* appliesAtStartOfRace */ false)
SCA(/* discardable */ true, /* advanceCompetitorsTrackedWorse */ false, /* appliesAtStartOfRace */ true)
;
private final boolean discardable;
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
+8
View File
@@ -42,6 +42,8 @@ public class LeaderboardEntryDTO implements Serializable {
public Double totalPoints;
public Double totalPointsUncorrected;
public Double incrementalScoreCorrectionInPoints;
/**
* Tells if the total points have been overridden by a score correction. Can be used to render differently in editing environment.
*/
@@ -653,6 +655,7 @@ public class LeaderboardEntryDTO implements Serializable {
result = prime * result + ((totalPoints == null) ? 0 : totalPoints.hashCode());
result = prime * result + (totalPointsCorrected ? 1231 : 1237);
result = prime * result + ((totalPointsUncorrected == null) ? 0 : totalPointsUncorrected.hashCode());
result = prime * result + ((incrementalScoreCorrectionInPoints == null) ? 0 : incrementalScoreCorrectionInPoints.hashCode());
result = prime * result + ((windwardDistanceToCompetitorFarthestAheadInMeters == null) ? 0
: windwardDistanceToCompetitorFarthestAheadInMeters.hashCode());
return result;
@@ -809,6 +812,11 @@ public class LeaderboardEntryDTO implements Serializable {
return false;
} else if (!totalPoints.equals(other.totalPoints))
return false;
if (incrementalScoreCorrectionInPoints == null) {
if (other.incrementalScoreCorrectionInPoints != null)
return false;
} else if (!incrementalScoreCorrectionInPoints.equals(other.incrementalScoreCorrectionInPoints))
return false;
if (totalPointsCorrected != other.totalPointsCorrected)
return false;
if (totalPointsUncorrected == null) {