=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java 2014-03-21 09:29:10 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java 2014-05-16 02:03:50 +0000 @@ -141,8 +141,8 @@ OrganisationUnit orgunit = organisationUnitService.getOrganisationUnit( orgunitId ); - DataValue dataValue = dataValueService.getDataValue( dataElement, period, orgunit, optionCombo ); - + DataValue dataValue = dataValueService.getDataValue( dataElement, period, orgunit, optionCombo , optionCombo ); + // ----------------------------------------------------------------- // Save/Update/Delete data-values // ----------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2014-04-12 05:07:54 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2014-05-16 02:03:50 +0000 @@ -44,6 +44,8 @@ #set($organisationunitid=$col) #elseif($velocityCount==7) #set($periodid=$col) + #elseif($velocityCount==11) + #set($value=$col) #end #end #set($item=$dataelementid + '_' + $categoryoptioncomboid + '_' + $periodid + '_' + $organisationunitid + '_' + $value)