=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2015-11-30 03:36:54 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2015-12-04 12:01:10 +0000 @@ -84,6 +84,7 @@ import org.hisp.dhis.program.ProgramStage; import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.program.ProgramStageSection; +import org.hisp.dhis.program.ProgramTrackedEntityAttribute; import org.hisp.dhis.program.ProgramValidation; import org.hisp.dhis.programrule.ProgramRule; import org.hisp.dhis.programrule.ProgramRuleAction; @@ -232,6 +233,8 @@ private List programStageSections = new ArrayList<>(); + private List programTrackedEntityAttributes = new ArrayList<>(); + private List relationshipTypes = new ArrayList<>(); private List validationCriterias = new ArrayList<>(); @@ -312,7 +315,7 @@ @JsonProperty @JacksonXmlElementWrapper( localName = "dataApprovalWorkflows", namespace = DxfNamespaces.DXF_2_0 ) @JacksonXmlProperty( localName = "dataApprovalWorkflow", namespace = DxfNamespaces.DXF_2_0 ) - public List getdataApprovalWorkflows() + public List getDataApprovalWorkflows() { return dataApprovalWorkflows; } @@ -960,6 +963,19 @@ } @JsonProperty + @JacksonXmlElementWrapper( localName = "programTrackedEntityAttributes", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "programTrackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0 ) + public List getProgramTrackedEntityAttributes() + { + return programTrackedEntityAttributes; + } + + public void setProgramTrackedEntityAttributes( List programTrackedEntityAttributes ) + { + this.programTrackedEntityAttributes = programTrackedEntityAttributes; + } + + @JsonProperty @JacksonXmlElementWrapper( localName = "relationshipTypes", namespace = DxfNamespaces.DXF_2_0 ) @JacksonXmlProperty( localName = "relationshipType", namespace = DxfNamespaces.DXF_2_0 ) public List getRelationshipTypes()