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

minor fixes from code review

Browse Source
This commit is contained in:
Thomas Wiese
2018-10-16 09:02:29 +02:00
parent 96cdbcc9c5
commit be1f1fd6c5
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+1 -1
View File
@@ -1285,7 +1285,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
CompetitorRegistrationType competitorRegistrationType;
if (dbRegatta.containsField(FieldNames.REGATTA_COMPETITOR_REGISTRATION_TYPE.name())) {
String competitorRegistrationTypeName = (String) dbRegatta
final String competitorRegistrationTypeName = (String) dbRegatta
.get(FieldNames.REGATTA_COMPETITOR_REGISTRATION_TYPE.name());
try {
competitorRegistrationType = competitorRegistrationTypeName == null
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
+9
View File
@@ -236,7 +236,16 @@ public interface Regatta extends NamedWithID, IsRegattaLike, HasRaceColumnsAndRe
*/
void setControlTrackingFromStartAndFinishTimes(boolean controlTrackingFromStartAndFinishTimes);
/**
* get secret for registration link of open regattas.
* @return secret to append on regisration URL
*/
String getRegistrationLinkSecret();
/**
* set secret for registration link of open regattas to be appended to the URL.
* @param registrationLinkSecret secret string
*/
void setRegistrationLinkSecret(String registrationLinkSecret);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
+1 -1
View File
@@ -1169,7 +1169,7 @@ canBoatsChange=Boot kann sich ändern
canNotRegisterBoats=Boote können hier nur registriert werden, wenn sie sich pro Wettfahrt ändern, ansonsten werden sie zusammen mit dem Teilnehmer registriert.
competitorRegistrationType=Teilnehmerregistrierung
competitorRegistrationTypeShort=Registrierung
competitorRegistrationTypeClosed=geschlossen
competitorRegistrationTypeClosed=Geschlossen
competitorRegistrationTypeOpenModerated=Öffentlich moderiert
competitorRegistrationTypeOpenUnmoderated=Öffentlich unmoderiert
registrationLink=Registrierungslink
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
-1
View File
@@ -4689,7 +4689,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
}
private void createRegattaFromRegattaDTO(RegattaDTO regatta) {
logger.info("Create Regatta from DTO " + regatta);
SecurityUtils.getSubject().checkPermission(Permission.REGATTA.getStringPermissionForObjects(Mode.CREATE, regatta.getName()));
this.createRegatta(regatta.getName(), regatta.boatClass.getName(), regatta.canBoatsOfCompetitorsChangePerRace,
regatta.competitorRegistrationType, /* registrationLinkSecret */ null, regatta.startDate,
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
+1 -1
View File
@@ -547,7 +547,7 @@ public class TestStoringAndLoadingEventsAndRegattas extends AbstractMongoDBTest
.getName(), q2YellowTrackedRace.getRaceIdentifier()));
MaxPointsReason hassosLoadedMaxPointsReason = loadedLeaderboard.getScoreCorrection().getMaxPointsReason(hasso, loadedQ2, MillisecondsTimePoint.now());
assertEquals(MaxPointsReason.DNF, hassosLoadedMaxPointsReason);
assertTrue(regatta.getCompetitorRegistrationType() == loadedRegatta.getCompetitorRegistrationType());
assertEquals(regatta.getCompetitorRegistrationType(), loadedRegatta.getCompetitorRegistrationType());
}
private void logColumnsInRegattaLeaderboard(RegattaLeaderboard regattaLeaderboard) {
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RegattaJsonSerializer.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class RegattaJsonSerializer implements JsonSerializer<Regatta> {
result.put(FIELD_COURSE_AREA_ID,
regatta.getDefaultCourseArea() != null ? regatta.getDefaultCourseArea().getId().toString() : null);
result.put(FIELD_CAN_BOATS_OF_COMPETITORS_CHANGE_PER_RACE, regatta.canBoatsOfCompetitorsChangePerRace());
result.put(FIELD_COMPETITOR_REGISTRATION_TYPE, regatta.getCompetitorRegistrationType().name());
result.put(FIELD_COMPETITOR_REGISTRATION_TYPE, regatta.getCompetitorRegistrationType().name());
if (seriesSerializer != null) {
JSONArray seriesJson = new JSONArray();
for (Series series : regatta.getSeries()) {
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
+1 -3
View File
@@ -442,9 +442,7 @@ public class EventsResource extends AbstractSailingServerResource {
}
return new Util.Triple<>(event, leaderboardGroup, leaderboard);
}
public static void main(String...a) {
System.out.println(StringUtils.join(CompetitorRegistrationType.values(), ", "));
}
private LeaderboardGroup validateAndAddLeaderboardGroup(UUID eventId, String leaderboardGroupName,
String leaderboardGroupDescription, String leaderboardGroupDisplayName,
boolean displayGroupsInReverseOrder, List<String> leaderboardNamesParam,
java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class StructureImporter {
RegattaImpl regatta = new RegattaImpl(RegattaImpl.getDefaultName(event.getTitle(), ((Division) event
.getRaceOrDivisionOrRegattaSeriesResult().get(0)).getTitle()),
baseDomainFactory.getOrCreateBoatClass(result.getA().getBoatClass()),
/* canBoatsOfCompetitorsChangePerRace */ true, CompetitorRegistrationType.CLOSED,
/* canBoatsOfCompetitorsChangePerRace */ true, CompetitorRegistrationType.CLOSED,
startDate, endDate, getSeries(buildStructure), false,
this.baseDomainFactory.createScoringScheme(ScoringSchemeType.LOW_POINT), event.getEventID(), null, OneDesignRankingMetric::new);
addSpecificRegattas.add(regatta);