eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 13:20:57 +00:00
Code Activity

in preparation of a solution to bug 3358, added FIELD_TEAM_IMAGE_URI to CompetitorsResource output document

Browse Source
This commit is contained in:
Axel Uhl committed 2016-04-01 00:47:54 +02:00
1 parent 6b548b5718
commit d62104d7b0
3 files changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompetitorJsonConstants.java
+1
View File
@@ -23,6 +23,7 @@ public class CompetitorJsonConstants {
public static final String FIELD_DISPLAY_COLOR = "displayColor";
public static final String FIELD_EMAIL = "email";
public static final String FIELD_FLAG_IMAGE_URI = "flagImageUri";
public static final String FIELD_TEAM_IMAGE_URI = "teamImageUri";
public static final String FIELD_TIME_ON_TIME_FACTOR = "timeOnTimeFactor";
public static final String FIELD_TIME_ON_DISTANCE_ALLOWANCE_IN_SECONDS_PER_NAUTICAL_MILE = "timeOnDistanceAllowanceInSecondsPerNauticalMile";
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/CompetitorsResource.java
+4 -1
View File
@@ -58,9 +58,12 @@ public class CompetitorsResource extends AbstractSailingServerResource {
json.put(CompetitorJsonConstants.FIELD_COUNTRY_CODE, nationality==null?null:nationality.getCountryCode().getTwoLetterISOCode());
json.put(CompetitorJsonConstants.FIELD_BOAT_CLASS_NAME, competitor.getBoat().getBoatClass().getName());
json.put(CompetitorJsonConstants.FIELD_COLOR, competitor.getColor() != null ? competitor.getColor().getAsHtml() : null);
if(competitor.getFlagImage() != null) {
if (competitor.getFlagImage() != null) {
json.put(CompetitorJsonConstants.FIELD_FLAG_IMAGE, competitor.getFlagImage().toString());
}
if (competitor.getTeam().getImage() != null) {
json.put(CompetitorJsonConstants.FIELD_TEAM_IMAGE_URI, competitor.getTeam().getImage().toString());
}
return json;
}
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
+1 -3
View File
@@ -202,18 +202,16 @@ public class CheckinManager {
private void getCompetitorFromServer(HttpGetRequest getCompetitorRequest, final URLData urlData, final String leaderboardName) {
NetworkHelper.getInstance(activity)
.executeHttpJsonRequestAsync(getCompetitorRequest, new NetworkHelper.NetworkHelperSuccessListener() {
@Override
public void performAction(JSONObject response) {
activity.dismissProgressDialog();
try {
// TODO review constants
urlData.competitorName = response.getString(CompetitorJsonConstants.FIELD_NAME);
urlData.competitorId = response.getString(CompetitorJsonConstants.FIELD_ID);
urlData.competitorSailId = response.getString(CompetitorJsonConstants.FIELD_SAIL_ID);
urlData.competitorNationality = response.getString(CompetitorJsonConstants.FIELD_NATIONALITY);
urlData.competitorCountryCode = response.getString(CompetitorJsonConstants.FIELD_COUNTRY_CODE);
// TODO Bug 3358: get optional team image from CompetitorJsonConstants.FIELD_TEAM_IMAGE_URI
} catch (JSONException e) {
ExLog.e(activity, TAG, "Error getting data from call on URL: " + urlData.competitorUrl + ", Error: " + e.getMessage());
handleApiError();