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

added column in leaderboard group table; fixed UI parts; added storage test

Browse Source
This commit is contained in:
Axel Uhl committed 2014-08-05 00:19:06 +02:00
1 parent 2dd99d09ac
commit ec01ea43e2
5 files changed
+15 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
+9
View File
@@ -492,6 +492,13 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
return group.description.length() <= 100 ? group.description : group.description.substring(0, 98) + "...";
}
};
TextColumn<LeaderboardGroupDTO> groupDisplayNameColumn = new TextColumn<LeaderboardGroupDTO>() {
@Override
public String getValue(LeaderboardGroupDTO group) {
return group.getDisplayName() == null ? "" :
group.getDisplayName().length() <= 100 ? group.getDisplayName() : group.getDisplayName().substring(0, 98) + "...";
}
};
TextColumn<LeaderboardGroupDTO> hasOverallLeaderboardColumn = new TextColumn<LeaderboardGroupDTO>() {
@Override
public String getValue(LeaderboardGroupDTO group) {
@@ -533,6 +540,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
groupsTable.setWidth("100%");
groupsTable.addColumn(groupNameColumn, stringMessages.name());
groupsTable.addColumn(groupDescriptionColumn, stringMessages.description());
groupsTable.addColumn(groupDisplayNameColumn, stringMessages.displayName());
groupsTable.addColumn(hasOverallLeaderboardColumn, stringMessages.useOverallLeaderboard());
groupsTable.addColumn(groupActionsColumn, stringMessages.actions());
groupsTable.addColumnSortHandler(leaderboardGroupsListHandler);
@@ -671,6 +679,7 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
if (oldGroupName.equals(group.getName())) {
groupToUpdate.setName(updateDescriptor.getName());
groupToUpdate.description = updateDescriptor.getDescription();
groupToUpdate.setDisplayName(updateDescriptor.getDisplayName());
groupToUpdate.displayLeaderboardsInReverseOrder = updateDescriptor.isDisplayLeaderboardsInReverseOrder();
groupToUpdate.setOverallLeaderboardDiscardThresholds(updateDescriptor.getOverallLeaderboardDiscardThresholds());
groupToUpdate.setOverallLeaderboardScoringSchemeType(updateDescriptor.getOverallLeaderboardScoringSchemeType());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupCreateDialog.java
+1 -1
View File
@@ -17,7 +17,7 @@ public class LeaderboardGroupCreateDialog extends LeaderboardGroupDialog {
descriptionEntryField = createTextArea(null);
descriptionEntryField.ensureDebugId("DescriptionTextArea");
displayNameEntryField = createTextArea(null);
displayNameEntryField = createTextBox("");
displayNameEntryField.ensureDebugId("DisplayNameTextArea");
displayLeaderboardsInReverseOrderCheckBox.setValue(false);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java
+1 -3
View File
@@ -27,7 +27,7 @@ public class LeaderboardGroupDialog extends DataEntryDialog<LeaderboardGroupDial
protected StringMessages stringMessages;
protected TextBox nameEntryField;
protected TextArea descriptionEntryField;
protected TextArea displayNameEntryField;
protected TextBox displayNameEntryField;
protected CheckBox displayLeaderboardsInReverseOrderCheckBox;
protected CheckBox useOverallLeaderboardCheckBox;
private Panel overallLeaderboardConfigPanel;
@@ -180,8 +180,6 @@ public class LeaderboardGroupDialog extends DataEntryDialog<LeaderboardGroupDial
descriptionEntryField.getElement().getStyle().setProperty("resize", "none");
panel.add(descriptionEntryField);
panel.add(new Label(stringMessages.displayName()));
displayNameEntryField.setCharacterWidth(30);
displayNameEntryField.setVisibleLines(6);
displayNameEntryField.getElement().getStyle().setProperty("resize", "none");
panel.add(displayNameEntryField);
panel.add(displayLeaderboardsInReverseOrderCheckBox);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupEditDialog.java
+1 -1
View File
@@ -13,7 +13,7 @@ public class LeaderboardGroupEditDialog extends LeaderboardGroupDialog {
getOverallLeaderboardScoringSchemeListBox().setEnabled(!group.hasOverallLeaderboard());
nameEntryField = createTextBox(group.getName(), 50);
descriptionEntryField = createTextArea(group.description);
displayNameEntryField = createTextArea(group.getDisplayName());
displayNameEntryField = createTextBox(group.getDisplayName());
displayLeaderboardsInReverseOrderCheckBox.setValue(group.displayLeaderboardsInReverseOrder);
displayLeaderboardsInReverseOrderCheckBox.setEnabled(false);
useOverallLeaderboardCheckBox.setValue(group.hasOverallLeaderboard());
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboardGroups.java
+3 -1
View File
@@ -336,6 +336,7 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe
final String groupName = "Leaderboard Group";
final String groupDescription = "A leaderboard group";
final String groupDisplayName = "Some short name";
final ArrayList<Leaderboard> leaderboards = new ArrayList<>();
Leaderboard leaderboard = new FlexibleLeaderboardImpl(leaderboardNames[0], new ThresholdBasedResultDiscardingRuleImpl(discardIndexResultsStartingWithHowManyRaces),
@@ -351,7 +352,7 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe
new LowPoint(), null);
leaderboards.add(leaderboard);
final LeaderboardGroup leaderboardGroup = new LeaderboardGroupImpl(groupName, groupDescription, /* displayName */ null, false, leaderboards);
final LeaderboardGroup leaderboardGroup = new LeaderboardGroupImpl(groupName, groupDescription, groupDisplayName, false, leaderboards);
mongoObjectFactory.storeLeaderboardGroup(leaderboardGroup);
final LeaderboardGroup loadedLeaderboardGroup = domainObjectFactory.loadLeaderboardGroup(groupName, /* regattaRegistry */ null,
@@ -359,6 +360,7 @@ public class TestStoringAndRetrievingLeaderboardGroups extends AbstractMongoDBTe
Assert.assertEquals(groupName, loadedLeaderboardGroup.getName());
Assert.assertEquals(groupDescription, loadedLeaderboardGroup.getDescription());
Assert.assertEquals(groupDisplayName, loadedLeaderboardGroup.getDisplayName());
int c = 0;
for (Leaderboard board : leaderboardGroup.getLeaderboards()) {