=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-10-10 16:54:14 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-10-10 17:04:05 +0000 @@ -94,6 +94,8 @@ private static final String ITEM_GENDER = "gender"; private static final String ITEM_ISDEAD = "isdead"; + private static final String COL_NAME_EVENTDATE = "executiondate"; + @Autowired private ProgramService programService; @@ -462,11 +464,13 @@ private String getSortItem( String item, Program program ) { - if ( !ITEM_EXECUTION_DATE.equals( item ) && getItem( program, item, null, null ) == null ) + if ( !ITEM_EXECUTION_DATE.equalsIgnoreCase( item ) && getItem( program, item, null, null ) == null ) { throw new IllegalQueryException( "Descending sort item is invalid: " + item ); } + item = ITEM_EXECUTION_DATE.equalsIgnoreCase( item ) ? COL_NAME_EVENTDATE : item; + return item; }