------------------------------------------------------------
revno: 21204
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Thu 2015-11-26 22:26:54 +0100
message:
Short name for program data element/attribute
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataElement.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.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/program/ProgramDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataElement.java 2015-11-23 14:22:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataElement.java 2015-11-26 21:26:54 +0000
@@ -79,6 +79,12 @@
return program.getDisplayName() + " " + dataElement.getDisplayName();
}
+ @Override
+ public String getShortName()
+ {
+ return program.getDisplayName() + " " + dataElement.getDisplayShortName();
+ }
+
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2015-11-23 14:22:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2015-11-26 21:26:54 +0000
@@ -109,6 +109,12 @@
return program.getDisplayName() + " " + attribute.getDisplayName();
}
+ @Override
+ public String getShortName()
+ {
+ return program.getDisplayName() + " " + attribute.getDisplayShortName();
+ }
+
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
