mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-06 12:23:55 +00:00
make filter safe for null-fleets
This commit is contained in:
1 parent
a79af78835
commit
3f1ff97d60
1 file changed
+4
-1
+4
-1
@@ -42,12 +42,15 @@ public class CompetitorRaceRankFilter extends AbstractNumberFilter<CompetitorDTO
|
||||
}
|
||||
}
|
||||
List<CompetitorDTO> competitors = getLeaderboard().getCompetitorsFromBestToWorst(theRaceColumnDTOThatContainsCompetitorRace);
|
||||
// There may be competitors that have no tracked race assigned in that column and therefore won't have a fleet;
|
||||
// those competitors are to be considered "worse"
|
||||
if (theRaceColumnDTOThatContainsCompetitorRace != null && getLeaderboard().rows.get(competitorDTO) != null) {
|
||||
LeaderboardEntryDTO entryDTO = getLeaderboard().rows.get(competitorDTO).fieldsByRaceColumnName.get(theRaceColumnDTOThatContainsCompetitorRace.getName());
|
||||
int counter = 0; int raceRank = 0;
|
||||
for (CompetitorDTO competitorDTOIterated : competitors) {
|
||||
LeaderboardEntryDTO entryDTOIterated = getLeaderboard().rows.get(competitorDTOIterated).fieldsByRaceColumnName.get(theRaceColumnDTOThatContainsCompetitorRace.getName());
|
||||
if (entryDTOIterated.fleet.equals(entryDTO.fleet)) {
|
||||
if (entryDTOIterated.fleet == null && entryDTO.fleet == null
|
||||
|| entryDTOIterated.fleet != null && entryDTOIterated.fleet.equals(entryDTO.fleet)) {
|
||||
counter += 1;
|
||||
if (competitorDTOIterated.equals(competitorDTO)) {
|
||||
raceRank = counter;
|
||||
|
||||
Reference in new issue
Block a user