eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-25 05:23:51 +00:00
Code Activity

Competition Format - Adjusted representation of different race states in

Browse Source 
desktop version
This commit is contained in:
Benjamin Barth committed 2015-09-30 14:22:03 +02:00
1 parent 634bd423d2
commit f754ddba2e
4 files changed
+43 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetition.gss
+28 -10
View File
@@ -109,6 +109,7 @@
text-align: center;
color: #fff;
padding: 0.333333333333333em 0.333333333333333em;
vertical-align: top;
}
@media (min-width: 45em) {
.fleet_races_race {
@@ -126,13 +127,13 @@
text-decoration: none;
}
.fleet_races_race_name,
.fleet_races_race_date {
.fleet_races_race_info {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.fleet_races_race_name {
font-size: 1.466666666666667em;
font-size: 1.166666666666667em;
font-weight: 700;
}
.fleet_races_race_name:after {
@@ -141,20 +142,20 @@
width: 0.466666666666667em;
height: 0.466666666666667em;
background: url("images/home/skip-forward.png") no-repeat center center;
margin: 0 0 0.133333333333333em 0.133333333333333em;
margin: 0 0 0.033333333333333em 0.133333333333333em;
font-size: 1.466666666666667em;
}
.fleet_races_race_date {
.fleet_races_race_info {
width: 100%;
font-size: 0.666666666666667em;
font-weight: 600;
}
.fleet_races_raceuntracked {
background-color: #999;
color: #008fcc;
background-color: #fff;
border: 1px solid #008fcc;
cursor: default;
}
.fleet_races_raceuntracked:hover {
background-color: #8a8a8a;
}
.fleet_races_racelive {
background-color: #e94a1b;
}
@@ -163,16 +164,28 @@
}
.fleet_races_raceplanned {
color: #999;
background-color: #fff;
border: 1px solid #999;
padding: 0.266666666666666em 0.266666666666666em;
}
.fleet_races_raceplanned:hover {
background-color: #e6e6e6;
background-color: #8a8a8a;
}
.fleet_races_raceuntracked .fleet_races_race_name:after {
display: none;
}
.fleet_races_racelive.fleet_races_raceuntracked {
color: #e94a1b;
background-color: #fff;
border: 1px solid #e94a1b;
}
.fleet_races_raceplanned.fleet_races_raceuntracked {
background-color: #fff;
color: #999;
border: 1px solid #999;
}
.fleet_races_raceuntracked:hover {
background-color: #e6e6e6;
}
.regattalistitem .fleet {
border: none;
border-bottom: 1px solid #dedede;
@@ -180,3 +193,8 @@
.regattalistitem .fleet:last-of-type {
border-radius: 0;
}
.fleet_races_race_date {
}
.fleet_races_race_state {
text-transform: uppercase;
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionFleetRace.java
+9 -3
View File
@@ -6,6 +6,7 @@ import com.google.gwt.dom.client.DivElement;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.UIObject;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.common.client.DateAndTimeFormatterUtil;
import com.sap.sailing.gwt.ui.shared.race.SimpleRaceMetadataDTO;
import com.sap.sailing.gwt.ui.shared.race.SimpleRaceMetadataDTO.RaceTrackingState;
@@ -19,7 +20,9 @@ public class RegattaCompetitionFleetRace extends UIObject {
}
@UiField RegattaCompetitionResources local_res;
@UiField StringMessages i18n;
@UiField DivElement raceNameUi;
@UiField DivElement raceStateUi;
@UiField DivElement raceDateUi;
private final AnchorElement anchorUi;
@@ -38,13 +41,16 @@ public class RegattaCompetitionFleetRace extends UIObject {
}
private void setupRaceState(RaceTrackingState trackingState, RaceViewState viewState) {
boolean isUntrackedRace = trackingState != RaceTrackingState.TRACKED_VALID_DATA;
if (viewState == RaceViewState.RUNNING) {
anchorUi.addClassName(local_res.css().fleet_races_racelive());
raceStateUi.setInnerText(isUntrackedRace ? i18n.live() : i18n.watch());
} else if (viewState == RaceViewState.PLANNED || viewState == RaceViewState.SCHEDULED) {
anchorUi.addClassName(local_res.css().fleet_races_raceplanned());
raceStateUi.setInnerText(i18n.raceIsPlanned());
} else {
raceStateUi.setInnerText(isUntrackedRace ? i18n.finished() : i18n.analyze());
}
if (trackingState != RaceTrackingState.TRACKED_VALID_DATA) {
anchorUi.addClassName(local_res.css().fleet_races_raceuntracked());
}
setStyleName(anchorUi, local_res.css().fleet_races_raceuntracked(), isUntrackedRace);
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionFleetRace.ui.xml
+3 -2
View File
@@ -6,8 +6,9 @@
<ui:with field="local_res" type="com.sap.sailing.gwt.home.desktop.partials.regattacompetition.RegattaCompetitionResources" />
<a class="{local_res.css.fleet_races_race}" target="_blank">
<div class="{local_res.css.fleet_races_race_name}" ui:field="raceNameUi"></div>
<div class="{local_res.css.fleet_races_race_date} {res.mediaCss.hideonsmall}" ui:field="raceDateUi">
<ui:text from="{i18n.raceIsPlanned}" />
<div class="{local_res.css.fleet_races_race_info} {res.mediaCss.hideonsmall}">
<div class="{local_res.css.fleet_races_race_state}" ui:field="raceStateUi"></div>
<div class="{local_res.css.fleet_races_race_date}" ui:field="raceDateUi"></div>
</div>
</a>
</ui:UiBinder>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/regattacompetition/RegattaCompetitionResources.java
+3 -1
View File
@@ -26,9 +26,11 @@ public interface RegattaCompetitionResources extends ClientBundle {
String fleet_races();
String fleet_races_race();
String fleet_races_race_name();
String fleet_races_race_date();
String fleet_races_race_info();
String fleet_races_raceuntracked();
String fleet_races_racelive();
String fleet_races_raceplanned();
String fleet_races_race_date();
String fleet_races_race_state();
}
}