dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6649
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-04-19 22:57:28 +0200
message:
  Web pivot i18n db
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pivottable/impl/DefaultPivotTableService.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm


--
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-reporting/src/main/java/org/hisp/dhis/pivottable/impl/DefaultPivotTableService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pivottable/impl/DefaultPivotTableService.java	2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/pivottable/impl/DefaultPivotTableService.java	2012-04-19 20:57:28 +0000
@@ -135,7 +135,7 @@
             }
             else
             {
-                indicators = new ArrayList<Indicator>( indicatorService.getIndicatorGroup( groupId ).getMembers() );
+                indicators = new ArrayList<Indicator>( indicatorService.getIndicatorGroup( groupId, true ).getMembers() );
                 
                 aggregatedValues = aggregatedDataValueService.getAggregatedIndicatorValues(
                     ConversionUtils.getIdentifiers( Indicator.class, indicators ),
@@ -155,7 +155,7 @@
             }
             else
             {
-                indicators = new ArrayList<BaseIdentifiableObject>( dataElementService.getDataElementGroup( groupId ).getMembers() );
+                indicators = new ArrayList<BaseIdentifiableObject>( dataElementService.getDataElementGroup( groupId, true ).getMembers() );
                 
                 aggregatedValues = aggregatedDataValueService.getAggregatedDataValueTotals(
                     ConversionUtils.getIdentifiers( DataElement.class, indicators ),

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm	2011-03-20 22:35:55 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/responsePivotTable.vm	2012-04-19 20:57:28 +0000
@@ -7,7 +7,7 @@
 "indicators": [
 #set( $size = $pivotTable.indicators.size() )
 #foreach( $indicator in $pivotTable.indicators )
-{ "id":"${indicator.id}", "name":"$!encoder.jsonEncode( ${indicator.shortName} )" }#if( $velocityCount < $size ),#end
+{ "id":"${indicator.id}", "name":"$!encoder.jsonEncode( ${indicator.displayShortName} )" }#if( $velocityCount < $size ),#end
 #end ],
 
 "periods": [