------------------------------------------------------------
revno: 20640
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Mon 2015-10-12 17:33:14 +0200
message:
Event analytics, fixed related to legend sets for data items
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.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-api/src/main/java/org/hisp/dhis/common/GridHeader.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java 2015-03-03 16:42:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java 2015-10-12 15:33:14 +0000
@@ -149,6 +149,11 @@
{
return type != null && NUMERIC_TYPES.contains( type );
}
+
+ public boolean hasLegendSet()
+ {
+ return legendSet != null;
+ }
// -------------------------------------------------------------------------
// Getters and setters
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2015-10-12 15:02:17 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2015-10-12 15:33:14 +0000
@@ -292,7 +292,7 @@
for ( GridHeader header : grid.getHeaders() )
{
- if ( Double.class.getName().equals( header.getType() ) )
+ if ( Double.class.getName().equals( header.getType() ) && !header.hasLegendSet() )
{
double val = rowSet.getDouble( index );
grid.addValue( params.isSkipRounding() ? val : MathUtils.getRounded( val ) );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
