=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java 2010-02-24 10:11:45 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java 2010-03-05 13:21:07 +0000 @@ -27,8 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_SUM; - import java.util.Collection; import java.util.HashMap; import java.util.HashSet; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/associations.js' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/associations.js 2009-10-10 08:57:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/associations.js 2010-03-05 13:21:07 +0000 @@ -3,6 +3,7 @@ function selectAllAtLevel() { + setMessage( i18n_loading ); var request = new Request(); request.setCallbackSuccess( selectReceived ); request.send( 'selectLevel.action?level=' + getListValue( 'levelList' ) ); @@ -10,6 +11,7 @@ function unselectAllAtLevel() { + setMessage( i18n_loading ); var request = new Request(); request.setCallbackSuccess( selectReceived ); request.send( 'unselectLevel.action?level=' + getListValue( 'levelList' ) ); @@ -17,21 +19,24 @@ function selectGroup() { - var request = new Request(); + setMessage( i18n_loading ); + var request = new Request(); request.setCallbackSuccess( selectReceived ); request.send( 'selectOrganisationUnitGroup.action?organisationUnitGroupId=' + getListValue( 'groupList' ) ); } function unselectGroup() { - var request = new Request(); + setMessage( i18n_loading ); + var request = new Request(); request.setCallbackSuccess( selectReceived ); request.send( 'unselectOrganisationUnitGroup.action?organisationUnitGroupId=' + getListValue( 'groupList' ) ); } function unselectAll() { - var request = new Request(); + setMessage( i18n_loading ); + var request = new Request(); request.setCallbackSuccess( selectReceived ); request.send( 'unselectAll.action' ); } @@ -39,6 +44,7 @@ function selectReceived() { selectionTree.buildSelectionTree(); + hideMessage(); } function treeClicked()