eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 22:19:13 +00:00
Code Activity

Merge remote-tracking branch 'origin/master' into simulator_dev

Browse Source
This commit is contained in:
Christopher Ronnewinkel (D036654)
2013-07-11 14:21:41 +02:00
parent 84aaa062f3 e61c7e8777
commit a656795d41
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/IncrementalLeaderboardDTO.java
+4 -1
View File
@@ -427,7 +427,10 @@ public class IncrementalLeaderboardDTO extends LeaderboardDTO implements Increme
if (!rowsUnchangedForCompetitors.contains(previousCompetitor)) { // only care if not the entire row was marked unchanged
LeaderboardEntryDTO previousEntry = previousVersion.rows.get(previousCompetitor).fieldsByRaceColumnName.get(
competitorAndColumnName.getB());
rows.get(previousCompetitor).fieldsByRaceColumnName.put(competitorAndColumnName.getB(), previousEntry);
final LeaderboardRowDTO row = rows.get(previousCompetitor);
if (row != null) { // may be null if the competitor disappeared, e.g., because of suppression
row.fieldsByRaceColumnName.put(competitorAndColumnName.getB(), previousEntry);
}
}
}
}
java/com.sap.sailing.www/index.html
+15 -6
View File
@@ -169,8 +169,6 @@
<h2 class='articleSubheadline'>2012</h2>
<h4>Championships</h4>
<div class='timeBar'>
<div class='raceSection'>
<h5 class='date'>
@@ -221,8 +219,6 @@
</div>
</div>
<h4>Other events</h4>
<div class='timeBar'>
<div class='raceSection'>
<h5 class='date'>
@@ -307,8 +303,6 @@
<h2 class='articleSubheadline'>2011</h2>
<h4>Championships</h4>
<div class='timeBar'>
<div class='raceSection'>
<h5 class='date'>
@@ -354,6 +348,21 @@
<div class='raceDescription'>
<p>Meisterschaft der Meister 2011</p>&nbsp;</div>
</div>
<div class='raceSection'>
<h5 class='date'>
2011
</h5>
<div class='raceTimepoint'></div>
<a href='http://kielerwoche2011.sapsailing.com' target='_blank'>
<ul class='racePanel'>
<li class='raceName'>Kieler Woche 2011</li>
<li class='raceLocation'>Kiel, Germany</li>
</ul>
</a>
<div class='raceDescription'>
<p>Kieler Woche 2011</p>&nbsp;</div>
</div>
</div>
</div>
</div>