dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07147
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2020: Fix bug <585751> PDF export of indicators should contain more details
------------------------------------------------------------
revno: 2020
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-08-31 16:21:17 +0700
message:
Fix bug <585751> PDF export of indicators should contain more details
modified:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/IndicatorConverter.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/impl/ItextPdfService.java
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties
--
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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/IndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/IndicatorConverter.java 2010-06-03 08:06:09 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/IndicatorConverter.java 2010-08-31 09:21:17 +0000
@@ -105,12 +105,18 @@
table.addCell( getItalicCell( i18n.getString( "numerator_aggregation_operator" ), 1, ITALIC ) );
table.addCell( getTextCell( i18n.getString( indicator.getNumeratorAggregationOperator() ) ) );
+
+ table.addCell( getItalicCell( i18n.getString( "numerator_formula" ), 1, ITALIC ) );
+ table.addCell( getTextCell( indicator.getNumerator(), TEXT ) );
table.addCell( getItalicCell( i18n.getString( "denominator_description" ), 1, ITALIC ) );
table.addCell( getTextCell( indicator.getDenominatorDescription(), TEXT ) );
table.addCell( getItalicCell( i18n.getString( "denominator_aggregation_operator" ), 1, ITALIC ) );
table.addCell( getTextCell( i18n.getString( indicator.getDenominatorAggregationOperator() ) ) );
+
+ table.addCell( getItalicCell( i18n.getString( "denominator_formula" ), 1, ITALIC ) );
+ table.addCell( getTextCell( indicator.getDenominator(), TEXT ) );
table.addCell( getCell( 2, 30 ) );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/impl/ItextPdfService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/impl/ItextPdfService.java 2010-08-30 06:24:45 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pdf/impl/ItextPdfService.java 2010-08-31 09:21:17 +0000
@@ -191,9 +191,21 @@
table.addCell( getItalicCell( i18n.getString( "numerator_description" ), 1, ITALIC ) );
table.addCell( getTextCell( indicator.getNumeratorDescription(), TEXT ) );
+ table.addCell( getItalicCell( i18n.getString( "numerator_aggregation_operator" ), 1, ITALIC ) );
+ table.addCell( getTextCell( indicator.getNumeratorAggregationOperator(), TEXT ) );
+
+ table.addCell( getItalicCell( i18n.getString( "numerator_formula" ), 1, ITALIC ) );
+ table.addCell( getTextCell( indicator.getNumerator(), TEXT ) );
+
table.addCell( getItalicCell( i18n.getString( "denominator_description" ), 1, ITALIC ) );
table.addCell( getTextCell( indicator.getDenominatorDescription(), TEXT ) );
+ table.addCell( getItalicCell( i18n.getString( "denominator_aggregation_operator" ), 1, ITALIC ) );
+ table.addCell( getTextCell( indicator.getDenominatorAggregationOperator(), TEXT ) );
+
+ table.addCell( getItalicCell( i18n.getString( "denominator_formula" ), 1, ITALIC ) );
+ table.addCell( getTextCell( indicator.getDenominator(), TEXT ) );
+
table.addCell( getCell( 2, 30 ) );
addTableToDocument( document, table );
@@ -288,8 +300,7 @@
closeDocument( document );
}
- public void writeValidationResult( List<ValidationResult> results, OutputStream out, I18n i18n,
- I18nFormat format )
+ public void writeValidationResult( List<ValidationResult> results, OutputStream out, I18n i18n, I18nFormat format )
{
Document document = openDocument( out );
initFont();
@@ -326,14 +337,14 @@
table.addCell( getTextCell( unit.getName(), TEXT ) );
table.addCell( getTextCell( format.formatPeriod( period ), TEXT ) );
- table.addCell( getTextCell( validationResult.getValidationRule().getLeftSide().getDescription(),
- TEXT ) );
+ table
+ .addCell( getTextCell( validationResult.getValidationRule().getLeftSide().getDescription(), TEXT ) );
table.addCell( getTextCell( String.valueOf( validationResult.getLeftsideValue() ) ) );
- table.addCell( getTextCell( i18n.getString( validationResult.getValidationRule().getOperator() ),
- 1, ALIGN_CENTER ) );
+ table.addCell( getTextCell( i18n.getString( validationResult.getValidationRule().getOperator() ), 1,
+ ALIGN_CENTER ) );
table.addCell( getTextCell( String.valueOf( validationResult.getRightsideValue() ) ) );
- table.addCell( getTextCell( validationResult.getValidationRule().getRightSide().getDescription(),
- TEXT ) );
+ table
+ .addCell( getTextCell( validationResult.getValidationRule().getRightSide().getDescription(), TEXT ) );
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2010-07-30 14:13:32 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2010-08-31 09:21:17 +0000
@@ -440,3 +440,5 @@
intro_DHIS14_detailed_metadata_export = Do an export of an detailed selection of meta-data. DHIS 1.4 is the predecessor of DHIS 2.
intro_DHIS14_data_export = Do an export of data values or facts. DHIS 1.4 is the predecessor of DHIS 2.
intro_pdf_metadata_export = Portable Document Format (PDF) is a file format for document exchange.
+numerator_formula = Numerator formula
+denominator_formula = Denominator formula
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties 2010-06-03 08:06:09 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties 2010-08-31 09:21:17 +0000
@@ -301,4 +301,6 @@
to_date=\u0110\u1ebfn ng\u00e0y
view_older_changes=Xem c\u00e1c thay \u0111\u1ed5i c\u0169 h\u01a1n
opening_date = Ng\u00e0y m\u1edf
-closed_date = Ng\u00e0y \u0111\u00f3ng
\ No newline at end of file
+closed_date = Ng\u00e0y \u0111\u00f3ng
+numerator_formula = C\u00f4ng th\u1ee9 t\u1eed s\u1ed1
+denominator_formula = C\u00f4ng th\u1ee9c m\u1eabu s\u1ed1
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2010-08-28 13:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2010-08-31 09:21:17 +0000
@@ -313,4 +313,8 @@
value_x_selected_indicators = Value (X) - Selected indicators
value_x_available_indicators = Value (X) - Available indicators
category_y_selected_periods = Value (Y) - Selected periods
-category_y_available_periods = Value (Y) - Available periods
\ No newline at end of file
+category_y_available_periods = Value (Y) - Available periods
+numerator_aggregation_operator = Numerator aggregation type
+denominator_aggregation_operator = Denomirator aggregation type
+numerator_formula = Numerator formula
+denominator_formula = Denominator formula
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties 2010-08-31 09:21:17 +0000
@@ -159,4 +159,8 @@
generate = Generate
print = In
process_completed = Ho\u00e0n t\u1ea5t
-please_wait = Vui l\u00f2ng ch\u1edd
\ No newline at end of file
+please_wait = Vui l\u00f2ng ch\u1edd
+numerator_aggregation_operator = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho t\u1eed s\u1ed1
+denominator_aggregation_operator = Ki\u1ec3u s\u1ed1 li\u1ec7u t\u1ed5ng h\u1ee3p cho m\u1eabu s\u1ed1
+numerator_formula = C\u00f4ng th\u1ee9c t\u1eed s\u1ed1
+denominator_formula = C\u00f4ng th\u1ee9c m\u1eabu s\u1ed1
\ No newline at end of file
