From d2fe91fac9e958baceb84bd5d87e0f5eda2e9a7b Mon Sep 17 00:00:00 2001 From: Robin Kuck Date: Mon, 4 Jun 2018 17:59:25 +0200 Subject: [PATCH] bug4469 added boat change tolerance to dto parameters --- .../sailing/domain/common/dto/PairingListTemplateDTO.java | 4 ++-- .../gwt/ui/adminconsole/PairingListCreationSetupDialog.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PairingListTemplateDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PairingListTemplateDTO.java index 7e2a7274163..c99aaf73e73 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PairingListTemplateDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/PairingListTemplateDTO.java @@ -18,8 +18,8 @@ public class PairingListTemplateDTO implements Serializable { public PairingListTemplateDTO() { } - public PairingListTemplateDTO(int competitorCount, int flightMultiplier) { - this(0, 0, competitorCount, flightMultiplier, 0, null, 0.0, /* selected flight names */ null); + public PairingListTemplateDTO(int competitorCount, int flightMultiplier, int tolerance) { + this(0, 0, competitorCount, flightMultiplier, tolerance, null, 0.0, /* selected flight names */ null); } public PairingListTemplateDTO(int competitorCount, int flightMultiplier, int[][] pairingListTemplate, double quality) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java index 193dd8f7e0b..6b775714167 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java @@ -120,7 +120,7 @@ public class PairingListCreationSetupDialog extends AbstractPairingListCreationS @Override protected PairingListTemplateDTO getResult() { PairingListTemplateDTO dto = new PairingListTemplateDTO(this.competitorCountTextBox.getValue(), - this.flightMultiplierTextBox.getValue()); + this.flightMultiplierTextBox.getValue(), this.boatChangeFactorListBox.getSelectedIndex()); if (Util.size(this.getCheckedSelectedCheckBoxes()) > 0) { String seriesName = Util.get(this.getCheckedSelectedCheckBoxes(), 0).getText(); dto.setGroupCount( @@ -255,8 +255,7 @@ public class PairingListCreationSetupDialog extends AbstractPairingListCreationS private void updateBoatChangeFactorSelection(final int fleetCount) { this.boatChangeFactorListBox.clear(); - IntStream.range(1, getCompetitorCountInput() / fleetCount) - .forEach(i -> { + IntStream.range(0, (getCompetitorCountInput() / fleetCount) + 1).forEach(i -> { this.boatChangeFactorListBox.addItem(String.valueOf(i)); }); }