=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2010-09-24 21:51:39 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2010-09-27 10:24:51 +0000 @@ -510,7 +510,7 @@ */ function hideHeaderMessage() { - $( 'div#headerMessage' ).slideUp( 'fast' ); + $( 'div#headerMessage' ).slideUp( 'slow' ); } /** === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2010-08-19 07:55:44 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2010-09-27 10:24:51 +0000 @@ -125,4 +125,5 @@ no_outlier_values_found = No outlier values found. specify_input_date = Please specify an input date specify_valid_input_date = Please enter a valid input date -no_outlier_values_found = No outlier values found. \ No newline at end of file +no_outlier_values_found = No outlier values found. +save_calculated_data_element_success = Save calculated data elements successfully. \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm 2010-07-21 10:31:21 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/form.vm 2010-09-27 10:24:51 +0000 @@ -184,6 +184,8 @@ var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")'; var i18n_saving_comment_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_comment_failed_status_code" ) , "'")'; var i18n_saving_minmax_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_minmax_failed_error_code" ) , "'")'; + var i18n_save_calculated_data_element_success = '$encoder.jsEscape( $i18n.getString( "save_calculated_data_element_success" ) , "'")'; + var calculatedDataElementMap = { #set( $count = 1 ) #foreach( $cde in $calculatedDataElementMap.keySet() ) === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js 2010-09-23 07:39:06 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js 2010-09-27 10:24:51 +0000 @@ -391,6 +391,10 @@ function dataValuesReceived( node ) { + unLockScreen(); + + setHeaderMessage(i18n_save_calculated_data_element_success); + var values = node.getElementsByTagName('dataValue'); var dataElementId; var value; @@ -401,5 +405,6 @@ value = value.firstChild.nodeValue; document.getElementById( 'value[' + dataElementId + '].value' ).value = value; } - unLockScreen(); + + hideHeaderMessage(); } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js 2010-09-23 07:39:06 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js 2010-09-27 10:24:51 +0000 @@ -391,6 +391,10 @@ function dataValuesReceived( node ) { + unLockScreen(); + + setHeaderMessage(i18n_save_calculated_data_element_success); + var values = node.getElementsByTagName('dataValue'); var dataElementId; var value; @@ -401,7 +405,8 @@ value = value.firstChild.nodeValue; document.getElementById( 'value[' + dataElementId + '].value' ).value = value; } - unLockScreen(); + + hideHeaderMessage(); } // ----------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multidimensional/form.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multidimensional/form.vm 2010-09-17 07:21:45 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multidimensional/form.vm 2010-09-27 10:24:51 +0000 @@ -182,6 +182,8 @@ var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")'; var i18n_saving_comment_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_comment_failed_status_code" ) , "'")'; var i18n_saving_minmax_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_minmax_failed_error_code" ) , "'")'; + var i18n_save_calculated_data_element_success = '$encoder.jsEscape( $i18n.getString( "save_calculated_data_element_success" ) , "'")'; + var calculatedDataElementMap = { #set( $count = 1 ) #foreach( $cde in $calculatedDataElementMap.keySet() ) === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm 2010-09-17 07:21:45 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm 2010-09-27 10:24:51 +0000 @@ -53,7 +53,8 @@ var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")'; var i18n_saving_comment_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_comment_failed_status_code" ) , "'")'; var i18n_saving_minmax_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_minmax_failed_error_code" ) , "'")'; - + var i18n_save_calculated_data_element_success = '$encoder.jsEscape( $i18n.getString( "save_calculated_data_element_success" ) , "'")'; + var calculatedDataElementMap = { #set( $count = 1 ) #foreach( $cde in $calculatedDataElementMap.keySet() )