eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-22 03:53:56 +00:00
Code Activity

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

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
This commit is contained in:
Steffen Schaefer committed 2016-04-21 09:23:17 +02:00
2 parents 5fd41cf840 4b32ef5187
commit 526bfb32b5
345 files changed
+27141 -8483
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/resources/shiro.ini
+2
View File
@@ -21,6 +21,8 @@ sessionManager = com.sap.sse.security.SecurityWebSessionManager
securityManager.sessionManager = $sessionManager
sessionDAO = org.apache.shiro.session.mgt.eis.EnterpriseCacheSessionDAO
securityManager.sessionManager.sessionDAO = $sessionDAO
# 24h timeout
securityManager.sessionManager.globalSessionTimeout = 86400000
cacheManager = com.sap.sse.security.SessionCacheManager
securityManager.cacheManager = $cacheManager
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/WindStatusHtmlServlet.java
+2 -2
View File
@@ -54,10 +54,10 @@ public class WindStatusHtmlServlet extends WindStatusServlet implements IgtimiWi
TimePoint latestTimePoint = copyOfLastIgtimiMessages.peek().getWind().getTimePoint();
long lastFixDiffInMs = System.currentTimeMillis() - latestTimePoint.asMillis();
out.println("    Last fix:");
if(lastFixDiffInMs / 1000 < 60) {
if (lastFixDiffInMs / 1000 < 60) {
out.println(lastFixDiffInMs / 1000 +"s ago");
} else {
out.println("<span style=\"color:red;\">" + lastFixDiffInMs / 1000 +"min ago</span>");
out.println("<span style=\"color:red;\">" + lastFixDiffInMs / 1000 / 60 +"min ago</span>");
}
}
out.println("<br/>");
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class RaceGroupFactory {
skippedFirst = true;
} else {
Fleet fleet = raceColumn.getFleetByName(fleetName);
cells.add(new RaceCellImpl(raceColumn.getName(), raceColumn.getRaceLog(fleet)));
cells.add(new RaceCellImpl(raceColumn.getName(), raceColumn.getRaceLog(fleet), raceColumn.getFactor(), raceColumn.getExplicitFactor()));
}
}
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java
+2 -1
View File
@@ -165,7 +165,8 @@ public class CompetitorsResource extends AbstractSailingServerResource {
}
getService().getCompetitorStore().updateCompetitor(competitorId, competitor.getName(), competitor.getColor(), competitor.getEmail(),
competitor.getBoat().getSailID(), competitor.getTeam().getNationality(), imageUri, competitor.getFlagImage(), /* timeOnTimeFactor */ null, /* timeOnDistanceAllowancePerNauticalMile */ null);
competitor.getBoat().getSailID(), competitor.getTeam().getNationality(), imageUri, competitor.getFlagImage(),
/* timeOnTimeFactor */ null, /* timeOnDistanceAllowancePerNauticalMile */ null, competitor.getSearchTag());
logger.log(Level.INFO, "Set team image for competitor " + competitor.getName());
JSONObject result = new JSONObject();
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
+7 -6
View File
@@ -57,6 +57,7 @@ import com.sap.sailing.domain.common.dto.LeaderboardDTO;
import com.sap.sailing.domain.common.dto.LeaderboardEntryDTO;
import com.sap.sailing.domain.common.dto.LeaderboardRowDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
import com.sap.sailing.domain.common.impl.RaceColumnConstants;
import com.sap.sailing.domain.common.racelog.RaceLogServletConstants;
import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
import com.sap.sailing.domain.common.security.Permission;
@@ -678,16 +679,16 @@ public class LeaderboardsResource extends AbstractSailingServerResource {
private JSONObject getJsonForColumnFactors(final Leaderboard leaderboard, final Iterable<RaceColumn> raceColumns) {
final JSONObject json = new JSONObject();
json.put("leaderboard_name", leaderboard.getName());
json.put("leaderboard_display_name", leaderboard.getDisplayName());
json.put(RaceColumnConstants.LEADERBOARD_NAME, leaderboard.getName());
json.put(RaceColumnConstants.LEADERBOARD_DISPLAY_NAME, leaderboard.getDisplayName());
final JSONArray raceColumnsAsJson = new JSONArray();
json.put("race_columns", raceColumnsAsJson);
json.put(RaceColumnConstants.RACE_COLUMNS, raceColumnsAsJson);
for (final RaceColumn rc : raceColumns) {
final JSONObject raceColumnAsJson = new JSONObject();
raceColumnsAsJson.add(raceColumnAsJson);
raceColumnAsJson.put("race_column_name", rc.getName());
raceColumnAsJson.put("explicit_factor", rc.getExplicitFactor());
raceColumnAsJson.put("factor", rc.getFactor());
raceColumnAsJson.put(RaceColumnConstants.RACE_COLUMN_NAME, rc.getName());
raceColumnAsJson.put(RaceColumnConstants.EXPLICIT_FACTOR, rc.getExplicitFactor());
raceColumnAsJson.put(RaceColumnConstants.FACTOR, rc.getFactor());
}
return json;
}