=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java 2011-03-20 17:57:30 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetCaseAggregationConditionAction.java 2011-03-24 06:35:53 +0000 @@ -54,6 +54,8 @@ private CaseAggregationCondition caseAggregation; + private String description; + // ------------------------------------------------------------------------- // Getters && Setters // ------------------------------------------------------------------------- @@ -68,6 +70,11 @@ this.id = id; } + public String getDescription() + { + return description; + } + public CaseAggregationCondition getCaseAggregation() { return caseAggregation; @@ -83,6 +90,8 @@ { caseAggregation = aggregationConditionService.getCaseAggregationCondition( id ); + description = aggregationConditionService.getConditionDescription( caseAggregation.getAggregationExpression() ); + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2010-11-30 06:17:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2011-03-24 06:35:53 +0000 @@ -51,7 +51,6 @@