=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorGroupController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorGroupController.java 2012-05-28 14:25:12 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorGroupController.java 2013-02-07 08:17:37 +0000 @@ -28,17 +28,58 @@ */ import org.hisp.dhis.api.controller.AbstractCrudController; +import org.hisp.dhis.api.controller.WebOptions; +import org.hisp.dhis.api.utils.ContextUtils; +import org.hisp.dhis.api.utils.WebUtils; +import org.hisp.dhis.api.webdomain.IndicatorList; import org.hisp.dhis.indicator.IndicatorGroup; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * @author Morten Olav Hansen */ @Controller -@RequestMapping( value = IndicatorGroupController.RESOURCE_PATH ) +@RequestMapping(value = IndicatorGroupController.RESOURCE_PATH) public class IndicatorGroupController extends AbstractCrudController { public static final String RESOURCE_PATH = "/indicatorGroups"; + + @RequestMapping( value = "/{uid}/members", method = RequestMethod.GET ) + public String getMembers( @PathVariable( "uid" ) String uid, @RequestParam Map parameters, + Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception + { + WebOptions options = new WebOptions( parameters ); + IndicatorGroup indicatorGroup = getEntity( uid ); + + if ( indicatorGroup == null ) + { + ContextUtils.notFoundResponse( response, "IndicatorGroup not found for uid: " + uid ); + return null; + } + + IndicatorList indicatorList = new IndicatorList(); + indicatorList.setMembers( indicatorGroup.getMembers() ); + + if ( options.hasLinks() ) + { + WebUtils.generateLinks( indicatorGroup ); + WebUtils.generateLinks( indicatorList ); + } + + model.addAttribute( "model", indicatorList ); + model.addAttribute( "viewClass", options.getViewClass( "detailed" ) ); + + return StringUtils.uncapitalize( getEntitySimpleName() ); + } } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitGroupController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitGroupController.java 2012-05-28 14:25:12 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitGroupController.java 2013-02-07 08:17:37 +0000 @@ -28,17 +28,58 @@ */ import org.hisp.dhis.api.controller.AbstractCrudController; +import org.hisp.dhis.api.controller.WebOptions; +import org.hisp.dhis.api.utils.ContextUtils; +import org.hisp.dhis.api.utils.WebUtils; +import org.hisp.dhis.api.webdomain.OrganisationUnitList; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * @author Morten Olav Hansen */ @Controller -@RequestMapping( value = OrganisationUnitGroupController.RESOURCE_PATH ) +@RequestMapping(value = OrganisationUnitGroupController.RESOURCE_PATH) public class OrganisationUnitGroupController extends AbstractCrudController { public static final String RESOURCE_PATH = "/organisationUnitGroups"; + + @RequestMapping( value = "/{uid}/members", method = RequestMethod.GET ) + public String getMembers( @PathVariable( "uid" ) String uid, @RequestParam Map parameters, + Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception + { + WebOptions options = new WebOptions( parameters ); + OrganisationUnitGroup organisationUnitGroup = getEntity( uid ); + + if ( organisationUnitGroup == null ) + { + ContextUtils.notFoundResponse( response, "OrganisationUnitGroup not found for uid: " + uid ); + return null; + } + + OrganisationUnitList organisationUnitList = new OrganisationUnitList(); + organisationUnitList.setMembers( organisationUnitGroup.getMembers() ); + + if ( options.hasLinks() ) + { + WebUtils.generateLinks( organisationUnitGroup ); + WebUtils.generateLinks( organisationUnitList ); + } + + model.addAttribute( "model", organisationUnitList ); + model.addAttribute( "viewClass", options.getViewClass( "detailed" ) ); + + return StringUtils.uncapitalize( getEntitySimpleName() ); + } } === added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/IndicatorList.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/IndicatorList.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/IndicatorList.java 2013-02-07 08:17:37 +0000 @@ -0,0 +1,60 @@ +package org.hisp.dhis.api.webdomain; + +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import org.hisp.dhis.common.Dxf2Namespace; +import org.hisp.dhis.indicator.Indicator; + +import java.util.HashSet; +import java.util.Set; + +/** + * @author Morten Olav Hansen + */ +@JacksonXmlRootElement( localName = "indicatorGroup", namespace = Dxf2Namespace.NAMESPACE ) +public class IndicatorList +{ + private Set members = new HashSet(); + + @JsonProperty( value = "indicators" ) + @JacksonXmlElementWrapper( localName = "indicators", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "indicator", namespace = Dxf2Namespace.NAMESPACE ) + public Set getMembers() + { + return members; + } + + public void setMembers( Set members ) + { + this.members = members; + } +} === added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/OrganisationUnitList.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/OrganisationUnitList.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/OrganisationUnitList.java 2013-02-07 08:17:37 +0000 @@ -0,0 +1,61 @@ +package org.hisp.dhis.api.webdomain; + +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import org.hisp.dhis.common.Dxf2Namespace; +import org.hisp.dhis.organisationunit.OrganisationUnit; + +import java.util.HashSet; +import java.util.Set; + +/** + * @author Morten Olav Hansen + */ +@JacksonXmlRootElement( localName = "organisationUnitGroup", namespace = Dxf2Namespace.NAMESPACE ) +public class OrganisationUnitList +{ + private Set members = new HashSet(); + + @JsonProperty( value = "organisationUnits" ) + @JacksonXmlElementWrapper( localName = "organisationUnits", namespace = Dxf2Namespace.NAMESPACE ) + @JacksonXmlProperty( localName = "organisationUnit", namespace = Dxf2Namespace.NAMESPACE ) + public Set getMembers() + { + return members; + } + + public void setMembers( Set members ) + { + this.members = members; + } + +}