------------------------------------------------------------ revno: 19509 committer: Abyot Asalefew Gizaw <aby...@gmail.com> branch nick: dhis2 timestamp: Wed 2015-06-24 08:56:16 +0200 message: bug fix in event row fetching modified: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
-- 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/webapi/controller/event/EventController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2015-06-15 13:44:20 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2015-06-24 06:56:16 +0000 @@ -146,7 +146,6 @@ @RequestParam( required = false ) Integer pageSize, @RequestParam( required = false ) boolean totalPages, @RequestParam( required = false ) boolean skipPaging, - @RequestParam( required = false ) boolean includeAttributes, @RequestParam( required = false ) String attachment, @RequestParam Map<String, String> parameters, IdSchemes idSchemes, Model model, HttpServletResponse response, HttpServletRequest request ) { @@ -199,7 +198,6 @@ @RequestParam( required = false ) Integer pageSize, @RequestParam( required = false ) boolean totalPages, @RequestParam( required = false ) boolean skipPaging, - @RequestParam( required = false ) boolean includeAttributes, @RequestParam( required = false ) String attachment, @RequestParam( required = false, defaultValue = "false" ) boolean skipHeader, @RequestParam Map<String, String> parameters, @@ -242,13 +240,12 @@ @RequestParam( required = false ) Date endDate, @RequestParam( required = false ) boolean totalPages, @RequestParam( required = false ) boolean skipPaging, - @RequestParam( required = false ) boolean includeAttributes, @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request ) { WebOptions options = new WebOptions( parameters ); EventSearchParams params = eventService.getFromUrl( program, null, programStatus, null, - orgUnit, ouMode, null, startDate, endDate, eventStatus, null, null, null, null, totalPages, skipPaging, includeAttributes ); + orgUnit, ouMode, null, startDate, endDate, eventStatus, null, null, null, null, totalPages, skipPaging, true ); EventRows eventRows = eventRowService.getEventRows( params ); === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-06-02 12:25:03 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-06-24 06:56:16 +0000 @@ -247,7 +247,7 @@ $scope.teiCount = data.rows.length; } - if( data.metaData.pager ){ + if( data.metaData && data.metaData.pager ){ $scope.pager = data.metaData.pager; $scope.pager.toolBarDisplay = 5; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-06-23 19:48:46 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-06-24 06:56:16 +0000 @@ -1009,14 +1009,14 @@ return { getEventReport: function(orgUnit, ouMode, program, startDate, endDate, programStatus, eventStatus, pager){ - var url = '../api/events/eventRows.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program + '&addAttributes=true'; + var url = '../api/events/eventRows.json?' + 'orgUnit=' + orgUnit + '&ouMode='+ ouMode + '&program=' + program; if( programStatus ){ url = url + '&programStatus=' + programStatus; } if( eventStatus ){ - url = url + '&status=' + eventStatus; + url = url + '&eventStatus=' + eventStatus; } if(startDate && endDate){
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp