=== 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-09-01 07:37:41 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java 2015-10-30 08:55:42 +0000 @@ -84,6 +84,9 @@ import org.hisp.dhis.program.ProgramStageDataElement; import org.hisp.dhis.program.ProgramStageSection; import org.hisp.dhis.program.ProgramValidation; +import org.hisp.dhis.programrule.ProgramRule; +import org.hisp.dhis.programrule.ProgramRuleAction; +import org.hisp.dhis.programrule.ProgramRuleVariable; import org.hisp.dhis.relationship.RelationshipType; import org.hisp.dhis.report.Report; import org.hisp.dhis.reporttable.ReportTable; @@ -230,6 +233,12 @@ private List validationCriterias = new ArrayList<>(); + private List programRules = new ArrayList<>(); + + private List programRuleActions = new ArrayList<>(); + + private List programRuleVariables = new ArrayList<>(); + private List trackedEntities = new ArrayList<>(); private List trackedEntityAttributes = new ArrayList<>(); @@ -961,6 +970,45 @@ } @JsonProperty + @JacksonXmlElementWrapper( localName = "programRules", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "programRule", namespace = DxfNamespaces.DXF_2_0 ) + public List getProgramRules() + { + return programRules; + } + + public void setProgramRules( List programRules ) + { + this.programRules = programRules; + } + + @JsonProperty + @JacksonXmlElementWrapper( localName = "programRuleActions", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "programRuleAction", namespace = DxfNamespaces.DXF_2_0 ) + public List getProgramRuleActions() + { + return programRuleActions; + } + + public void setProgramRuleActions( List programRuleActions ) + { + this.programRuleActions = programRuleActions; + } + + @JsonProperty + @JacksonXmlElementWrapper( localName = "programRuleVariables", namespace = DxfNamespaces.DXF_2_0 ) + @JacksonXmlProperty( localName = "programRuleVariable", namespace = DxfNamespaces.DXF_2_0 ) + public List getProgramRuleVariables() + { + return programRuleVariables; + } + + public void setProgramRuleVariables( List programRuleVariables ) + { + this.programRuleVariables = programRuleVariables; + } + + @JsonProperty @JacksonXmlElementWrapper( localName = "events", namespace = DxfNamespaces.DXF_2_0 ) @JacksonXmlProperty( localName = "event", namespace = DxfNamespaces.DXF_2_0 ) public List getEvents()