=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2011-03-07 09:15:23 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java 2011-03-08 03:35:28 +0000 @@ -285,13 +285,13 @@ } else if ( dataValue != null ) { - dataValue.setValue( "" + resultValue ); - dataValue.setTimestamp( new Date() ); - dataValue.setStoredBy( storedBy ); - + DataValue dvalue = new DataValue( dElement, period, orgUnit, "", storedBy, + new Date(), null, optionCombo ); + dvalue.setValue( dataValue.getValue() + i18n.getString( "old_value" ) ); + dataValueService.deleteDataValue( dataValue ); - mapDataValues.put( dataValue, i18n.getString( "updated" ) + " " + message ); + mapDataValues.put( dvalue, i18n.getString( "deleted" ) + " " + message ); } }// PeriodList end === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-02-18 03:23:01 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-03-08 03:35:28 +0000 @@ -285,3 +285,6 @@ no_value_added_or_update = No values added or updated. greater_then_from_date = This field is greater then from date. date_less_incident_date = This date is less then the incident date. +deleted = Deleted +old_value = Old Value +case_aggregation = Beneficiary Aggregation \ No newline at end of file