From b2fbfb3ebffd4ff938c3a51a7ef949c18eb451cc Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Thu, 6 Mar 2014 18:45:29 +0100 Subject: [PATCH] added buttons for defining course and mapping devices --- .../AbstractLeaderboardConfigPanel.java | 4 ++-- .../ui/adminconsole/AdminConsoleResources.java | 6 ++++++ .../RaceLogTrackingEventManagementPanel.java | 5 +++++ ...TrackingEventManagementRaceImagesBarCell.java | 4 ++++ .../sailing/gwt/ui/client/StringMessages.java | 2 ++ .../gwt/ui/client/StringMessages.properties | 4 +++- .../gwt/ui/client/StringMessages_de.properties | 4 +++- .../gwt/ui/client/images/define_course.png | Bin 0 -> 3076 bytes .../sailing/gwt/ui/client/images/map_devices.png | Bin 0 -> 585 bytes 9 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/define_course.png create mode 100644 java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/map_devices.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java index 64c130bf516..65bdd0fff52 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java @@ -230,11 +230,11 @@ TrackedRaceChangedListener { raceColumnTable = new CellTable(/* pageSize */200, tableRes); raceColumnTable.ensureDebugId("RaceColumnTable"); + raceColumnAndFleetList.addDataDisplay(raceColumnTable); + raceColumnTable.setWidth("500px"); addColumnsToRacesTable(raceColumnTable); - raceColumnAndFleetList.addDataDisplay(raceColumnTable); - raceColumnTable.setWidth("500px"); raceColumnTableSelectionModel = new SingleSelectionModel(); raceColumnTable.setSelectionModel(raceColumnTableSelectionModel); raceColumnTableSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleResources.java index 85b0fe5cc8a..cbe7192f037 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleResources.java @@ -73,4 +73,10 @@ interface AdminConsoleResources extends ClientBundle { @Source("com/sap/sailing/gwt/ui/client/images/competitor_registrations.png") ImageResource competitorRegistrations(); + + @Source("com/sap/sailing/gwt/ui/client/images/define_course.png") + ImageResource defineCourse(); + + @Source("com/sap/sailing/gwt/ui/client/images/map_devices.png") + ImageResource mapDevices(); } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementPanel.java index bd46316d018..8bdb3390b34 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementPanel.java @@ -111,6 +111,10 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf boolean editable = object.getB().raceLogTrackingState != RaceLogTrackingState.TRACKING; new CompetitorRegistrationsDialog(sailingService, stringMessages, errorReporter, getSelectedLeaderboardName(), object.getA().getName(), object.getB().getName(), editable).show(); + } else if (RaceLogTrackingEventManagementRaceImagesBarCell.ACTION_DEFINE_COURSE.equals(value)) { + //TODO + } else if (RaceLogTrackingEventManagementRaceImagesBarCell.ACTION_MAP_DEVICES.equals(value)) { + //TODO } } }); @@ -120,6 +124,7 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf racesTable.addColumn(raceLogTrackingStateColumn, stringMessages.raceStatusColumn()); racesTable.addColumn(trackerStateColumn, stringMessages.trackerStatus()); racesTable.addColumn(raceActionColumn, stringMessages.actions()); + racesTable.setWidth("600px"); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementRaceImagesBarCell.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementRaceImagesBarCell.java index 99e87191215..a53edbe67cc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementRaceImagesBarCell.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementRaceImagesBarCell.java @@ -14,6 +14,8 @@ public class RaceLogTrackingEventManagementRaceImagesBarCell extends ImagesBarCe public final static String ACTION_DENOTE_FOR_RACELOG_TRACKING = "ACTION_DENOTE_FOR_RACELOG_TRACKING"; public final static String ACTION_START_RACELOG_TRACKING = "ACTION_START_RACELOG_TRACKING"; public final static String ACTION_COMPETITOR_REGISTRATIONS = "ACTION_COMPETITOR_REGISTRATIONS"; + public final static String ACTION_DEFINE_COURSE = "ACTION_DEFINE_COURSE"; + public final static String ACTION_MAP_DEVICES = "ACTION_MAP_DEVICES"; private final StringMessages stringMessages; private static AdminConsoleResources resources = GWT.create(AdminConsoleResources.class); @@ -40,6 +42,8 @@ public class RaceLogTrackingEventManagementRaceImagesBarCell extends ImagesBarCe if (object.getB().raceLogTrackingState.isForTracking()) { result.add(new ImageSpec(ACTION_COMPETITOR_REGISTRATIONS, stringMessages.competitorRegistrations(), makeImagePrototype(resources.competitorRegistrations()))); + result.add(new ImageSpec(ACTION_DEFINE_COURSE, stringMessages.defineCourse(), makeImagePrototype(resources.defineCourse()))); + result.add(new ImageSpec(ACTION_MAP_DEVICES, stringMessages.mapDevices(), makeImagePrototype(resources.mapDevices()))); } return result; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 3bc59fa5ef6..d16df346354 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -969,4 +969,6 @@ public interface StringMessages extends Messages { String competitorRegistrations(); String trackerStatus(); String canOnlyBeEditedBeforeStartingTracking(); + String defineCourse(); + String mapDevices(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index bfb6d28967b..6da870e464b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -957,4 +957,6 @@ filterByLeaderboard=Filter by Leaderboard removeLeaderboardFilter=Remove Leaderboard filter competitorRegistrations=Competitor Registrations trackerStatus=Tracker Status -canOnlyBeEditedBeforeStartingTracking=Can only be edited before starting tracking \ No newline at end of file +canOnlyBeEditedBeforeStartingTracking=Can only be edited before starting tracking +defineCourse=Define Course Layout +mapDevices=Map Devices to Competitors and Marks \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index a5cc779c205..a227afc4713 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -953,4 +953,6 @@ filterByLeaderboard=Nach Rangliste filtern removeLeaderboardFilter=Nicht nach Rangliste filtern competitorRegistrations=Team Anmeldungen trackerStatus=Tracker-Status -canOnlyBeEditedBeforeStartingTracking=Kann nur vor Beginn des Trackings bearbeitet werden \ No newline at end of file +canOnlyBeEditedBeforeStartingTracking=Kann nur vor Beginn des Trackings bearbeitet werden +defineCourse=Kurs definieren +mapDevices=Gerätezuordnung zu Teams und Tonnen \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/define_course.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/define_course.png new file mode 100644 index 0000000000000000000000000000000000000000..fc201d2882eadff3aa87fbdc7ee19e8e72103fce GIT binary patch literal 3076 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 literal 0 HcmV?d00001