------------------------------------------------------------
revno: 11815
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Tue 2013-08-27 11:29:59 +0200
message:
Minor
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 2013-08-27 09:19:47 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-08-27 09:29:59 +0000
@@ -270,8 +270,15 @@
{
Map<String, String> map = new HashMap<String, String>();
- map.put( params.getProgram().getUid(), params.getProgram().getName() );
- map.put( params.getProgramStage().getUid(), params.getProgramStage().getName() );
+ Program program = params.getProgram();
+ ProgramStage stage = params.getProgramStage();
+
+ map.put( program.getUid(), program.getName() );
+
+ if ( stage != null )
+ {
+ map.put( stage.getUid(), stage.getName() );
+ }
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
