------------------------------------------------------------
revno: 10798
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Sat 2013-05-11 10:22:42 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.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/dataelement/DataElementOperand.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2013-05-10 12:07:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2013-05-11 08:22:42 +0000
@@ -164,6 +164,24 @@
return uid;
}
+
+ @Override
+ public String getName()
+ {
+ String name = null;
+
+ if ( dataElement != null )
+ {
+ name = dataElement.getName();
+ }
+
+ if ( categoryOptionCombo != null )
+ {
+ name += SPACE + categoryOptionCombo.getName();
+ }
+
+ return name;
+ }
/**
* Tests whether the operand has any aggregation levels.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
