------------------------------------------------------------
revno: 22058
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Sat 2016-02-27 01:44:28 -0500
message:
Analytics. Minor performance fix, do not apply identifier scheme if metadata
is skipped.
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2016-01-14 10:37:30 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2016-02-27 06:44:28 +0000
@@ -578,7 +578,7 @@
*/
private void applyIdScheme( DataQueryParams params, Grid grid )
{
- if ( params.hasNonUidOutputIdScheme() )
+ if ( !params.isSkipMeta() && params.hasNonUidOutputIdScheme() )
{
List<DimensionalItemObject> items = params.getAllDimensionItems();
@@ -629,6 +629,8 @@
tableRows.add( params.getDimensionArrayExplodeCoc( dimension ) );
}
}
+
+ i18nService.internationalise( null );
reportTable.setGridColumns( new CombinationGenerator<>( tableColumns.toArray( IRT2D ) ).getCombinations() );
reportTable.setGridRows( new CombinationGenerator<>( tableRows.toArray( IRT2D ) ).getCombinations() );
_______________________________________________
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
