eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 14:27:15 +00:00
Code Activity

Merge branch 'design2015' into tw2015

Browse Source
This commit is contained in:
Axel Uhl committed 2015-07-17 13:35:48 +02:00
2 parents 2b7dfc73e4 e4cb09f616
commit d18cf1a3f7
7 files changed
+22 -24
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/client/place/event/oldleaderboard/OldLeaderboard.css
+1 -1
View File
@@ -2,5 +2,5 @@
/* background-color:#f8f8f8; */
padding: 0 10px 10px 10px;
width: 100%;
font-weight: bold;
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/EventHeader.java
+1 -7
View File
@@ -56,7 +56,6 @@ public class EventHeader extends Composite {
@UiField AnchorElement eventLink;
@UiField DivElement competitors;
@UiField DivElement races;
@UiField DivElement trackedRaces;
@UiField DivElement eventCategory;
@UiField DivElement courseAreaUi;
@@ -123,11 +122,6 @@ public class EventHeader extends Composite {
} else {
hide(races);
}
if(regattaMetadata.getTrackedRacesCount() > 0) {
trackedRaces.setInnerText(i18n.trackedRacesCount(regattaMetadata.getTrackedRacesCount()));
} else {
hide(trackedRaces);
}
if(regattaMetadata.getDefaultCourseAreaName() != null) {
courseAreaUi.setInnerText(i18n.courseAreaName(regattaMetadata.getDefaultCourseAreaName()));
} else {
@@ -159,7 +153,7 @@ public class EventHeader extends Composite {
hide(eventLink);
}
hide(competitors, races, trackedRaces, courseAreaUi, eventCategory);
hide(competitors, races, courseAreaUi, eventCategory);
}
initTitleAndSelection(nameToShow);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/header/EventHeader.ui.xml
-1
View File
@@ -52,7 +52,6 @@
<!-- IF event.eventType === 'multi-regatta-event' -->
<div ui:field="competitors" class="{local_res.css.eventheader_intro_details_item}" />
<div ui:field="races" class="{local_res.css.eventheader_intro_details_item}" />
<div ui:field="trackedRaces" class="{local_res.css.eventheader_intro_details_item}" />
<div ui:field="courseAreaUi" class="{local_res.css.eventheader_intro_details_item}" />
<div ui:field="eventCategory" class="{local_res.css.eventheader_intro_details_item}" />
<!-- IFEND event.eventType === 'multi-regatta-event' -->
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java
+19 -2
View File
@@ -190,6 +190,10 @@ public final class HomeServiceUtil {
return count;
}
public static int calculateRaceColumnCount(Leaderboard sl) {
return Util.size(sl.getRaceColumns());
}
public static int calculateTrackedRaceCount(Leaderboard sl) {
int count=0;
for (RaceColumn column : sl.getRaceColumns()) {
@@ -203,6 +207,20 @@ public final class HomeServiceUtil {
return count;
}
public static int calculateTrackedRaceColumnCount(Leaderboard sl) {
int count=0;
for (RaceColumn column : sl.getRaceColumns()) {
for (Fleet fleet : column.getFleets()) {
TrackedRace trackedRace = column.getTrackedRace(fleet);
if(trackedRace != null && trackedRace.hasGPSData() && trackedRace.hasWindData()) {
count++;
break;
}
}
}
return count;
}
public static String getBoatClassName(Leaderboard leaderboard) {
BoatClass boatClass = getBoatClass(leaderboard);
return boatClass == null ? null : boatClass.getName();
@@ -447,8 +465,7 @@ public final class HomeServiceUtil {
regattaDTO.setBoatCategory(leaderboardGroup.getDisplayName() != null ? leaderboardGroup.getDisplayName() : leaderboardGroup.getName());
}
regattaDTO.setCompetitorsCount(calculateCompetitorsCount(leaderboard));
regattaDTO.setRaceCount(calculateRaceCount(leaderboard));
regattaDTO.setTrackedRacesCount(calculateTrackedRaceCount(leaderboard));
regattaDTO.setRaceCount(calculateRaceColumnCount(leaderboard));
regattaDTO.setBoatClass(getBoatClassName(leaderboard));
if(leaderboard instanceof RegattaLeaderboard) {
Regatta regatta = ((RegattaLeaderboard) leaderboard).getRegatta();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/GetEventStatisticsAction.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class GetEventStatisticsAction implements Action<ResultWithTTL<EventStati
}
for (Leaderboard leaderboard : leaderboards) {
competitors += HomeServiceUtil.calculateCompetitorsCount(leaderboard);
races += HomeServiceUtil.calculateRaceCount(leaderboard);
races += HomeServiceUtil.calculateRaceColumnCount(leaderboard);
trackedRaces += HomeServiceUtil.calculateTrackedRaceCount(leaderboard);
regattas++;
String disableStats = System.getenv("DISABLE_STATS");
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventview/HasRegattaMetadata.java
-2
View File
@@ -26,8 +26,6 @@ public interface HasRegattaMetadata {
int getCompetitorsCount();
int getTrackedRacesCount();
String getBoatClass();
String getBoatCategory();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/eventview/RegattaMetadataDTO.java
-10
View File
@@ -6,7 +6,6 @@ import java.util.Date;
public class RegattaMetadataDTO extends RegattaReferenceDTO implements HasRegattaMetadata {
private int raceCount;
private int competitorsCount;
private int trackedRacesCount;
private String boatClass;
private String boatCategory;
private String defaultCourseAreaName;
@@ -39,15 +38,6 @@ public class RegattaMetadataDTO extends RegattaReferenceDTO implements HasRegatt
this.competitorsCount = competitorsCount;
}
@Override
public int getTrackedRacesCount() {
return trackedRacesCount;
}
public void setTrackedRacesCount(int trackedRacesCount) {
this.trackedRacesCount = trackedRacesCount;
}
@Override
public String getBoatClass() {
return boatClass;