=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-10-07 03:09:51 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java 2012-10-07 04:42:04 +0000 @@ -318,6 +318,23 @@ // --------------------------------------------------------------------- // Get program-stage, start-date, end-date // --------------------------------------------------------------------- + + if( level==0 ) + { + level = organisationUnitService.getMaxOfOrganisationUnitLevels(); + for ( Integer orgunitId : orgunitIds ) + { + int orgLevel = organisationUnitService.getLevelOfOrganisationUnit( orgunitId ); + if(level > orgLevel) + { + level = orgLevel; + } + } + } + + // --------------------------------------------------------------------- + // Get program-stage, start-date, end-date + // --------------------------------------------------------------------- ProgramStage programStage = programStageService.getProgramStage( programStageId ); @@ -326,7 +343,7 @@ Date startValue = format.parseDate( startDate ); Date endValue = format.parseDate( endDate ); List columns = getTableColumns(); - + // --------------------------------------------------------------------- // Generate tabular report // --------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-10-06 14:34:31 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-10-07 04:42:04 +0000 @@ -60,14 +60,6 @@ - $i18n.getString('use_data_from_level') - - $i18n.getString('selected') - $i18n.getString('children_only') - $i18n.getString('all') - - - $i18n.getString('show_hierachy_from_level')