← Back to branch summary

~dhis2-devs-core/dhis2/2.6

« back to all changes in this revision

Viewing changes to dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java

  • Committer: Lars Helge Overland
  • Date: 2012-02-02 09:51:04 UTC
  • Revision ID: larshelge@gmail.com-20120202095104-uefrwf4ingkpkgb9
R 5849

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java
122
122
        sheet.addCell( new Label( column++, row, i18n.getString( "annualized" ), format ) );
123
123
        sheet.addCell( new Label( column++, row, i18n.getString( "indicator_type" ), format ) );
124
124
        sheet.addCell( new Label( column++, row, i18n.getString( "numerator_description" ), format ) );
125
 
        sheet.addCell( new Label( column++, row, i18n.getString( "numerator_aggregation_operator" ), format ) );
126
125
        sheet.addCell( new Label( column++, row, i18n.getString( "numerator_formula" ), format ) );
127
126
        sheet.addCell( new Label( column++, row, i18n.getString( "denominator_description" ), format ) );
128
 
        sheet.addCell( new Label( column++, row, i18n.getString( "denominator_aggregation_operator" ), format ) );
129
127
        sheet.addCell( new Label( column++, row, i18n.getString( "denominator_formula" ), format ) );
130
128
 
131
129
    }
141
139
        sheet.addCell( new Label( column++, row, indicator.getDescription(), format ) );
142
140
        sheet.addCell( new Label( column++, row, getBoolean().get( indicator.isAnnualized() ), format ) );
143
141
        sheet.addCell( new Label( column++, row, getType().get( indicator.getIndicatorType().getName() ), format ) );
144
 
 
145
142
        sheet.addCell( new Label( column++, row, indicator.getNumeratorDescription(), format ) );
146
 
        sheet.addCell( new Label( column++, row,
147
 
            expressionService.getExpressionDescription( indicator.getNumerator() ), format ) );
148
 
 
 
143
        sheet.addCell( new Label( column++, row, expressionService.getExpressionDescription( indicator.getNumerator() ), format ) );
149
144
        sheet.addCell( new Label( column++, row, indicator.getDenominatorDescription(), format ) );
150
 
        sheet.addCell( new Label( column++, row, expressionService
151
 
            .getExpressionDescription( indicator.getDenominator() ), format ) );
 
145
        sheet.addCell( new Label( column++, row, expressionService.getExpressionDescription( indicator.getDenominator() ), format ) );
152
146
    }
153
147
 
154
148
    public static void printExtendedDataElementHeaders( WritableSheet sheet, WritableCellFormat format1,