------------------------------------------------------------
revno: 5849
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Thu 2012-02-02 10:39:35 +0100
message:
Fixed minor bug with indicator excel export
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java 2012-02-02 09:39:35 +0000
@@ -122,10 +122,8 @@
sheet.addCell( new Label( column++, row, i18n.getString( "annualized" ), format ) );
sheet.addCell( new Label( column++, row, i18n.getString( "indicator_type" ), format ) );
sheet.addCell( new Label( column++, row, i18n.getString( "numerator_description" ), format ) );
- sheet.addCell( new Label( column++, row, i18n.getString( "numerator_aggregation_operator" ), format ) );
sheet.addCell( new Label( column++, row, i18n.getString( "numerator_formula" ), format ) );
sheet.addCell( new Label( column++, row, i18n.getString( "denominator_description" ), format ) );
- sheet.addCell( new Label( column++, row, i18n.getString( "denominator_aggregation_operator" ), format ) );
sheet.addCell( new Label( column++, row, i18n.getString( "denominator_formula" ), format ) );
}
@@ -141,14 +139,10 @@
sheet.addCell( new Label( column++, row, indicator.getDescription(), format ) );
sheet.addCell( new Label( column++, row, getBoolean().get( indicator.isAnnualized() ), format ) );
sheet.addCell( new Label( column++, row, getType().get( indicator.getIndicatorType().getName() ), format ) );
-
sheet.addCell( new Label( column++, row, indicator.getNumeratorDescription(), format ) );
- sheet.addCell( new Label( column++, row,
- expressionService.getExpressionDescription( indicator.getNumerator() ), format ) );
-
+ sheet.addCell( new Label( column++, row, expressionService.getExpressionDescription( indicator.getNumerator() ), format ) );
sheet.addCell( new Label( column++, row, indicator.getDenominatorDescription(), format ) );
- sheet.addCell( new Label( column++, row, expressionService
- .getExpressionDescription( indicator.getDenominator() ), format ) );
+ sheet.addCell( new Label( column++, row, expressionService.getExpressionDescription( indicator.getDenominator() ), format ) );
}
public static void printExtendedDataElementHeaders( WritableSheet sheet, WritableCellFormat format1,
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
