DE-844 fix missing placeholder for column without children

adamkorynta · adamkorynta · commit 749f0b98c3bc · 2020-06-26T10:32:17.000-07:00
diff --git a/eppt-core/src/main/java/gov/ca/water/calgui/presentation/plotly/TreeTableUtil.java b/eppt-core/src/main/java/gov/ca/water/calgui/presentation/plotly/TreeTableUtil.java
@@ -77,12 +77,16 @@ private static <R extends TreeTableRowModel> String copyValuesToString(RmaTreeTa
 							headerRow.remove(headerRow.size() - 1);
 						}
 					}
+					if(i ==0 && children.isEmpty())
+					{
+						subHeaderRow.add("");
+					}
 					i++;
 				} while(i < children.size());
 			}
 		}
 		objectArray.add(headerRow.toArray());
-		if(!subHeaderRow.isEmpty())
+		if(!subHeaderRow.isEmpty() && !subHeaderRow.stream().allMatch(String::isEmpty))
 		{
 			objectArray.add(subHeaderRow.toArray());
 		}

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,16 @@ private static <R extends TreeTableRowModel> String copyValuesToString(RmaTreeTa`
`77`	`77`	`headerRow.remove(headerRow.size() - 1);`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+ if(i ==0 && children.isEmpty())`
	`81`	`+ {`
	`82`	`+ subHeaderRow.add("");`
	`83`	`+ }`
`80`	`84`	`i++;`
`81`	`85`	`} while(i < children.size());`
`82`	`86`	`}`
`83`	`87`	`}`
`84`	`88`	`objectArray.add(headerRow.toArray());`
`85`		`- if(!subHeaderRow.isEmpty())`
	`89`	`+ if(!subHeaderRow.isEmpty() && !subHeaderRow.stream().allMatch(String::isEmpty))`
`86`	`90`	`{`
`87`	`91`	`objectArray.add(subHeaderRow.toArray());`
`88`	`92`	`}`