mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-09 20:41:10 +00:00
bug3484 set initial value of competitors count
This commit is contained in:
1 parent
d0e6529c5d
commit
4784055ee4
8 files changed
+60
-2
No files matched your search
@@ -0,0 +1,9 @@
|
||||
---
|
||||
VM version: Oct 9 2017 15:07:17 - 81_REL - optU - windows amd64 - 6 - bas2:294982 (mixed mode)
|
||||
|
||||
Time:2017-11-2810:12:27
|
||||
Pid: 15728
|
||||
Hostname: WDFN34222622A
|
||||
current dir: C:\Users\D070307\.git\.projects\sailingcapture\java\com.sap.sailing.gwt.ui
|
||||
---
|
||||
: [14220] 10:12:27 ***Warning: DebuggingOnDemand was deactivated
|
||||
+8
-2
@@ -25,7 +25,7 @@ public class PairingListCreationSetupDialog extends PairingListCreationDialog {
|
||||
public PairingListCreationSetupDialog(RegattaDTO regattaDTO, StringMessages stringMessages,
|
||||
DialogCallback<PairingListTemplateDTO> callback) {
|
||||
|
||||
super(new RegattaName(regattaDTO.getName()), stringMessages, null, callback); // TODO initial value
|
||||
super(new RegattaName(regattaDTO.getName()), stringMessages, null, callback);
|
||||
|
||||
this.groupCount = Util.size(regattaDTO.series.get(0).getFleets());
|
||||
|
||||
@@ -43,7 +43,6 @@ public class PairingListCreationSetupDialog extends PairingListCreationDialog {
|
||||
});
|
||||
|
||||
this.flightMultiplierCheckBox.ensureDebugId("CompetitorCountTextBox");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -70,4 +69,11 @@ public class PairingListCreationSetupDialog extends PairingListCreationDialog {
|
||||
dto.setFlightMultiplier(this.flightMultiplierTextBox.getValue());
|
||||
return dto;
|
||||
}
|
||||
|
||||
public void setDefaultCompetitorCount(int competitorCount) {
|
||||
if (this.competitorCountTextBox.getValue() == 0) {
|
||||
this.competitorCountTextBox.setValue(competitorCount);
|
||||
this.validateAndUpdate();
|
||||
}
|
||||
}
|
||||
}
|
||||
+12
@@ -26,6 +26,7 @@ import com.google.gwt.view.client.ListDataProvider;
|
||||
import com.google.gwt.view.client.SelectionChangeEvent;
|
||||
import com.sap.sailing.domain.common.RegattaIdentifier;
|
||||
import com.sap.sailing.domain.common.RegattaName;
|
||||
import com.sap.sailing.domain.common.dto.CompetitorDTO;
|
||||
import com.sap.sailing.domain.common.dto.PairingListTemplateDTO;
|
||||
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
|
||||
import com.sap.sailing.gwt.ui.client.RegattasDisplayer;
|
||||
@@ -304,6 +305,17 @@ public class RegattaListComposite extends Composite implements RegattasDisplayer
|
||||
}
|
||||
});
|
||||
dialog.show();
|
||||
|
||||
sailingService.getCompetitorsFromRegatta(regattaIdentifier, new AsyncCallback<Iterable<CompetitorDTO>>() {
|
||||
|
||||
@Override
|
||||
public void onFailure(Throwable caught) { }
|
||||
|
||||
@Override
|
||||
public void onSuccess(Iterable<CompetitorDTO> result) {
|
||||
dialog.setDefaultCompetitorCount(Util.size(result));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void openPairingListCreationDialog(RegattaIdentifier regattaIdentifier, PairingListTemplateDTO template) {
|
||||
|
||||
+2
@@ -684,6 +684,8 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
|
||||
*/
|
||||
List<DetailType> determineDetailTypes(String leaderboardGroupName, RegattaAndRaceIdentifier identifier);
|
||||
|
||||
Iterable<CompetitorDTO> getCompetitorsFromRegatta(RegattaIdentifier regattaIdentifier);
|
||||
|
||||
PairingListTemplateDTO calculatePairingList(RegattaIdentifier regattaIdentifier, int competitorsCount, int flightMultiplier);
|
||||
|
||||
|
||||
|
||||
+2
@@ -848,6 +848,8 @@ public interface SailingServiceAsync extends ServerInfoRetriever, FileStorageMan
|
||||
void determineDetailTypes(String leaderboardGroupName, RegattaAndRaceIdentifier identifier,
|
||||
AsyncCallback<List<DetailType>> callback);
|
||||
|
||||
void getCompetitorsFromRegatta(RegattaIdentifier regattaIdentifier, AsyncCallback<Iterable<CompetitorDTO>> callback);
|
||||
|
||||
void calculatePairingList(RegattaIdentifier regattaIdentifier, int competitorCount, int flightMultiplier,
|
||||
AsyncCallback<PairingListTemplateDTO> callback);
|
||||
}
|
||||
+5
@@ -6650,6 +6650,11 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
return availableDetailsTypes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterable<CompetitorDTO> getCompetitorsFromRegatta(RegattaIdentifier regattaIdentifier) {
|
||||
return convertToCompetitorDTOs(getService().getCompetitorsFromRegatta(regattaIdentifier));
|
||||
}
|
||||
|
||||
@Override
|
||||
public PairingListTemplateDTO calculatePairingList(RegattaIdentifier regattaIdentifier, int competitorsCount,
|
||||
int flightMultiplier) {
|
||||
|
||||
@@ -781,6 +781,22 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
|
||||
*/
|
||||
AnniversaryRaceDeterminator getAnniversaryRaceDeterminator();
|
||||
|
||||
/**
|
||||
* Returns an <code>Iterable</code> of {@link Competitor}.
|
||||
*
|
||||
* @param regattaIdentifier specifies Regatta of which the competitors are about to be fetched.
|
||||
* @return <code>Iterable</code> of {@link Competitor}
|
||||
*/
|
||||
Iterable<Competitor> getCompetitorsFromRegatta(RegattaIdentifier regattaIdentifier);
|
||||
|
||||
/**
|
||||
* Returns a calculated {@link PairingListTemplate}, specified by flights, groups and competitors.
|
||||
*
|
||||
* @param regattaIdentifier {@link RegattaIdentifier} that specifies the flights and groups
|
||||
* @param competitorsCount count of competitor that is given by a dialog
|
||||
* @param flightMultiplier
|
||||
* @return calculated {@link PairingListTemplate}
|
||||
*/
|
||||
PairingListTemplate createPairingListFromRegatta(RegattaIdentifier regattaIdentifier, int competitorsCount,
|
||||
int flightMultiplier);
|
||||
}
|
||||
+6
@@ -4098,6 +4098,12 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
|
||||
return anniversaryRaceDeterminator;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterable<Competitor> getCompetitorsFromRegatta(RegattaIdentifier regattaIdentifier) {
|
||||
Regatta regatta = getRegatta(regattaIdentifier);
|
||||
return regatta.getAllCompetitors();
|
||||
}
|
||||
|
||||
@Override
|
||||
public PairingListTemplate createPairingListFromRegatta(RegattaIdentifier regattaIdentifier, int competitorsCount,
|
||||
int flightMultiplier) {
|
||||
|
||||
Reference in new issue
Block a user