From 87baaa12f780305f7536217b5e9f96499d7d71c0 Mon Sep 17 00:00:00 2001
From: Benjamin Barth <benjamin.barth@oio.de>
Date: Mon, 24 Aug 2015 18:02:51 +0200
Subject: [PATCH] Adjusted partials for mobile regatta progress

---
 .../mobile/partials/eventsteps/EventSteps.gss   |  2 +-
 .../mobile/partials/eventsteps/EventSteps.java  | 17 ++++++++++++-----
 .../partials/eventsteps/EventStepsPhase.java    |  3 +--
 .../partials/eventsteps/EventStepsPhase.ui.xml  | 15 ++++++---------
 .../eventsteps/EventStepsPhaseFleet.ui.xml      |  6 +++---
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.gss
index 9d126a3f358..f606a009c9d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.gss
@@ -48,7 +48,7 @@
 }
 .eventsteps_phases_phase_progress {
   text-align: center;
-  margin-top: 0.666666666666667em;
+  margin: 0.666666666666667em 0;
 }
 img.eventsteps_phases_phase_progress_icon {
   display: inline-block;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.java
index 1f6f555442a..11eb8c1a6f0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventSteps.java
@@ -4,13 +4,14 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
+import com.sap.sailing.gwt.home.client.place.event.regatta.tabs.reload.RefreshableWidget;
 import com.sap.sailing.gwt.home.mobile.partials.section.MobileSection;
 import com.sap.sailing.gwt.home.mobile.partials.sectionHeader.SectionHeaderContent;
 import com.sap.sailing.gwt.ui.client.StringMessages;
-import com.sap.sailing.gwt.ui.shared.dispatch.regatta.RegattaProgressDTO;
 import com.sap.sailing.gwt.ui.shared.dispatch.regatta.RegattaProgressSeriesDTO;
+import com.sap.sailing.gwt.ui.shared.dispatch.regatta.RegattaWithProgressDTO;
 
-public class EventSteps extends Composite {
+public class EventSteps extends Composite implements RefreshableWidget<RegattaWithProgressDTO> {
 
     private static EventStepsUiBinder uiBinder = GWT.create(EventStepsUiBinder.class);
 
@@ -20,10 +21,16 @@ public class EventSteps extends Composite {
     @UiField SectionHeaderContent sectionHeaderUi;
     private final MobileSection regattaProgessUi;
 
-    public EventSteps(RegattaProgressDTO regattaProgress) {
+    public EventSteps() {
+        EventStepsResources.INSTANCE.css().ensureInjected();
         initWidget(regattaProgessUi = uiBinder.createAndBindUi(this));
-        sectionHeaderUi.setTitle(StringMessages.INSTANCE.progress());
-        for (RegattaProgressSeriesDTO seriesProgress : regattaProgress.getSeries()) {
+        sectionHeaderUi.setSectionTitle(StringMessages.INSTANCE.progress());
+    }
+    
+    @Override
+    public void setData(RegattaWithProgressDTO data) {
+        regattaProgessUi.clearContent();
+        for (RegattaProgressSeriesDTO seriesProgress : data.getProgress().getSeries()) {
             regattaProgessUi.addContent(new EventStepsPhase(seriesProgress));
         }
     }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.java
index 0850588594a..ed2f315dbf6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.java
@@ -27,7 +27,6 @@ public class EventStepsPhase extends Composite {
     interface EventStepsPhaseUiBinder extends UiBinder<Widget, EventStepsPhase> {
     }
     
-    @UiField DivElement seriesContainerUi;
     @UiField DivElement nameUi;
     @UiField ImageElement checkUi;
     @UiField SpanElement progressUi;
@@ -44,7 +43,7 @@ public class EventStepsPhase extends Composite {
             progressUi.setInnerText(I18N.currentOfTotal(current, total));
         }
         if (seriesProgress.getProgressRaceCount() == 0) {
-            seriesContainerUi.addClassName(EventStepsResources.INSTANCE.css().eventsteps_phases_phaseinactive());
+            addStyleName(EventStepsResources.INSTANCE.css().eventsteps_phases_phaseinactive());
         }
         addFleetProgresses(seriesProgress.getFleetState(), seriesProgress.getTotalRaceCount());
     }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
index 433605751b9..03cc9fbe001 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhase.ui.xml
@@ -4,15 +4,12 @@
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:with field="res" type="com.sap.sailing.gwt.home.mobile.resources.SharedResources" />
 	<ui:with field="local_res" type="com.sap.sailing.gwt.home.mobile.partials.eventsteps.EventStepsResources" />
-	<g:HTMLPanel>
-		<!-- IF phase.count === 0 ADD CLASS event-steps_phases_phase_inactive -->
-		<div class="{local_res.css.eventsteps_phases_phase}" ui:field="seriesContainerUi">
-			<div class="{local_res.css.eventsteps_phases_phase_name}" ui:field="nameUi"></div>
-			<div class="{local_res.css.eventsteps_phases_phase_progressbar}" ui:field="fleetsContainerUi"></div>
-			<div class="{local_res.css.eventsteps_phases_phase_progress}">
-				<img src="images/home/icon-green-check.svg" class="{local_res.css.eventsteps_phases_phase_progress_icon}" ui:field="checkUi"></img>
-				<span class="{local_res.css.eventsteps_phases_phase_progress_text}" ui:field="progressUi"></span>
-			</div>
+	<g:HTMLPanel addStyleNames="{local_res.css.eventsteps_phases_phase}">
+		<div class="{local_res.css.eventsteps_phases_phase_name}" ui:field="nameUi"></div>
+		<div class="{local_res.css.eventsteps_phases_phase_progressbar}" ui:field="fleetsContainerUi"></div>
+		<div class="{local_res.css.eventsteps_phases_phase_progress}">
+			<img src="images/home/icon-green-check.svg" class="{local_res.css.eventsteps_phases_phase_progress_icon}" ui:field="checkUi"></img>
+			<span class="{local_res.css.eventsteps_phases_phase_progress_text}" ui:field="progressUi"></span>
 		</div>
 	</g:HTMLPanel>
 </ui:UiBinder>
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhaseFleet.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhaseFleet.ui.xml
index 926017b3027..b60b3f3153c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhaseFleet.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/eventsteps/EventStepsPhaseFleet.ui.xml
@@ -4,8 +4,8 @@
 	<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
 	<ui:with field="res" type="com.sap.sailing.gwt.home.mobile.resources.SharedResources" />
 	<ui:with field="local_res" type="com.sap.sailing.gwt.home.mobile.partials.eventsteps.EventStepsResources" />
-	<div class="{local_res.css.eventsteps_phases_phase_progressbar_fleet}">
-		<div class="{local_res.css.eventsteps_phases_phase_progressbar_fleet_progress}" ui:field="progressLiveUi"></div>
-		<div class="{local_res.css.eventsteps_phases_phase_progressbar_fleet_progress}" ui:field="progressUi"></div>
+	<div class="{local_res.css.eventsteps_phases_phase_progressbar_fleet}" style="position:relative;">
+		<div class="{local_res.css.eventsteps_phases_phase_progressbar_fleet_progress}" style="position:absolute; top:0;" ui:field="progressLiveUi"></div>
+		<div class="{local_res.css.eventsteps_phases_phase_progressbar_fleet_progress}" style="position:absolute; top:0;" ui:field="progressUi"></div>
 	</div>
 </ui:UiBinder>
\ No newline at end of file