Skip to content

Front-end Log Table Sorting #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbl-eea-sk wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Front-end Log Table Sorting #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cf92ef
Descending sorting of log table applied
Sep 2, 2015
8863fbe
Extended for Events table
mbl-eea-sk Sep 3, 2015
6484a33
Merge branch 'develop' into feature/Resolve#518
eea03 Sep 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/LogTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public class LogTable extends CustomComponent {
public LogTable(DbCachedSource<Log> dataSouce, LogFacade logFacade, int pageLenght, int iconHeight) {
this.dataSouce = dataSouce;
this.container = new ReadOnlyContainer<>(dataSouce);
container.sort(new Object[] { "id" }, new boolean[] { false });
this.logFacade = logFacade;
this.iconHeight = iconHeight;

Expand All @@ -116,14 +117,12 @@ public LogTable(DbCachedSource<Log> dataSouce, LogFacade logFacade, int pageLeng
*/
private void buildLayout(int pageLenght) {
mainLayout = new VerticalLayout();

table = new IntlibPagedTable();
table.setSelectable(true);
table.setImmediate(true);
table.setSizeFull();
table.setColumnCollapsingAllowed(true);
this.table.setNullSelectionAllowed(false);

table.setNullSelectionAllowed(false);
table.addItemClickListener(new ItemClickEvent.ItemClickListener() {
@Override
public void itemClick(ItemClickEvent event) {
Expand Down Expand Up @@ -350,8 +349,8 @@ public void setExecution(PipelineExecution exec, DPUInstanceRecord dpuInstance)
// set container to the table -- we may possibly re-set this
// but that does not do anything bad
table.setContainerDataSource(this.container);
// move to the last page
table.setCurrentPage(table.getTotalAmountOfPages());
// move to the first page
table.setCurrentPage(1);
// set DPU
setDpu(dpuInstance);
}
Expand All @@ -367,11 +366,10 @@ public boolean refresh(PipelineExecution exec) {
if (!isRunning(execution)) {
refreshDpuSelector();
}
int lastPage = table.getTotalAmountOfPages();
if (table.getCurrentPage() == lastPage) {
if (table.getCurrentPage() == 1) {
container.refresh();
} else {
table.setCurrentPage(lastPage);
table.setCurrentPage(1);
}
return true;
}
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/RecordsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public class RecordsTable extends CustomComponent {
public RecordsTable(DbCachedSource<MessageRecord> dataSouce, int pageLenght, int iconHeight) {
this.dataSouce = dataSouce;
this.container = new ReadOnlyContainer<>(dataSouce);
this.container.sort(new Object[] { "id" }, new boolean[] { false });
this.iconHeight = iconHeight;
//build layout
buildLayout(pageLenght);
Expand Down Expand Up @@ -138,13 +139,13 @@ public void setExecution(PipelineExecution execution) {

if (isInitialized) {
// all has been done .. just set the page to the
// end and return
messageTable.setCurrentPage(messageTable.getTotalAmountOfPages());
// begin and return
messageTable.setCurrentPage(1);
} else {
// add generated columns
buildGeneratedColumns();
isInitialized = true;
messageTable.setCurrentPage(messageTable.getTotalAmountOfPages());
messageTable.setCurrentPage(1);
}
}

Expand Down Expand Up @@ -213,11 +214,10 @@ public Object generateCell(CustomTable source, Object itemId,
* Reload data from source, do not refresh the source it self!!
*/
public void refresh() {
int lastPage = messageTable.getTotalAmountOfPages();
if (messageTable.getCurrentPage() == lastPage) {
if (messageTable.getCurrentPage() == 1) {
container.refresh();
} else {
messageTable.setCurrentPage(lastPage);
messageTable.setCurrentPage(1);
}
}

Expand Down