From 7cf92efcee9d800f5a53db1742e47ed08b875cba Mon Sep 17 00:00:00 2001 From: mbl-eea-sk Date: Wed, 2 Sep 2015 14:11:37 +0200 Subject: [PATCH 1/2] Descending sorting of log table applied --- .../mff/xrg/odcs/frontend/gui/tables/LogTable.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/LogTable.java b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/LogTable.java index 30e857369f..5b98452fbb 100644 --- a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/LogTable.java +++ b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/LogTable.java @@ -104,6 +104,7 @@ public class LogTable extends CustomComponent { public LogTable(DbCachedSource 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; @@ -116,14 +117,12 @@ public LogTable(DbCachedSource 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) { @@ -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); } @@ -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; } From 8863fbeaa33af18885bd5724fca511384c625ca8 Mon Sep 17 00:00:00 2001 From: Michal Bielik Date: Thu, 3 Sep 2015 10:45:27 +0200 Subject: [PATCH 2/2] Extended for Events table --- .../xrg/odcs/frontend/gui/tables/RecordsTable.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/RecordsTable.java b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/RecordsTable.java index 7af97cc203..60520f8d20 100644 --- a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/RecordsTable.java +++ b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/tables/RecordsTable.java @@ -80,6 +80,7 @@ public class RecordsTable extends CustomComponent { public RecordsTable(DbCachedSource 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); @@ -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); } } @@ -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); } }