eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-16 09:11:02 +00:00
Code Activity

Fixed calculation of the overall series state

Browse Source
This commit is contained in:
Steffen Schaefer committed 2015-03-16 11:13:11 +01:00
1 parent 23a21ca67b
commit e1462316e5
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+4 -4
View File
@@ -5586,20 +5586,20 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
}); });
boolean oneEventStarted = false; boolean oneEventStarted = false;
boolean oneEventLive = false; boolean oneEventLive = false;
boolean oneEventNotFinished = false; boolean allFinished = true;
for(Event eventInSeries: fakeSeriesEvents) { for(Event eventInSeries: fakeSeriesEvents) {
EventMetadataDTO eventOfSeries = convertToMetadataDTO(eventInSeries); EventMetadataDTO eventOfSeries = convertToMetadataDTO(eventInSeries);
dto.addEvent(eventOfSeries); dto.addEvent(eventOfSeries);
oneEventStarted |= eventOfSeries.isStarted(); oneEventStarted |= eventOfSeries.isStarted();
oneEventLive |= (eventOfSeries.isStarted() && eventOfSeries.isFinished()); oneEventLive |= (eventOfSeries.isStarted() && !eventOfSeries.isFinished());
oneEventNotFinished |= !eventOfSeries.isFinished(); allFinished &= eventOfSeries.isFinished();
} }
if(oneEventLive) { if(oneEventLive) {
dto.setState(EventSeriesState.RUNNING); dto.setState(EventSeriesState.RUNNING);
} else if(!oneEventStarted) { } else if(!oneEventStarted) {
dto.setState(EventSeriesState.UPCOMING); dto.setState(EventSeriesState.UPCOMING);
} else if(!oneEventNotFinished) { } else if(allFinished) {
dto.setState(EventSeriesState.FINISHED); dto.setState(EventSeriesState.FINISHED);
} else { } else {
dto.setState(EventSeriesState.IN_PROGRESS); dto.setState(EventSeriesState.IN_PROGRESS);