=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java 2013-10-23 08:37:56 +0000 @@ -92,9 +92,9 @@ this.id = id; } - private Collection programs; + private List programs; - public Collection getPrograms() + public List getPrograms() { return programs; } @@ -120,12 +120,12 @@ public String execute() throws Exception { - orgunitGroups = new ArrayList( - organisationUnitGroupService.getAllOrganisationUnitGroups() ); + orgunitGroups = new ArrayList( organisationUnitGroupService.getAllOrganisationUnitGroups() ); Collections.sort( orgunitGroups, IdentifiableObjectNameComparator.INSTANCE ); - programs = programService.getAllPrograms(); + programs = new ArrayList( programService.getAllPrograms() ); programs.retainAll( programService.getProgramsByCurrentUser() ); + Collections.sort( programs, IdentifiableObjectNameComparator.INSTANCE ); levels = organisationUnitService.getOrganisationUnitLevels();