eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 22:30:56 +00:00
Code Activity

use RegattaDTO from allRegattas instead of querying it from the server again

Browse Source 
Change-Id: I26431ae42d1f7e7fc0132c168feabe62ec5a363c
This commit is contained in:
Axel Uhl committed 2016-08-17 11:33:35 +02:00
1 parent 5c74e44662
commit 1736124733
2 files changed
+47 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java
+26
View File
@@ -701,4 +701,30 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
}
});
}
/**
* Looks up the regatta for the selected leaderboard by name in {@link #allRegattas}
*/
protected RegattaDTO getSelectedRegatta() {
final String regattaName = getSelectedLeaderboard().regattaName;
return getRegattaByName(regattaName);
}
/**
* Looks up a regatta with name {@code regattaName} in {@link #allRegattas}
*/
protected RegattaDTO getRegattaByName(final String regattaName) {
RegattaDTO regatta = null;
if (regattaName != null) {
if (allRegattas != null) {
for (RegattaDTO i : allRegattas) {
if (regattaName.equals(i.getName())) {
regatta = i;
break;
}
}
}
}
return regatta;
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SmartphoneTrackingEventManagementPanel.java
+21 -40
View File
@@ -556,37 +556,28 @@ public class SmartphoneTrackingEventManagementPanel extends AbstractLeaderboardC
}
private void updateRegattaConfigDesignerModeToByMarks(final String regattaName) {
sailingService.getRegattaByName(regattaName,new MarkedAsyncCallback<RegattaDTO>(
new AsyncCallback<RegattaDTO>() {
@Override
public void onFailure(Throwable t) {
errorReporter.reportError("Error trying to get ragatta with name " + regattaName + " : "
+ t.getMessage());
}
final RegattaDTO regatta = getRegattaByName(regattaName);
if (regatta != null) {
DeviceConfigurationDTO.RegattaConfigurationDTO configuration = regatta.configuration;
if (configuration == null) {
configuration = new DeviceConfigurationDTO.RegattaConfigurationDTO();
configuration.defaultCourseDesignerMode = CourseDesignerMode.BY_MARKS;
} //TODO: Show message if regatta has configuration with design mode not equal "By marks"
@Override
public void onSuccess(RegattaDTO regatta) {
DeviceConfigurationDTO.RegattaConfigurationDTO configuration = regatta.configuration;
if (configuration == null) {
configuration = new DeviceConfigurationDTO.RegattaConfigurationDTO();
configuration.defaultCourseDesignerMode = CourseDesignerMode.BY_MARKS;
} //TODO: Show message if regatta has configuration with design mode not equal "By marks"
final RegattaIdentifier regattaIdentifier = new RegattaName(regatta.getName());
sailingService.updateRegatta(regattaIdentifier, regatta.startDate, regatta.endDate, regatta.defaultCourseAreaUuid,
configuration, regatta.useStartTimeInference, new MarkedAsyncCallback<Void>(new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
errorReporter.reportError("Error trying to update regatta " + regattaName + ": "
+ caught.getMessage());
}
final RegattaIdentifier regattaIdentifier = new RegattaName(regatta.getName());
sailingService.updateRegatta(regattaIdentifier, regatta.startDate, regatta.endDate, regatta.defaultCourseAreaUuid,
configuration, regatta.useStartTimeInference, new MarkedAsyncCallback<Void>(new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable caught) {
errorReporter.reportError("Error trying to update regatta " + regattaName + ": "
+ caught.getMessage());
}
@Override
public void onSuccess(Void result) {
}
}));
}
}));
@Override
public void onSuccess(Void result) {
}
}));
}
}
private void denoteForRaceLogTracking(final RaceColumnDTO raceColumn, final FleetDTO fleet) {
@@ -754,17 +745,7 @@ public class SmartphoneTrackingEventManagementPanel extends AbstractLeaderboardC
private void searchBoatClass(final ShowWithBoatClass showWithBoatClass) {
final String result;
RegattaDTO regatta = null;
if (getSelectedLeaderboard().regattaName != null) {
if (allRegattas != null) {
for (RegattaDTO i : allRegattas) {
if (getSelectedLeaderboard().regattaName.equals(i.getName())) {
regatta = i;
break;
}
}
}
}
RegattaDTO regatta = getSelectedRegatta();
if (regatta != null) {
result = regatta.boatClass.getName();
showWithBoatClass.showWithBoatClass(result);