fixed mysticfall#226 Redundant property columns in parent-child level…

… with show
Judilson · Jun 18, 2018 · 9e7087a · 9e7087a
1 parent b016eb2
commit 9e7087a
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/pivot4j-core/src/main/java/org/pivot4j/ui/table/TableHeaderNode.java b/pivot4j-core/src/main/java/org/pivot4j/ui/table/TableHeaderNode.java
@@ -248,7 +248,9 @@ void addMemberProperties() {
 
         List<TreeNode<TableAxisContext>> children = null;
 
-        if (getMember() != null) {
+        // Should render level properties only once behind the latest
+        if (getMember() != null && isLastInLevel()) {
+
             List<Level> levels = getReference().getLevels(getHierarchy());
 
             boolean showParent = getReference().getRenderer().getShowParentMembers();
@@ -315,6 +317,18 @@ void addMemberProperties() {
         }
     }
 
+    private boolean isLastInLevel() {
+        if (getChildCount() == 0) {
+            return true;
+        }
+
+        TableHeaderNode childNode = (TableHeaderNode) getChildren().get(0);
+        if (getMember().getLevel().getDepth() == childNode.getMember().getLevel().getDepth()) {
+            return !OlapUtils.equals(getHierarchy(), childNode.getHierarchy());
+        }
+        return true;
+    }
+
     void mergeChildren() {
         List<TreeNode<TableAxisContext>> children = new ArrayList<TreeNode<TableAxisContext>>(getChildren());