Skip to content

Commit 11801d3

Browse files
committed
Fix open table in new table from html report
1 parent 5ef5eeb commit 11801d3

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

app/src/main/java/ca/phon/app/opgraph/wizard/NodeWizard.java

+21-5
Original file line numberDiff line numberDiff line change
@@ -1999,15 +1999,31 @@ private void createTableBuffer(String tableId, DefaultTableDataSource table) {
19991999

20002000
private void showTable(String tableId) {
20012001
if(tableMap.containsKey(tableId))
2002-
showTable(tableId, tableMap.get(tableId));
2002+
showTable(tableMap.get(tableId));
20032003
}
20042004

2005-
private void showTable(String tableId, DefaultTableDataSource table) {
2005+
private TableNode findTableNode(ReportTreeNode node, DefaultTableDataSource table) {
2006+
if(node instanceof TableNode) {
2007+
if(((TableNode)node).getTable() == table) {
2008+
return (TableNode) node;
2009+
}
2010+
}
2011+
for(int cidx = 0; cidx < node.getChildren().size(); cidx++) {
2012+
TableNode cret = findTableNode(node.getChildren().get(cidx), table);
2013+
if(cret != null)
2014+
return cret;
2015+
}
2016+
return null;
2017+
}
2018+
2019+
private void showTable(DefaultTableDataSource table) {
20062020
SwingUtilities.invokeLater( () -> {
2007-
if(!bufferPanel.getBufferNames().contains(tableId)) {
2008-
createTableBuffer(tableId, table);
2021+
if(reportTree != null) {
2022+
final TableNode tableNode = findTableNode(reportTree.getRoot(), table);
2023+
if(reportTreeDockingPanel != null) {
2024+
reportTreeDockingPanel.openTable(tableNode);
2025+
}
20092026
}
2010-
bufferPanel.selectBuffer(tableId);
20112027
});
20122028
}
20132029

app/src/main/resources/ca/phon/app/opgraph/wizard/wizard.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ function addMenuButtons(table, index) {
217217
var saveAsExcelItem = createMenuLink("Save table as Excel (XLS)...", "saveTableAsExcel('" + table.getAttribute("id") + "')");
218218
menuList.appendChild(saveAsExcelItem);
219219

220-
var showBufferItem = createMenuLink("Open table in new buffer", "showTable('" + table.getAttribute("id") + "')");
220+
var showBufferItem = createMenuLink("Open table in new tab", "showTable('" + table.getAttribute("id") + "')");
221221
menuList.appendChild(showBufferItem);
222222

223223
tableMenu.appendChild(menuList);

0 commit comments

Comments
 (0)