diff --git a/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryCalcTemplate.java b/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryCalcTemplate.java index e41adfd18..67847f01c 100644 --- a/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryCalcTemplate.java +++ b/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryCalcTemplate.java @@ -218,6 +218,7 @@ private void createDetailSheet(final IndicatorDTO indicator) throws Throwable { Map columnIndexMap = new HashMap(); for (PivotTableData.Axis axis : leaves) { CalcUtils.putHeader(row, ++cellIndex, axis.getLabel()); + axis.cellIndexValue(String.valueOf(cellIndex)); columnIndexMap.put(axis.getLabel(), cellIndex); } diff --git a/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryExcelTemplate.java b/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryExcelTemplate.java index 704a68ae5..9169ea9be 100644 --- a/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryExcelTemplate.java +++ b/src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryExcelTemplate.java @@ -215,6 +215,7 @@ private void createDetailSheet(final IndicatorDTO indicator) { Map columnIndexMap = new HashMap(); for (PivotTableData.Axis axis : leaves) { utils.putHeader(row, ++cellIndex, axis.getLabel()); + axis.cellIndexValue(String.valueOf(cellIndex)); columnIndexMap.put(axis.getLabel(), cellIndex); } diff --git a/src/main/java/org/sigmah/shared/dto/pivot/content/PivotTableData.java b/src/main/java/org/sigmah/shared/dto/pivot/content/PivotTableData.java index fef0e502e..00b11226c 100644 --- a/src/main/java/org/sigmah/shared/dto/pivot/content/PivotTableData.java +++ b/src/main/java/org/sigmah/shared/dto/pivot/content/PivotTableData.java @@ -59,7 +59,7 @@ public PivotTableData(List rowDimensions, List columnDimen rootRow = new Axis(); rootColumn = new Axis(); } - + public boolean isEmpty() { return rootRow.isLeaf() && rootColumn.isLeaf(); } @@ -215,6 +215,11 @@ public Axis(Axis parent, Dimension dimension, DimensionCategory category, String this.category = category; this.label = label; } + + public void cellIndexValue(String label){ + + this.label = label; + } public Axis getChild(DimensionCategory category) { return childMap.get(category);