=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java 2010-02-22 09:19:15 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/caseaggregation/GetAggDataElementsAction.java 2010-10-05 12:11:19 +0000 @@ -64,7 +64,7 @@ optionComboIds = new ArrayList(); dataElementList = new ArrayList( dataElementService.getDataElementGroup( degId ).getMembers() ); - + Iterator deIterator = dataElementList.iterator(); while( deIterator.hasNext() ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-10-05 11:58:15 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-10-05 12:11:19 +0000 @@ -417,6 +417,7 @@ available_program = Available Program selected_program = Selected Program object_not_deleted_associated_by_objects = Object not deleted because it is associated by objects of type +confirm_delete_validation_criteria = Are you sure you want to delete validation criteria ? specify_dataelememt = Please specify a data elemement. processing = Processing ... -done = Done \ No newline at end of file +done = Done === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2010-10-04 12:13:09 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/caseaggregation.js 2010-10-05 12:11:19 +0000 @@ -6,7 +6,7 @@ { var degroup = document.getElementById( 'degroup' ); var degId = degroup.options[ degroup.selectedIndex ].value; - + var requestString = 'getAggDataElements.action?degId=' + degId; var request = new Request(); @@ -34,7 +34,9 @@ option.text = name; option.title = name; - de.add(option, null); + de.add(option, null); + + } }