mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-03 19:03:52 +00:00
fixed two minor problems with css and dateformat
This commit is contained in:
1 parent
ed53333f9e
commit
83c9409cd3
2 files changed
+35
-10
No files matched your search
+30
-9
@@ -1,5 +1,6 @@
|
||||
package com.sap.sailing.gwt.ui.client;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@@ -35,12 +36,16 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer,
|
||||
|
||||
private CellTable<Triple<EventDAO, RegattaDAO, RaceDAO>> raceTable;
|
||||
|
||||
private ListBox regattaComboBox = null;
|
||||
private ListBox regattasComboBox = null;
|
||||
|
||||
private ListBox eventsComboBox = null;
|
||||
|
||||
private ListDataProvider<Triple<EventDAO, RegattaDAO, RaceDAO>> raceList;
|
||||
|
||||
private VerticalPanel panel;
|
||||
|
||||
|
||||
private final DateFormat df = DateFormat.getDateTimeInstance();
|
||||
|
||||
public TrackedEventsComposite(StringConstants stringConstants, boolean multiSelection) {
|
||||
this.multiSelection = multiSelection;
|
||||
this.raceSelectionChangeListeners = new HashSet<RaceSelectionChangeListener>();
|
||||
@@ -115,12 +120,19 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer,
|
||||
if(raceTable == null)
|
||||
{
|
||||
panel = new VerticalPanel();
|
||||
|
||||
regattaComboBox = new ListBox();
|
||||
regattaComboBox.addItem("All Regattas");
|
||||
|
||||
panel.add(regattaComboBox);
|
||||
/*
|
||||
HorizontalPanel regattaFilterPanel = new HorizontalPanel();
|
||||
panel.add(regattaFilterPanel);
|
||||
|
||||
Label regattaFilterLabel = new Label("Filter by regatta: ");
|
||||
regattaFilterLabel.setWordWrap(false);
|
||||
regattaFilterPanel.add(regattaFilterLabel);
|
||||
|
||||
regattasComboBox = new ListBox();
|
||||
regattasComboBox.addItem("All Regattas");
|
||||
|
||||
regattaFilterPanel.add(regattasComboBox);
|
||||
*/
|
||||
AdminConsoleTableResources tableRes = GWT.create(AdminConsoleTableResources.class);
|
||||
raceTable = new CellTable<Triple<EventDAO, RegattaDAO, RaceDAO>>(/* pageSize */ 200, tableRes);
|
||||
|
||||
@@ -131,6 +143,13 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer,
|
||||
}
|
||||
};
|
||||
|
||||
TextColumn<Triple<EventDAO, RegattaDAO, RaceDAO>> regattaNameColumn = new TextColumn<Triple<EventDAO, RegattaDAO, RaceDAO>>() {
|
||||
@Override
|
||||
public String getValue(Triple<EventDAO, RegattaDAO, RaceDAO> object) {
|
||||
return object.getB().boatClass.name;
|
||||
}
|
||||
};
|
||||
|
||||
TextColumn<Triple<EventDAO, RegattaDAO, RaceDAO>> raceNameColumn = new TextColumn<Triple<EventDAO, RegattaDAO, RaceDAO>>() {
|
||||
@Override
|
||||
public String getValue(Triple<EventDAO, RegattaDAO, RaceDAO> object) {
|
||||
@@ -141,8 +160,9 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer,
|
||||
TextColumn<Triple<EventDAO, RegattaDAO, RaceDAO>> raceStartColumn = new TextColumn<Triple<EventDAO, RegattaDAO, RaceDAO>>() {
|
||||
@Override
|
||||
public String getValue(Triple<EventDAO, RegattaDAO, RaceDAO> object) {
|
||||
if(object.getC().startOfRace != null)
|
||||
return object.getC().startOfRace.toString();
|
||||
if(object.getC().startOfRace != null) {
|
||||
return df.format(object.getC().startOfRace);
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
@@ -159,6 +179,7 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer,
|
||||
};
|
||||
|
||||
raceTable.addColumn(eventNameColumn, "Event");
|
||||
raceTable.addColumn(regattaNameColumn, "Regatta");
|
||||
raceTable.addColumn(raceNameColumn, "Race");
|
||||
raceTable.addColumn(raceStartColumn, "Start time");
|
||||
raceTable.addColumn(raceTrackedColumn, "Tracked");
|
||||
|
||||
@@ -11,4 +11,8 @@
|
||||
|
||||
.paddedPanel {
|
||||
padding: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.linkNoBorder {
|
||||
border: none;
|
||||
}
|
||||
Reference in new issue
Block a user