mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Merge remote-tracking branch 'server/master'
This commit is contained in:
commit
ccb8b9360f
8 files changed
+43
-29
No files matched your search
+10
-10
@@ -19,25 +19,25 @@ public abstract class AbstractCompetitorRegistrationDialog extends DataEntryDial
|
||||
protected final SailingServiceAsync sailingService;
|
||||
protected final StringMessages stringMessages;
|
||||
protected final String leaderboardName;
|
||||
protected final boolean canBoatsOfCompetitorsChangePerRace;
|
||||
protected final CompetitorRegistrationsPanel competitorRegistrationsPanel;
|
||||
|
||||
public AbstractCompetitorRegistrationDialog(SailingServiceWriteAsync sailingServiceWrite, final UserService userService, StringMessages stringMessages,
|
||||
ErrorReporter errorReporter, boolean editable,
|
||||
public AbstractCompetitorRegistrationDialog(SailingServiceWriteAsync sailingServiceWrite,
|
||||
final UserService userService, StringMessages stringMessages, ErrorReporter errorReporter, boolean editable,
|
||||
com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback<Set<CompetitorDTO>> callback,
|
||||
String leaderboardName, boolean canBoatsOfCompetitorsChangePerRace, String boatClass, String okButtonMessage,
|
||||
Validator<Set<CompetitorDTO>> validator) {
|
||||
String leaderboardName, boolean canBoatsOfCompetitorsChangePerRace, String boatClass,
|
||||
String okButtonMessage, Validator<Set<CompetitorDTO>> validator) {
|
||||
super(stringMessages.registerCompetitors(), /* messsage */null, okButtonMessage, stringMessages.cancel(),
|
||||
validator, callback);
|
||||
this.errorReporter = errorReporter;
|
||||
this.stringMessages = stringMessages;
|
||||
this.sailingService = sailingServiceWrite;
|
||||
this.leaderboardName = leaderboardName;
|
||||
this.canBoatsOfCompetitorsChangePerRace = canBoatsOfCompetitorsChangePerRace;
|
||||
this.competitorRegistrationsPanel = new CompetitorRegistrationsPanel(sailingServiceWrite, userService, stringMessages, errorReporter, editable, leaderboardName, canBoatsOfCompetitorsChangePerRace, boatClass,
|
||||
()->validateAndUpdate(), getRegisteredCompetitorsRetriever(), /* restrictPoolToLeaderboard */ false, getAdditionalWidgetsToInsertAboveCompetitorTables(stringMessages));
|
||||
this.competitorRegistrationsPanel = new CompetitorRegistrationsPanel(sailingServiceWrite, userService,
|
||||
stringMessages, errorReporter, editable, leaderboardName, canBoatsOfCompetitorsChangePerRace, boatClass,
|
||||
() -> validateAndUpdate(), getRegisteredCompetitorsRetriever(), /* restrictPoolToLeaderboard */ false,
|
||||
getAdditionalWidgetsToInsertAboveCompetitorTables(stringMessages));
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected Widget getAdditionalWidget() {
|
||||
return competitorRegistrationsPanel;
|
||||
@@ -49,6 +49,6 @@ public abstract class AbstractCompetitorRegistrationDialog extends DataEntryDial
|
||||
}
|
||||
|
||||
protected abstract Consumer<AsyncCallback<Collection<CompetitorDTO>>> getRegisteredCompetitorsRetriever();
|
||||
|
||||
|
||||
protected abstract Widget[] getAdditionalWidgetsToInsertAboveCompetitorTables(StringMessages stringMessages);
|
||||
}
|
||||
+6
-4
@@ -143,10 +143,12 @@ public class CompetitorRegistrationsPanel extends FlowPanel implements BusyDispl
|
||||
final HorizontalPanel competitorRegistrationPanel = new HorizontalPanel();
|
||||
final CaptionPanel allCompetitorsPanel = new CaptionPanel(stringMessages.competitorPool());
|
||||
final CaptionPanel registeredCompetitorsPanel = new CaptionPanel(stringMessages.registeredCompetitors());
|
||||
allCompetitorsTable = new CompetitorTableWrapper<>(sailingServiceWrite, userService, stringMessages, errorReporter, /* multiSelection */
|
||||
true, /* enablePager */true, /* filterCompetitorWithBoat */ canBoatsOfCompetitorsChangePerRace, /* filterCompetitorsWithoutBoat */ !canBoatsOfCompetitorsChangePerRace);
|
||||
registeredCompetitorsTable = new CompetitorTableWrapper<>(sailingServiceWrite, userService, stringMessages, errorReporter, /* multiSelection */
|
||||
true, /* enablePager */false, /* filterCompetitorWithBoat */ false, /* filterCompetitorsWithoutBoat */ false);
|
||||
allCompetitorsTable = new CompetitorTableWrapper<>(sailingServiceWrite, userService, stringMessages,
|
||||
errorReporter, /* multiSelection */ true, /* enablePager */ true, /* filterCompetitorWithBoat */ false,
|
||||
/* filterCompetitorsWithoutBoat */ !canBoatsOfCompetitorsChangePerRace);
|
||||
registeredCompetitorsTable = new CompetitorTableWrapper<>(sailingServiceWrite, userService, stringMessages,
|
||||
errorReporter, /* multiSelection */ true, /* enablePager */ false, /* filterCompetitorWithBoat */ false,
|
||||
/* filterCompetitorsWithoutBoat */ false);
|
||||
registeredCompetitorsTable.getSelectionModel().addSelectionChangeHandler(event -> validateAndUpdate());
|
||||
allCompetitorsPanel.add(allCompetitorsTable);
|
||||
registeredCompetitorsPanel.add(registeredCompetitorsTable);
|
||||
|
||||
+1
-1
@@ -367,7 +367,7 @@ public interface SailingServiceAsync extends RemoteReplicationServiceAsync {
|
||||
void getLeaderboardGroupNamesAndIdsAsStringsFromRemoteServer(String host, String username, String password,
|
||||
AsyncCallback<Map<String, String>> leaderboardGroups);
|
||||
|
||||
void getCompetitors(boolean filterCompetitorsWithBoat, boolean filterCompetitorsWithoutBoat, AsyncCallback<Iterable<CompetitorDTO>> asyncCallback);
|
||||
void getCompetitors(boolean ignoreCompetitorsWithBoat, boolean ignoreCompetitorsWithoutBoat, AsyncCallback<Iterable<CompetitorDTO>> asyncCallback);
|
||||
|
||||
void getCompetitorsOfLeaderboard(String leaderboardName, AsyncCallback<Iterable<CompetitorDTO>> asyncCallback);
|
||||
|
||||
|
||||
+8
-8
@@ -4679,17 +4679,17 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
|
||||
}
|
||||
|
||||
@Override
|
||||
//READ
|
||||
public Iterable<CompetitorDTO> getCompetitors(boolean filterCompetitorsWithBoat,
|
||||
boolean filterCompetitorsWithoutBoat) {
|
||||
//READ
|
||||
public Iterable<CompetitorDTO> getCompetitors(boolean ignoreCompetitorsWithBoat,
|
||||
boolean ignoreCompetitorsWithoutBoat) {
|
||||
CompetitorAndBoatStore competitorStore = getService().getBaseDomainFactory().getCompetitorAndBoatStore();
|
||||
final HasPermissions.Action[] requiredActionsForRead = SecuredSecurityTypes.PublicReadableActions.READ_AND_READ_PUBLIC_ACTIONS;
|
||||
final Iterable<? extends Competitor> filteredCompetitors;
|
||||
if (filterCompetitorsWithBoat == false && filterCompetitorsWithoutBoat == false) {
|
||||
if (ignoreCompetitorsWithBoat == false && ignoreCompetitorsWithoutBoat == false) {
|
||||
filteredCompetitors = competitorStore.getAllCompetitors();
|
||||
} else if (filterCompetitorsWithBoat == true && filterCompetitorsWithoutBoat == false) {
|
||||
} else if (ignoreCompetitorsWithBoat == true && ignoreCompetitorsWithoutBoat == false) {
|
||||
filteredCompetitors = competitorStore.getCompetitorsWithoutBoat();
|
||||
} else if (filterCompetitorsWithBoat == false && filterCompetitorsWithoutBoat == true) {
|
||||
} else if (ignoreCompetitorsWithBoat == false && ignoreCompetitorsWithoutBoat == true) {
|
||||
filteredCompetitors = competitorStore.getCompetitorsWithBoat();
|
||||
} else {
|
||||
filteredCompetitors = Collections.emptyList();
|
||||
@@ -4701,7 +4701,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
|
||||
}
|
||||
|
||||
@Override
|
||||
//READ
|
||||
//READ
|
||||
public Iterable<CompetitorDTO> getCompetitorsOfLeaderboard(String leaderboardName) {
|
||||
Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);
|
||||
getSecurityService().checkCurrentUserReadPermission(leaderboard);
|
||||
@@ -4709,7 +4709,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
|
||||
}
|
||||
|
||||
@Override
|
||||
//READ
|
||||
//READ
|
||||
public Map<? extends CompetitorDTO, BoatDTO> getCompetitorsAndBoatsOfRace(String leaderboardName,
|
||||
String raceColumnName, String fleetName) throws NotFoundException {
|
||||
getSecurityService().checkCurrentUserReadPermission(getLeaderboardByName(leaderboardName));
|
||||
|
||||
@@ -173,6 +173,14 @@ name to make sure you get to the event you're interested in.
|
||||
<td>/api/v1/regattas/{regattaname}/competitors/{competitorId}/remove</td>
|
||||
<td>Removes a competitor from a regatta (POST)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="regattaUpdateCompetitorToDHandicapPostDoc.html">/api/v1/regattas/{regattaname}/competitors/{competitorId}/updateToDHandicap</a></td>
|
||||
<td>Updates a competitor's time on distance allowance per nautical mile handicap value. (POST)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="regattaUpdateCompetitorToTHandicapPostDoc.html">/api/v1/regattas/{regattaname}/competitors/{competitorId}/updateToTHandicap</a></td>
|
||||
<td>Updates a competitor's time on time handicap value. (POST)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="regattasTrackingDevicesGet.html">/api/v1/regattas/{regattaName}/tracking_devices</a></td>
|
||||
<td>Gets the status for all GPS trackers associated to a regatta (GET)</td>
|
||||
|
||||
+2
-3
@@ -12,7 +12,7 @@
|
||||
<h2>URL: /api/v1/regattas/{regattaId}/competitors/{competitorId}/updateToDHandicap</h2>
|
||||
|
||||
<b>Description:</b>
|
||||
<p>Updates a competitor's time on distance allowance per nautical mile handicap value. This overrites the competitor's default handicap value in context of a single regatta.</p>
|
||||
<p>Updates a competitor's time on distance allowance per nautical mile handicap value. This overwrites the competitor's default handicap value in context of a single Regatta.</p>
|
||||
<br/>
|
||||
<table>
|
||||
<tr>
|
||||
@@ -39,9 +39,8 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Example:</td>
|
||||
<td>curl "http://127.0.0.1:8888/sailingserver/api/v1/regattas/505 Worlds 2015/competitors/f0941b50-b5ec-0132-20fb-60a44ce903c3/updateToDHandicap?timeOnDistanceAllowancePerNauticalMile=15"</td>
|
||||
<td>"http://www.sapsailing.com/sailingserver/api/v1/regattas/505 Worlds 2015/competitors/f0941b50-b5ec-0132-20fb-60a44ce903c3/updateToDHandicap?timeOnDistanceAllowancePerNauticalMile=15"</td>
|
||||
</tr>
|
||||
</tr>
|
||||
</table>
|
||||
<div style="height: 1em;"></div>
|
||||
<a href="index.html">Back to Web Service Overview</a>
|
||||
|
||||
+2
-3
@@ -12,7 +12,7 @@
|
||||
<h2>URL: /api/v1/regattas/{regattaId}/competitors/{competitorId}/updateToTHandicap</h2>
|
||||
|
||||
<b>Description:</b>
|
||||
<p>Updates a competitor's time on time handicap value. This overrites the competitor's default handicap value in context of a single regatta.</p>
|
||||
<p>Updates a competitor's time on time handicap value. This overwrites the competitor's default handicap value in context of a single Regatta.</p>
|
||||
<br/>
|
||||
<table>
|
||||
<tr>
|
||||
@@ -39,9 +39,8 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Example:</td>
|
||||
<td>curl "http://www.sapsailing.com/sailingserver/api/v1/regattas/505 Worlds 2015/competitors/f0941b50-b5ec-0132-20fb-60a44ce903c3/updateToTHandicap?timeOnTimeFactor=1.5"</td>
|
||||
<td>"http://www.sapsailing.com/sailingserver/api/v1/regattas/505 Worlds 2015/competitors/f0941b50-b5ec-0132-20fb-60a44ce903c3/updateToTHandicap?timeOnTimeFactor=1.5"</td>
|
||||
</tr>
|
||||
</tr>
|
||||
</table>
|
||||
<div style="height: 1em;"></div>
|
||||
<a href="index.html">Back to Web Service Overview</a>
|
||||
|
||||
@@ -39,6 +39,12 @@
|
||||
not the competitor-local handicap values which may have been adjusted at regatta level, overriding the
|
||||
default values that the competitor object provides. Compare with
|
||||
<tt>/sailingserver/api/v1/competitors/{competitorId}</tt>.</li>
|
||||
<li>Fixed a problem with assigning existing competitors (with boats) to regattas that are
|
||||
configured for competitors changing boats across races. Previously, competitors used
|
||||
in regattas where competitors don't change boats were not selectable for regattas
|
||||
where competitors <em>do</em> change boats. This is now changes such that competitors
|
||||
with boat assignments can also be used (without their boat assignments) in regattas
|
||||
where competitors change boats.</li>
|
||||
</ul>
|
||||
<h2 class="articleSubheadline">June 2020</h2>
|
||||
<ul class="bulletList">
|
||||
|
||||
Reference in new issue
Block a user