------------------------------------------------------------ revno: 9188 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Thu 2012-12-06 15:06:41 +0300 message: added methods to get ou based on another ou (facility_uid?level=2 goes up until level two) modified: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java 2012-06-06 16:37:56 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java 2012-12-06 12:06:41 +0000 @@ -28,17 +28,95 @@ */ 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.organisationunit.OrganisationUnit; 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 <[email protected]> */ @Controller -@RequestMapping( value = OrganisationUnitController.RESOURCE_PATH ) +@RequestMapping(value = OrganisationUnitController.RESOURCE_PATH) public class OrganisationUnitController extends AbstractCrudController<OrganisationUnit> { public static final String RESOURCE_PATH = "/organisationUnits"; + + @Override + @RequestMapping( value = "/{uid}", method = RequestMethod.GET ) + public String getObject( @PathVariable( "uid" ) String uid, @RequestParam Map<String, String> parameters, + Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception + { + WebOptions options = new WebOptions( parameters ); + OrganisationUnit entity = getEntity( uid ); + + if ( entity == null ) + { + ContextUtils.notFoundResponse( response, "Object not found for uid: " + uid ); + return null; + } + + if ( options.getOptions().containsKey( "level" ) ) + { + int level = -1; + + try + { + level = Integer.parseInt( options.getOptions().get( "level" ) ); + } + catch ( Exception e ) + { + level = entity.getOrganisationUnitLevel(); + } + + if ( level == entity.getOrganisationUnitLevel() ) + { + model.addAttribute( "model", entity ); + } + else if ( level < entity.getOrganisationUnitLevel() ) + { + while ( level < entity.getOrganisationUnitLevel() ) + { + entity = entity.getParent(); + } + + model.addAttribute( "model", entity ); + } + else + { + // TODO + // System.err.println( "GET CHILDREN" ); + model.addAttribute( "model", entity ); + } + } + else + { + model.addAttribute( "model", entity ); + } + + if ( options.hasLinks() ) + { + WebUtils.generateLinks( entity ); + } + + postProcessEntity( entity ); + postProcessEntity( entity, parameters ); + + model.addAttribute( "viewClass", options.getViewClass( "detailed" ) ); + + return StringUtils.uncapitalize( getEntitySimpleName() ); + } + }
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
