=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java 2012-10-09 14:07:37 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java 2012-10-11 14:35:20 +0000 @@ -48,7 +48,7 @@ { Form form = new Form(); form.setLabel( dataSet.getName() ); - form.setPeriod( dataSet.getPeriodType().getIsoFormat() ); + form.setPeriodType( dataSet.getPeriodType().getName() ); if ( dataSet.getSections().size() > 0 ) { === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/Form.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/Form.java 2012-10-10 07:42:55 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/Form.java 2012-10-11 14:35:20 +0000 @@ -44,7 +44,7 @@ { private String label; - private String period; + private String periodType; private List groups = new ArrayList(); @@ -66,14 +66,14 @@ @JsonProperty @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE ) - public String getPeriod() + public String getPeriodType() { - return period; + return periodType; } - public void setPeriod( String period ) + public void setPeriodType( String periodType ) { - this.period = period; + this.periodType = periodType; } @JsonProperty @@ -94,7 +94,7 @@ { return "Form{" + "label='" + label + '\'' + - ", period='" + period + '\'' + + ", period='" + periodType + '\'' + ", groups=" + groups + '}'; }