------------------------------------------------------------
revno: 18773
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-03-31 12:38:02 +0200
message:
Event analytics, including dimension names in meta data names
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.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/event/data/DefaultEventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2015-03-31 07:59:24 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2015-03-31 10:38:02 +0000
@@ -661,6 +661,15 @@
map.putAll( IdentifiableObjectUtils.getUidNameMap( objects ) );
}
}
+
+ if ( dimension.getDisplayShortName() != null && DisplayProperty.SHORTNAME.equals( displayProperty ) )
+ {
+ map.put( dimension.getDimension(), dimension.getDisplayShortName() );
+ }
+ else if ( dimension.getDisplayName() != null ) // NAME
+ {
+ map.put( dimension.getDimension(), dimension.getDisplayName() );
+ }
}
return map;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
