=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2013-10-30 12:51:03 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2013-11-27 10:00:19 +0000 @@ -444,3 +444,8 @@ select_all_values=Select All Values deselect_all_values=Deselect All Values + +inclusion=Inclusion +include_selected=Selected organisation unit +include_children=Include children of organisation unit +include_descendants=Include descendants of organisation unit === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm 2013-09-04 08:11:01 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm 2013-11-27 10:00:19 +0000 @@ -9,6 +9,7 @@ var compression = $( '#compression' ).val(); var program = $( '#programs' ).val(); var programStage = $( '#programStages' ).val(); + var inclusion = $( '#inclusion' ).val(); var url = '../api/events' + format + compression + "?program=" + program; @@ -31,6 +32,14 @@ var startDate = $('#startDate' ).val(); var endDate = $('#endDate' ).val(); + if( inclusion ) { + if( "children" == inclusion ) { + url += "&includeChildren=true"; + } else if( "descendants" == inclusion ) { + url += "&includeDescendants=true"; + } + } + url += "&startDate=" + startDate; url += "&endDate=" + endDate; url += "&links=false"; @@ -131,15 +140,26 @@ - - $i18n.getString( "format" ) - - - - + + $i18n.getString( "inclusion" ) + + + + + + + $i18n.getString( "format" ) + + + + $i18n.getString( "compression" )