eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 06:28:41 +00:00
Code Activity

bug4104: Created label containing filter name, needs to be added to ui

Browse Source
This commit is contained in:
D067890
2018-08-15 13:48:48 +02:00
parent 9b315a36b6
commit 01456fed48
2 changed files with 28 additions and 6 deletions
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/client/TagListProvider.java
+22 -4
View File
@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.view.client.ListDataProvider;
import com.sap.sailing.gwt.ui.shared.TagDTO;
import com.sap.sse.common.Util;
@@ -17,8 +19,14 @@ import com.sap.sse.common.filter.FilterSet;
public class TagListProvider extends ListDataProvider<TagDTO> {
private List<TagDTO> allTags = new ArrayList<TagDTO>();
private FilterSet<TagDTO, Filter<TagDTO>> currentFilterSet;
private FilterSet<TagDTO, Filter<TagDTO>> currentFilterSet;
private Label filterInformationLabel;
public TagListProvider(Label filterInformationLabel) {
this.filterInformationLabel = filterInformationLabel;
}
public List<TagDTO> getAllTags() {
return allTags;
@@ -82,9 +90,19 @@ public class TagListProvider extends ListDataProvider<TagDTO> {
}
public void setTagsFilterSet(FilterSet<TagDTO, Filter<TagDTO>> tagsFilterSet) {
this.currentFilterSet = tagsFilterSet;
this.updateFilteredTags();
this.refresh();
if(filterInformationLabel != null) {
if(tagsFilterSet != null) {
filterInformationLabel.setText(tagsFilterSet.getName());
filterInformationLabel.setVisible(true);
}
else {
filterInformationLabel.setVisible(false);
}
}
updateFilteredTags();
currentFilterSet = tagsFilterSet;
refresh();
}
public int getFilteredTagsListSize() {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/TaggingPanel.java
+6 -2
View File
@@ -968,6 +968,7 @@ public class TaggingPanel extends ComponentWithoutSettings
private final HeaderPanel panel;
private final TagCreationPanel tagCreationPanel;
private final Panel filterbarPanel;
private final Label currentFilterLabel;
private final ScrollPanel contentPanel;
private final CellList<TagDTO> tagCellList;
private final SingleSelectionModel<TagDTO> tagSelectionModel;
@@ -993,7 +994,9 @@ public class TaggingPanel extends ComponentWithoutSettings
TagPanelResources.INSTANCE.style().ensureInjected();
CellListResources.INSTANCE.cellListStyle().ensureInjected();
tagListProvider = new TagListProvider();
//TODO Add this label to ui
currentFilterLabel = new Label();
tagListProvider = new TagListProvider(currentFilterLabel);
customTagButtons = new ArrayList<TagButton>();
panel = new HeaderPanel();
@@ -1044,7 +1047,8 @@ public class TaggingPanel extends ComponentWithoutSettings
timer.setTime(tagSelectionModel.getSelectedObject().getRaceTimepoint().asMillis());
}
});
contentPanel.add(currentFilterLabel);
contentPanel.add(tagCellList);
contentPanel.getElement().getStyle().setHeight(100, Unit.PCT);
contentPanel.getElement().getStyle().setPaddingTop(10, Unit.PX);