Skip to content

0000635: Indicators values not in order in long period project exports #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manishvishnoi2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

0000635: Indicators values not in order in long period project exports #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125cb32
Fixes order in Indicators export in long period projects
manishvishnoi2 Mar 11, 2016
bc91322
change by making function not changing immutability
manishvishnoi2 Mar 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryCalcTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ private void createDetailSheet(final IndicatorDTO indicator) throws Throwable {
Map<String, Integer> columnIndexMap = new HashMap<String, Integer>();
for (PivotTableData.Axis axis : leaves) {
CalcUtils.putHeader(row, ++cellIndex, axis.getLabel());
axis.cellIndexValue(String.valueOf(cellIndex));
columnIndexMap.put(axis.getLabel(), cellIndex);
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/sigmah/server/servlet/exporter/template/IndicatorEntryExcelTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ private void createDetailSheet(final IndicatorDTO indicator) {
Map<String, Integer> columnIndexMap = new HashMap<String, Integer>();
for (PivotTableData.Axis axis : leaves) {
utils.putHeader(row, ++cellIndex, axis.getLabel());
axis.cellIndexValue(String.valueOf(cellIndex));
columnIndexMap.put(axis.getLabel(), cellIndex);
}

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/sigmah/shared/dto/pivot/content/PivotTableData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public PivotTableData(List<Dimension> rowDimensions, List<Dimension> columnDimen
rootRow = new Axis();
rootColumn = new Axis();
}

Copy link
Copy Markdown
Member

@spMohanty spMohanty Apr 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manishvishnoi2 : Redundant space. Needs to be removed before the pull request can be merged into the codebase.

public boolean isEmpty() {
return rootRow.isLeaf() && rootColumn.isLeaf();
}
Expand Down Expand Up @@ -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);
Expand Down