eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 01:16:40 +00:00
Code Activity

removed FIXME; append /fleetName to list of races containing mark

Browse Source 
Change-Id: I62facd34621de2080a94c710ab4d2272b71200ef
This commit is contained in:
Axel Uhl
2016-01-18 15:51:00 +01:00
parent cf9dd8f662
commit a5e4ccb465
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogCourseManagementWidget.java
+2 -3
View File
@@ -126,12 +126,11 @@ public class RaceLogCourseManagementWidget extends CourseManagementWidget {
@Override
protected void markSelectionChanged() {
Set<MarkDTO> marksToRemove = marks.getSelectionModel().getSelectedSet();
sailingService.checkIfMarksAreUsedInOtherRaceLogs(leaderboardName, raceColumnName, fleetName, marksToRemove,
new AsyncCallback<Pair<Boolean, String>>() {
@Override
public void onSuccess(Pair<Boolean, String>result) {
if (result.getA()){
public void onSuccess(Pair<Boolean, String> result) {
if (result.getA()) {
removeMark.setEnabled(false);
removeMark.setTitle(stringMessages.removalOfMarkDisabledMayBeUsedInRaces(result.getB()));
} else {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+4 -5
View File
@@ -5996,11 +5996,10 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
if (raceLog != raceLogToIgnore) {
LastPublishedCourseDesignFinder finder = new LastPublishedCourseDesignFinder(raceLog);
CourseBase course = finder.analyze();
for (Waypoint waypoint: course.getWaypoints()){
for (Mark mark: waypoint.getMarks()){
if (markIds.contains(mark.getId().toString())){
//FIXME: check how to infer race name
racesContainingMarksToDeleteInCourse.add(raceColumn.getName());
for (Waypoint waypoint: course.getWaypoints()) {
for (Mark mark : waypoint.getMarks()){
if (markIds.contains(mark.getId().toString())) {
racesContainingMarksToDeleteInCourse.add(raceColumn.getName()+"/"+fleet.getName());
marksAreUsedInOtherRaceLogs = true;
}
}