=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java 2012-10-24 08:31:40 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java 2012-12-20 20:47:11 +0000 @@ -81,6 +81,30 @@ GridUtils.toCsv( grid, response.getOutputStream() ); } + @RequestMapping( value = "/{uid}/data.xls", method = RequestMethod.GET ) + public void getViewXls( @PathVariable( "uid" ) String uid, HttpServletResponse response ) throws Exception + { + SqlView sqlView = sqlViewService.getSqlViewByUid( uid ); + + Grid grid = sqlViewService.getDataSqlViewGrid( sqlView ); + + contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_EXCEL, CacheStrategy.RESPECT_SYSTEM_SETTING, "sqlview.xls", true ); + + GridUtils.toXls( grid, response.getOutputStream() ); + } + + @RequestMapping( value = "/{uid}/data.html", method = RequestMethod.GET ) + public void getViewHtml( @PathVariable( "uid" ) String uid, HttpServletResponse response ) throws Exception + { + SqlView sqlView = sqlViewService.getSqlViewByUid( uid ); + + Grid grid = sqlViewService.getDataSqlViewGrid( sqlView ); + + contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_HTML, CacheStrategy.RESPECT_SYSTEM_SETTING, "sqlview.html", false ); + + GridUtils.toHtml( grid, response.getWriter() ); + } + @RequestMapping( value = "/{uid}/execute", method = RequestMethod.POST ) public void executeView( @PathVariable( "uid" ) String uid, HttpServletResponse response ) {