Merge remote-tracking branch 'origin/newhome'

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/i18n/TextMessages.java

@@ -26,6 +26,7 @@ public interface TextMessages extends Messages {
     String pleaseTryAgain();
     String reloadPage();
     String errorMessageLoadingData();
+    String raceNotScheduled();
     
     String countdownDays();
     String countdownHours();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/i18n/TextMessages.properties

@@ -18,6 +18,7 @@ pleaseEnterASearchTerm=Please enter a search term.
 pleaseTryAgain=Please try again...
 reloadPage=Reload page
 errorMessageLoadingData=An error occured while loading the data for this page.
+raceNotScheduled=Not scheduled.
 
 countdownDays=Days
 countdownHours=Hrs

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/i18n/TextMessages_de.properties

@@ -18,6 +18,7 @@ pleaseEnterASearchTerm=Bitte gebe einen Suchbegriff ein.
 pleaseTryAgain=Bitte versuchen sie es erneut...
 reloadPage=Seite neu laden
 errorMessageLoadingData=Beim Laden der Daten für diese Seite ist ein Fehler aufgetreten.
+raceNotScheduled=Keine Startzeit bekannt
 
 countdownDays=Tage
 countdownHours=Std.

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/EventActivity.java

@@ -32,22 +32,19 @@ public class EventActivity extends AbstractActivity {
     private final RegattaRaceStatesSettings raceStatesSettings; 
 
     private EventView view;
+    private EventDTO event;
     
     public EventActivity(EventPlace place, EventClientFactory clientFactory) {
         this.clientFactory = clientFactory;
         this.eventPlace = place;
         
+        this.view = null;
+        this.event = null;
+        
         timerForClientServerOffset = new Timer(PlayModes.Replay);
         serverUpdateTimer = new Timer(PlayModes.Live, serverUpdateRateInMs);
         
         raceStatesSettings = new RegattaRaceStatesSettings();
-        serverUpdateTimer.addTimeListener(new TimeListener() {
-            
-            @Override
-            public void timeChanged(Date newTime, Date oldTime) {
-                // loadAndUpdateEventRaceStatesLog();
-            }
-        });
     }
 
     @Override
@@ -59,6 +56,18 @@ public class EventActivity extends AbstractActivity {
         clientFactory.getSailingService().getEventById(eventUUID, true, new AsyncCallback<EventDTO>() {
             @Override
             public void onSuccess(final EventDTO event) {
+                loadRegattaStructure(panel, clientTimeWhenRequestWasSent, event);
+            }
+
+            @Override
+            public void onFailure(Throwable caught) {
+                createErrorView("Error while loading the event with service getEventById()", caught, panel);
+            }
+        }); 
+    }
+
+    private void loadRegattaStructure(final AcceptsOneWidget panel, final long clientTimeWhenRequestWasSent, final EventDTO event) {
+        this.event = event;
         if(event.getLeaderboardGroups().size() > 0) {
             clientFactory.getSailingService().getRegattaStructureOfEvent(event.id, new AsyncCallback<List<RaceGroupDTO>>() {
                 @Override
@@ -72,6 +81,17 @@ public class EventActivity extends AbstractActivity {
                             timerForClientServerOffset.adjustClientServerOffset(clientTimeWhenRequestWasSent, leaderboardGroupDTO.getCurrentServerTime(), clientTimeWhenResponseWasReceived);
                         }
                         createEventView(event, raceGroups, panel);
+
+                        if(event.isRunning()) {
+                            // create update time for race states only for running events
+                            serverUpdateTimer.addTimeListener(new TimeListener() {
+                                @Override
+                                public void timeChanged(Date newTime, Date oldTime) {
+                                    loadAndUpdateEventRaceStatesLog();
+                                }
+                            });
+                        }
+
                     } else {
                         createEventWithoutRegattasView(event, panel);
                     }
@@ -87,13 +107,6 @@ public class EventActivity extends AbstractActivity {
         }
     }
     
-            @Override
-            public void onFailure(Throwable caught) {
-                createErrorView("Error while loading the event with service getEventById()", caught, panel);
-            }
-        }); 
-    }
-
     private void createErrorView(String errorMessage, Throwable errorReason, AcceptsOneWidget panel) {
         ErrorView view = clientFactory.createErrorView(errorMessage, errorReason);
         panel.setWidget(view.asWidget());
@@ -111,10 +124,10 @@ public class EventActivity extends AbstractActivity {
     }
     
     protected void loadAndUpdateEventRaceStatesLog() {
+        if(view != null && event != null) {
             final long clientTimeWhenRequestWasSent = System.currentTimeMillis();
-        UUID eventUUID = UUID.fromString(eventPlace.getEventUuidAsString());
 
-        clientFactory.getSailingService().getRaceStateEntriesForRaceGroup(eventUUID, raceStatesSettings.getVisibleCourseAreas(),
+            clientFactory.getSailingService().getRaceStateEntriesForRaceGroup(event.id, raceStatesSettings.getVisibleCourseAreas(),
                     raceStatesSettings.getVisibleRegattas(), raceStatesSettings.isShowOnlyCurrentlyRunningRaces(), raceStatesSettings.isShowOnlyRacesOfSameDay(),
                     new MarkedAsyncCallback<List<RegattaOverviewEntryDTO>>(
                             new AsyncCallback<List<RegattaOverviewEntryDTO>>() {
@@ -137,5 +150,6 @@ public class EventActivity extends AbstractActivity {
                                 }
                             }));
         }
+    }
 
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.java

@@ -25,7 +25,7 @@ import com.sap.sse.gwt.client.player.Timer;
 public class EventRegattaRacesRace extends UIObject {
     private static EventRegattaRacesRaceUiBinder uiBinder = GWT.create(EventRegattaRacesRaceUiBinder.class);
 
-    private enum SimpleRaceStates { NOT_TRACKED, TRACKED_AND_NOT_LIVE, TRACKED_AND_LIVE };
+    private enum SimpleRaceStates { NOT_TRACKED, TRACKED_AND_FINISHED, TRACKED_AND_RUNNING, TRACKED_BUT_NOT_SCHEDULED };
     
     interface EventRegattaRacesRaceUiBinder extends UiBinder<DivElement, EventRegattaRacesRace> {
     }
@@ -38,6 +38,7 @@ public class EventRegattaRacesRace extends UIObject {
     @UiField SpanElement averageRaceWind;
     
     @UiField DivElement raceNotTrackedDiv;
+    @UiField DivElement raceNotScheduledDiv;
     @UiField DivElement watchRaceDiv;
     @UiField DivElement analyzeRaceDiv;
     @UiField AnchorElement watchRaceLink;
@@ -83,7 +84,7 @@ public class EventRegattaRacesRace extends UIObject {
         EventRegattaRacesResources.INSTANCE.css().ensureInjected();
         setElement(uiBinder.createAndBindUi(this));
 
-        allConditionalElements = new Element[] {raceWinnerDiv, raceLeaderDiv, watchRaceDiv, analyzeRaceDiv, raceNotTrackedDiv,
+        allConditionalElements = new Element[] {raceWinnerDiv, raceLeaderDiv, watchRaceDiv, analyzeRaceDiv, raceNotTrackedDiv, raceNotScheduledDiv,
                 raceFeaturesDiv, legProgressDiv, raceFlagDiv, windStatusDiv };
 
         if(fleet.getColor() != null) {
@@ -127,7 +128,20 @@ public class EventRegattaRacesRace extends UIObject {
         SimpleRaceStates simpleRaceState = SimpleRaceStates.NOT_TRACKED;
         
         if(race != null && race.trackedRace != null) {
-            simpleRaceState = isLive() ? SimpleRaceStates.TRACKED_AND_LIVE : SimpleRaceStates.TRACKED_AND_NOT_LIVE; 
+            if(isLive()) {
+                simpleRaceState = SimpleRaceStates.TRACKED_AND_RUNNING;
+                if(race.startOfRace == null) {
+                    simpleRaceState = SimpleRaceStates.TRACKED_BUT_NOT_SCHEDULED;
+                } else if (race.endOfRace != null) { 
+                    simpleRaceState = SimpleRaceStates.TRACKED_AND_FINISHED;
+                }                    
+            } else {
+                if(race.startOfRace == null) {
+                    simpleRaceState = SimpleRaceStates.TRACKED_BUT_NOT_SCHEDULED;
+                } else if (race.endOfRace != null) { 
+                    simpleRaceState = SimpleRaceStates.TRACKED_AND_FINISHED;
+                }                    
+            }
         }
         return simpleRaceState;
     }
@@ -147,7 +161,10 @@ public class EventRegattaRacesRace extends UIObject {
             case NOT_TRACKED:
                 showElement(raceNotTrackedDiv);
                 break;
-            case TRACKED_AND_LIVE:
+            case TRACKED_BUT_NOT_SCHEDULED:
+                showElement(raceNotScheduledDiv);
+                break;
+            case TRACKED_AND_RUNNING:
                 showElement(watchRaceDiv);
 
                 if(race.startOfRace != null) {
@@ -164,7 +181,7 @@ public class EventRegattaRacesRace extends UIObject {
                 }
 
                 break;
-            case TRACKED_AND_NOT_LIVE:
+            case TRACKED_AND_FINISHED:
                 showElement(analyzeRaceDiv);
                 
                 if(race.trackedRaceStatistics.hasLeaderData && race.trackedRaceStatistics.leaderOrWinner != null) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaraces/EventRegattaRacesRace.ui.xml

@@ -41,6 +41,9 @@
   <div ui:field="raceNotTrackedDiv" class="{local_res.css.eventregattarace_action} {local_res.css.eventregattarace_actiondisabled}">
       <ui:text from='{i18n.eventRegattaRaceNotTracked}'/>
   </div>
+  <div ui:field="raceNotScheduledDiv" class="{local_res.css.eventregattarace_action} {local_res.css.eventregattarace_actiondisabled}">
+      <ui:text from='{i18n.raceNotScheduled}'/>
+  </div>
   <div ui:field="watchRaceDiv" class="{local_res.css.eventregattarace_action}">
       <a ui:field="watchRaceLink" class="{res.mainCss.button} {local_res.css.eventregattarace_action_watch}"><ui:text from='{i18n.eventRegattaRaceWatch}'/></a>
   </div>