mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-30 17:36:40 +00:00
Moved components of the group overview to collapsable panels
This commit is contained in:
1 parent
3b973a3a48
commit
226a20ed44
2 files changed
+23
-16
No files matched your search
@@ -14,6 +14,7 @@
|
||||
<meta content='black' name='apple-mobile-web-app-status-bar-style'>
|
||||
<!-- <link href='iphone-splash-screen.png' rel='apple-touch-startup-image'> -->
|
||||
<link href='images/sap-sailing-app-icon.png' rel='apple-touch-icon'>
|
||||
<link href="CommonControls.css" rel="stylesheet" type="text/css">
|
||||
|
||||
<!--<link href='http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic' rel='stylesheet' type='text/css'>-->
|
||||
<!-- -->
|
||||
@@ -25,12 +26,6 @@
|
||||
<!-- -->
|
||||
<title>SAP Sailing Analytics Spectator Vision</title>
|
||||
|
||||
<script id="sap-ui-bootstrap"
|
||||
type="text/javascript"
|
||||
src="resources/sap-ui-core.js"
|
||||
data-sap-ui-theme="sap_platinum"
|
||||
data-sap-ui-libs="sap.ui.commons"></script>
|
||||
|
||||
<!-- -->
|
||||
<!-- This script loads your compiled module. -->
|
||||
<!-- If you add any GWT meta tags, they must -->
|
||||
|
||||
+22
-10
@@ -36,6 +36,7 @@ import com.sap.sailing.gwt.ui.client.URLFactory;
|
||||
import com.sap.sailing.gwt.ui.shared.LeaderboardDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.PlacemarkOrderDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.components.CollapsablePanel;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -81,7 +82,13 @@ public class LeaderboardGroupOverviewPanel extends FormPanel {
|
||||
// Build search GUI
|
||||
FlowPanel searchPanel = new FlowPanel();
|
||||
searchPanel.setWidth("100%");
|
||||
mainPanel.add(searchPanel);
|
||||
|
||||
CollapsablePanel collapsableSearchPanel = new CollapsablePanel(this.stringMessages.searchEvents(), false);
|
||||
collapsableSearchPanel.setContent(searchPanel);
|
||||
collapsableSearchPanel.setCollapsingEnabled(false);
|
||||
collapsableSearchPanel.setOpen(true);
|
||||
collapsableSearchPanel.setWidth("100%");
|
||||
mainPanel.add(collapsableSearchPanel);
|
||||
|
||||
Label locationLabel = new Label(this.stringMessages.location() + ":");
|
||||
locationLabel.setStyleName(STYLE_NAME_PREFIX + "searchLabel");
|
||||
@@ -157,7 +164,12 @@ public class LeaderboardGroupOverviewPanel extends FormPanel {
|
||||
//Build group GUI
|
||||
FlowPanel groupPanel = new FlowPanel();
|
||||
groupPanel.setStyleName(STYLE_NAME_PREFIX + "groupPanel");
|
||||
mainPanel.add(groupPanel);
|
||||
|
||||
CollapsablePanel collapsableGroupPanel = new CollapsablePanel(this.stringMessages.leaderboardGroups(), false);
|
||||
collapsableGroupPanel.setContent(groupPanel);
|
||||
collapsableGroupPanel.setOpen(true);
|
||||
collapsableGroupPanel.setWidth("100%");
|
||||
mainPanel.add(collapsableGroupPanel);
|
||||
|
||||
TextColumn<LeaderboardGroupDTO> groupsLocationColumn = new TextColumn<LeaderboardGroupDTO>() {
|
||||
@Override
|
||||
@@ -223,14 +235,14 @@ public class LeaderboardGroupOverviewPanel extends FormPanel {
|
||||
groupsDataProvider.addDataDisplay(groupsTable);
|
||||
|
||||
ListHandler<LeaderboardGroupDTO> groupsListHandler = new ListHandler<LeaderboardGroupDTO>(groupsDataProvider.getList());
|
||||
groupsListHandler.setComparator(groupsLocationColumn, new Comparator<LeaderboardGroupDTO>() {
|
||||
@Override
|
||||
public int compare(LeaderboardGroupDTO g1, LeaderboardGroupDTO g2) {
|
||||
String places1 = PlacemarkOrderDTO.placemarksOfAllOrderAsSeperatedString(g1.getGroupPlaces(), true);
|
||||
String places2 = PlacemarkOrderDTO.placemarksOfAllOrderAsSeperatedString(g2.getGroupPlaces(), true);
|
||||
return places1.compareTo(places2);
|
||||
}
|
||||
});
|
||||
groupsListHandler.setComparator(groupsLocationColumn, new Comparator<LeaderboardGroupDTO>() {
|
||||
@Override
|
||||
public int compare(LeaderboardGroupDTO g1, LeaderboardGroupDTO g2) {
|
||||
String places1 = PlacemarkOrderDTO.placemarksOfAllOrderAsSeperatedString(g1.getGroupPlaces(), true);
|
||||
String places2 = PlacemarkOrderDTO.placemarksOfAllOrderAsSeperatedString(g2.getGroupPlaces(), true);
|
||||
return places1.compareTo(places2);
|
||||
}
|
||||
});
|
||||
groupsListHandler.setComparator(groupsNameColumn, new Comparator<LeaderboardGroupDTO>() {
|
||||
@Override
|
||||
public int compare(LeaderboardGroupDTO g1, LeaderboardGroupDTO g2) {
|
||||
|
||||
Reference in new issue
Block a user