=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java' --- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-03-07 12:59:06 +0000 +++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-03-07 15:05:03 +0000 @@ -316,6 +316,10 @@ } } + facilities.getMeta().put( "limit", limitValue ); + facilities.getMeta().put( "offset", offset ); + facilities.getMeta().put( "total", organisationUnitService.getNumberOfOrganisationUnits() ); + Collections.sort( allOrganisationUnits, IdentifiableObjectNameComparator.INSTANCE ); List organisationUnitLevels = organisationUnitService.getOrganisationUnitLevels(); === modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/Facilities.java' --- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/Facilities.java 2013-01-31 02:31:35 +0000 +++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/Facilities.java 2013-03-07 15:05:03 +0000 @@ -27,20 +27,37 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.codehaus.jackson.annotate.JsonPropertyOrder; + import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author Morten Olav Hansen */ +@JsonPropertyOrder( value = { "meta", "facilities" } ) public class Facilities { + private Map meta = new HashMap(); + private List facilities = new ArrayList(); public Facilities() { } + public Map getMeta() + { + return meta; + } + + public void setMeta( Map meta ) + { + this.meta = meta; + } + public List getFacilities() { return facilities; @@ -56,6 +73,7 @@ { return "Facilities{" + "facilities=" + facilities + + ", meta=" + meta + '}'; } }