From 1fdee28ba87331fcc86261e7ae2721e9845c33cc Mon Sep 17 00:00:00 2001 From: Daniel Lisunkin Date: Wed, 18 Sep 2019 15:56:44 +0200 Subject: [PATCH] Added second button to RegattaListComposite. --- .../RegattaConfigImagesBarCell.java | 5 ++++- .../ui/adminconsole/RegattaListComposite.java | 16 +++++++--------- .../gwt/client/images/boat_registrations.png | Bin 0 -> 579 bytes .../com/sap/sse/gwt/client/IconResources.java | 4 ++++ 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 java/com.sap.sse.gwt/resources/com/sap/sse/gwt/client/images/boat_registrations.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigImagesBarCell.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigImagesBarCell.java index cfbe0a14579..2a1c49ec7ee 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigImagesBarCell.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigImagesBarCell.java @@ -18,7 +18,8 @@ public class RegattaConfigImagesBarCell extends ImagesBarCell { public static final String ACTION_CHANGE_OWNERSHIP = DefaultActions.CHANGE_OWNERSHIP.name(); public static final String ACTION_CHANGE_ACL = DefaultActions.CHANGE_ACL.name(); public static final String ACTION_STOP_TRACKING = "ACTION_STOP_TRACKING"; - public static final String ACTION_CERTIFICATES_UPDATE = "CERTIFICATES_UPDATE"; + public static final String ACTION_CERTIFICATES_UPDATE = "ACTION_CERTIFICATES_UPDATE"; + public static final String ACTION_BOAT_REGISTRATIONS = "ACTION_BOAT_REGISTRATIONS"; private final StringMessages stringMessages; private static AdminConsoleResources resources = GWT.create(AdminConsoleResources.class); @@ -49,6 +50,8 @@ public class RegattaConfigImagesBarCell extends ImagesBarCell { makeImagePrototype(IconResources.INSTANCE.changeOwnershipIcon()))); result.add(new ImageSpec(ACTION_CHANGE_ACL, stringMessages.actionChangeACL(), makeImagePrototype(IconResources.INSTANCE.changeACLIcon()))); + result.add(new ImageSpec(ACTION_BOAT_REGISTRATIONS, stringMessages.boatRegistrations(), + makeImagePrototype(IconResources.INSTANCE.boatRegistrations()))); result.add(new ImageSpec(ACTION_CERTIFICATES_UPDATE, stringMessages.updateCertificates(), makeImagePrototype(IconResources.INSTANCE.updateCertificatesIcon()))); return result; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java index 389534d313e..ec8a4dfa506 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java @@ -274,9 +274,8 @@ public class RegattaListComposite extends Composite implements RegattasDisplayer stringMessages); actionsColumn.addAction(RegattaConfigImagesBarCell.ACTION_CHANGE_ACL, DefaultActions.CHANGE_ACL, configACL::openDialog); - actionsColumn.addAction(RaceLogTrackingEventManagementImagesBarCell.ACTION_BOAT_REGISTRATIONS, - DefaultActions.UPDATE, null); // this::handleBoatRegistration); - actionsColumn.addAction(RegattaConfigImagesBarCell.ACTION_CERTIFICATES_UPDATE, regattaDTO -> { + actionsColumn.addAction(RegattaConfigImagesBarCell.ACTION_BOAT_REGISTRATIONS, UPDATE, this::handleBoatRegistration); + actionsColumn.addAction(RegattaConfigImagesBarCell.ACTION_CERTIFICATES_UPDATE, UPDATE, regattaDTO -> { BoatCertificateAssignmentDialog certificateAssignmentDialog = new BoatCertificateAssignmentDialog(sailingService, userService, regattaDTO.getName(), stringMessages, errorReporter, new DialogCallback>() { @@ -416,17 +415,16 @@ public class RegattaListComposite extends Composite implements RegattasDisplayer filterablePanelRegattas.updateAll(allRegattas); } - private void handleBoatRegistration(StrippedLeaderboardDTOWithSecurity t) { - if (t.canBoatsOfCompetitorsChangePerRace) { - RegattaDTO regatta = null; //getSelectedRegattas(); - String boatClassName = regatta.boatClass.getName(); + private void handleBoatRegistration(RegattaDTO regattaDTO) { + if (regattaDTO.canBoatsOfCompetitorsChangePerRace) { + String boatClassName = regattaDTO.boatClass.getName(); new RegattaLogBoatRegistrationDialog(boatClassName, sailingService, null, stringMessages, - errorReporter, /* editable */true, t.getName(), t.canBoatsOfCompetitorsChangePerRace, + errorReporter, /* editable */true, regattaDTO.getName(), regattaDTO.canBoatsOfCompetitorsChangePerRace, new DialogCallback>() { @Override public void ok(Set registeredBoats) { - sailingService.setBoatRegistrationsInRegattaLog(t.getName(), registeredBoats, + sailingService.setBoatRegistrationsInRegattaLog(regattaDTO.getName(), registeredBoats, new AsyncCallback() { @Override public void onSuccess(Void result) { diff --git a/java/com.sap.sse.gwt/resources/com/sap/sse/gwt/client/images/boat_registrations.png b/java/com.sap.sse.gwt/resources/com/sap/sse/gwt/client/images/boat_registrations.png new file mode 100644 index 0000000000000000000000000000000000000000..6f90a4bd9bc223f352ee9504998dd9c55b4df329 GIT binary patch literal 579 zcmV-J0=)f+P)5L;{aA%A5~`IVTJ2D`3|5pX7y}6um6{4d5usr7eeZFx5U%%X&vwr9 zJil|6BdSVNUAlMW>cqm_0a5v2d^^iju^jX`QQ^$wouRb5>8L_Mtu7eHRKk3rfXt)Y zSrM6VTa5=8@=mUtk6L7cgKfF-9;5OENN#S`zAf$8xOncy z=Z{-A1n8X_KLrf0_umuAtmC!o)--bh@?U`Z=4NNV8c*zwHJeq1V=SzFexcymkd-&seFH?9?5Abp30W8hb4m-nY84J=Jb>zfxIz{`O7r z)9~f_phteq45nkgodr^Vt@lZwYOzucyH1tsqN+4!jt`+s0yfMTQEQ@d!~n$4ynHOa z=>v)z%gUk%gR!%71qr@$)pEcWM RLJ|M~002ovPDHLkV1g)>266xZ literal 0 HcmV?d00001 diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/IconResources.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/IconResources.java index 598ac8d7f95..4656d9a4417 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/IconResources.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/IconResources.java @@ -3,6 +3,7 @@ package com.sap.sse.gwt.client; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.resources.client.ClientBundle.Source; public interface IconResources extends ClientBundle { @@ -25,4 +26,7 @@ public interface IconResources extends ClientBundle { @Source("images/certificates.png") ImageResource updateCertificatesIcon(); + + @Source("images/boat_registrations.png") + ImageResource boatRegistrations(); }