Updated state markers

2026-10-15 08:41:01 +00:00 · 2015-03-17 14:49:44 +01:00
1 parent 6167498a38
commit c3c8d976e3
@@ -23,7 +23,7 @@ import com.sap.sailing.gwt.ui.client.LeaderboardUpdateListener;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;
 import com.sap.sailing.gwt.ui.leaderboard.LeaderboardUrlSettings;
-import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventState;
+import com.sap.sailing.gwt.ui.shared.general.EventState;
 import com.sap.sse.gwt.shared.GwtHttpRequestUtils;

 /**
@@ -72,7 +72,7 @@ public class EventsOverviewRecentYear extends Composite {
 //        this.trackedRacesCount.setInnerText("tbd.");
        for (EventListEventDTO eventDTO : events) {
            PlaceNavigation<EventDefaultPlace> eventNavigation = navigator.getEventNavigation(eventDTO.getId().toString(), eventDTO.getBaseURL(), eventDTO.isOnRemoteServer());
-            RecentEventTeaser recentEvent = new RecentEventTeaser(eventNavigation, eventDTO);
+            RecentEventTeaser recentEvent = new RecentEventTeaser(eventNavigation, eventDTO, eventDTO.getState().getListStateMarker());
            recentEventsTeaserPanel.add(recentEvent);
        }
        headerDiv.addDomHandler(new ClickHandler() {
@@ -8,6 +8,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.gwt.home.client.app.PlaceNavigation;
 import com.sap.sailing.gwt.home.client.shared.event.EventTeaser;
 import com.sap.sailing.gwt.ui.shared.general.EventMetadataDTO;
+import com.sap.sailing.gwt.ui.shared.general.LabelType;

 public class RecentEventTeaser extends Composite {

@@ -18,8 +19,8 @@ public class RecentEventTeaser extends Composite {
    
    @UiField(provided = true) EventTeaser eventTeaser;

-    public RecentEventTeaser(final PlaceNavigation<?> placeNavigation, final EventMetadataDTO event) {
-        eventTeaser = new EventTeaser(placeNavigation, event);
+    public RecentEventTeaser(final PlaceNavigation<?> placeNavigation, final EventMetadataDTO event, LabelType labelType) {
+        eventTeaser = new EventTeaser(placeNavigation, event, labelType);
        initWidget(uiBinder.createAndBindUi(this));
    }

@@ -20,9 +20,9 @@ import com.sap.sailing.gwt.home.client.shared.LabelTypeUtil;
 import com.sap.sailing.gwt.home.client.shared.sharing.SharingButtons;
 import com.sap.sailing.gwt.home.client.shared.sharing.SharingMetadataProvider;
 import com.sap.sailing.gwt.ui.client.StringMessages;
-import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventState;
 import com.sap.sailing.gwt.ui.shared.fakeseries.EventSeriesViewDTO;
 import com.sap.sailing.gwt.ui.shared.general.EventMetadataDTO;
+import com.sap.sailing.gwt.ui.shared.general.EventState;

 public class SeriesHeader extends Composite {
    private static SeriesHeaderUiBinder uiBinder = GWT.create(SeriesHeaderUiBinder.class);
@@ -47,7 +47,7 @@ public class SeriesEventsTabView extends Composite implements SeriesTabView<Seri

        for (EventMetadataDTO eventOfSeries : currentPresenter.getCtx().getSeriesDTO().getEvents()) {
            final PlaceNavigation<EventDefaultPlace> eventNavigation = currentPresenter.getEventNavigation(eventOfSeries.getId());
-            RecentEventTeaser eventTeaser = new RecentEventTeaser(eventNavigation, eventOfSeries);
+            RecentEventTeaser eventTeaser = new RecentEventTeaser(eventNavigation, eventOfSeries, eventOfSeries.getState().getStateMarker());
            eventsContainer.add(eventTeaser);
        }
        
@@ -44,9 +44,11 @@ public class EventTeaser extends Composite {
    }

    private static RecentEventUiBinder uiBinder = GWT.create(RecentEventUiBinder.class);
+    private final LabelType labelType;

-    public EventTeaser(final PlaceNavigation<?> placeNavigation, final EventMetadataDTO event) {
+    public EventTeaser(final PlaceNavigation<?> placeNavigation, final EventMetadataDTO event, LabelType labelType) {
        this.event = event;
+        this.labelType = labelType;

        EventTeaserResources.INSTANCE.css().ensureInjected();
        initWidget(uiBinder.createAndBindUi(this));
@@ -68,7 +70,6 @@ public class EventTeaser extends Composite {

    private void updateUI() {
        SafeHtml safeHtmlEventName = LongNamesUtil.breakLongName(event.getDisplayName());
-        LabelType labelType = event.getState().getStateMarker();
        if(labelType.isRendered()) {
            eventNameWithState.setInnerSafeHtml(safeHtmlEventName);
            LabelTypeUtil.renderLabelType(eventState, labelType);
@@ -133,6 +133,7 @@ public class Header extends Composite {
        } else if(place instanceof SolutionsPlace) {
            setActiveLink(solutionsPageLink);
        }
+        // TODO add more rules
    }
    
    private void setActiveLink(Anchor link) {
@@ -471,6 +471,8 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
    String overallLeaderboardSelection();
    String errorTryingToObtainOverallLeaderboards(String message);
    String finished();
+    String upcoming();
+    String inProgress();
    String passedTo(String name);
    String gapChangeSinceLegStartInSeconds();
    String sideToWhichMarkAtLegStartWasRounded();
@@ -505,6 +505,8 @@ showRankChart=Show rank chart
 overallLeaderboardSelection=Overall Leaderboard
 errorTryingToObtainOverallLeaderboards=Error trying to obtain overall leaderboards: {0}
 finished=finished
+upcoming=upcoming
+inProgress=in progress
 passedTo=passed to {0}
 gapChangeSinceLegStartInSeconds=Gap Change
 gapChangeSinceLegStartInSecondsTooltip=The change of the gap to the leader since the last leg start.\nA negative number means that the gap was decreased;\na positive number means that it was increased.
@@ -506,6 +506,8 @@ showRankChart=Rang-Diagramm anzeigen
 overallLeaderboardSelection=Gesamtergebnisse
 errorTryingToObtainOverallLeaderboards=Fehler beim Laden der Gesamtergebnisse: {0}
 finished=beendet
+upcoming=demnächst
+inProgress=aktiv
 passedTo=an {0} gerundet
 gapChangeSinceLegStartInSeconds=Gap Änderung
 gapChangeSinceLegStartInSecondsTooltip=Die Änderung des Abstands zum Führenden seit dem letzten Schenkelstart.\nEine negative Zahl bedeutet,\ndass sich der Abstand verringert hat; eine positive Zahl bedeutet, dass er sich vergrößert hat.
@@ -494,6 +494,8 @@ showRankChart=Показать таблицу рейтинга
 overallLeaderboardSelection=Итоговая таблица лидеров
 errorTryingToObtainOverallLeaderboards=Ошибка получения итоговых таблиц лидеров: {0}
 finished=Завершившиеся
+upcoming=upcoming
+inProgress=in progress
 passedTo=Переданные в {0}
 gapChangeSinceLegStartInSeconds=Изменение отставания
 gapChangeSinceLegStartInSecondsTooltip=Изменение отставания от лидера с начала последнего этапа.\nОтрицательное число означает, что отставание уменьшилось;\nположительное число означает, что отставание увеличилось.
@@ -336,7 +336,6 @@ import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO;
 import com.sap.sailing.gwt.ui.shared.eventlist.EventListEventDTO;
 import com.sap.sailing.gwt.ui.shared.eventlist.EventListViewDTO;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO;
-import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventState;
 import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventType;
 import com.sap.sailing.gwt.ui.shared.eventview.HasRegattaMetadata.RegattaState;
 import com.sap.sailing.gwt.ui.shared.eventview.RegattaMetadataDTO;
@@ -344,6 +343,7 @@ import com.sap.sailing.gwt.ui.shared.fakeseries.EventSeriesViewDTO;
 import com.sap.sailing.gwt.ui.shared.fakeseries.EventSeriesViewDTO.EventSeriesState;
 import com.sap.sailing.gwt.ui.shared.general.EventMetadataDTO;
 import com.sap.sailing.gwt.ui.shared.general.EventReferenceDTO;
+import com.sap.sailing.gwt.ui.shared.general.EventState;
 import com.sap.sailing.gwt.ui.shared.media.MediaDTO;
 import com.sap.sailing.gwt.ui.shared.media.MediaEntryDTO;
 import com.sap.sailing.manage2sail.EventResultDescriptor;
@@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.shared.eventlist;
 import java.util.ArrayList;

 import com.google.gwt.user.client.rpc.IsSerializable;
-import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventState;
+import com.sap.sailing.gwt.ui.shared.general.EventState;

 public class EventListViewDTO implements IsSerializable {
    
@@ -8,7 +8,7 @@ import com.sap.sailing.gwt.ui.shared.EventDTO;
 import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
 import com.sap.sailing.gwt.ui.shared.VenueDTO;
 import com.sap.sailing.gwt.ui.shared.general.EventReferenceDTO;
-import com.sap.sailing.gwt.ui.shared.general.LabelType;
+import com.sap.sailing.gwt.ui.shared.general.EventState;

 public class EventViewDTO extends EventDTO {
    private static final long serialVersionUID = -7100030301376959817L;
@@ -17,20 +17,6 @@ public class EventViewDTO extends EventDTO {
        SINGLE_REGATTA, MULTI_REGATTA, SERIES_EVENT
    }

-    public enum EventState {
-        PLANNED(LabelType.NONE), UPCOMING(LabelType.UPCOMMING), RUNNING(LabelType.LIVE), FINISHED(LabelType.FINISHED);
-        
-        private final LabelType stateMarker;
-
-        private EventState(LabelType stateMarker) {
-            this.stateMarker = stateMarker;
-        }
-        
-        public LabelType getStateMarker() {
-            return stateMarker;
-        }
-    }
-
    private ArrayList<RegattaMetadataDTO> regattas = new ArrayList<>();
    private ArrayList<EventReferenceDTO> eventsOfSeries = new ArrayList<>();

@@ -7,7 +7,7 @@ import com.sap.sailing.gwt.ui.shared.general.LabelType;
 public interface HasRegattaMetadata {
    
    public enum RegattaState {
-        UPCOMING(LabelType.UPCOMMING), RUNNING(LabelType.LIVE), FINISHED(LabelType.NONE), UNKNOWN(LabelType.NONE);
+        UPCOMING(LabelType.UPCOMING), RUNNING(LabelType.LIVE), FINISHED(LabelType.FINISHED), UNKNOWN(LabelType.NONE);
        
        private final LabelType stateMarker;

@@ -21,7 +21,7 @@ public class EventSeriesViewDTO implements IsSerializable {
    private String leaderboardId;

    public enum EventSeriesState {
-        UPCOMING(LabelType.UPCOMMING), RUNNING(LabelType.LIVE), FINISHED(LabelType.FINISHED), IN_PROGRESS(LabelType.NONE);
+        UPCOMING(LabelType.UPCOMING), RUNNING(LabelType.LIVE), FINISHED(LabelType.FINISHED), IN_PROGRESS(LabelType.PROGRESS);
        
        private final LabelType stateMarker;

@@ -2,11 +2,8 @@ package com.sap.sailing.gwt.ui.shared.general;

 import java.util.Date;

-import com.sap.sailing.gwt.ui.shared.eventview.EventViewDTO.EventState;
-
 public class EventMetadataDTO extends EventReferenceDTO {

-    // private EventType type;
    private EventState state;
    private String venue;
    private String venueCountry;
@@ -0,0 +1,26 @@
+package com.sap.sailing.gwt.ui.shared.general;
+
+
+public enum EventState {
+    PLANNED(LabelType.NONE), UPCOMING(LabelType.UPCOMING), RUNNING(LabelType.LIVE, LabelType.LIVE), FINISHED(LabelType.FINISHED);
+    
+    private final LabelType stateMarker;
+    private final LabelType listStateMarker;
+
+    private EventState(LabelType stateMarker) {
+        this(stateMarker, LabelType.NONE);
+    }
+    
+    private EventState(LabelType stateMarker, LabelType listStateMarker) {
+        this.stateMarker = stateMarker;
+        this.listStateMarker = listStateMarker;
+    }
+    
+    public LabelType getStateMarker() {
+        return stateMarker;
+    }
+    
+    public LabelType getListStateMarker() {
+        return listStateMarker;
+    }
+}
@@ -25,15 +25,13 @@ public enum LabelType {
    PROGRESS("progress") {
        @Override
        public String getLabel() {
-//            return StringMessages.INSTANCE.;
-            return null;
+            return StringMessages.INSTANCE.inProgress();
        }
    },
-    UPCOMMING("upcomming") {
+    UPCOMING("upcoming") {
        @Override
        public String getLabel() {
-//            return StringMessages.INSTANCE.;
-            return null;
+            return StringMessages.INSTANCE.upcoming();
        }
    },
    NEW_("new") {