=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2010-03-16 03:34:03 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2010-03-16 10:16:48 +0000 @@ -283,6 +283,7 @@ var url = "registerCompleteDataSet.action?date=" + date; var request = new Request(); + request.setResponseTypeXML( 'message' ); request.setCallbackSuccess( registerReceived ); request.send( url ); } @@ -294,6 +295,12 @@ function registerReceived( messageElement ) { + + var type = messageElement.getAttribute( 'type' ); + if(type=='input'){ + setMessage(messageElement.firstChild.nodeValue); + return; + } document.getElementById( "completeButton" ).disabled = true; document.getElementById( "undoButton" ).disabled = false; document.getElementById( "dateField" ).disabled = true; === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2010-03-11 13:21:41 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2010-03-16 10:16:48 +0000 @@ -302,3 +302,4 @@ intro_pivot_table = Browse pivot tables, which can be pivoted on any of the indicator, organisation unit and period dimensions. intro_report_table = Add and generate report tables. Report tables are highly customizable database tables which can be used as basis for reports. intro_data_completeness = Browse the submission rates of data sets. This can be viewed by organisation unit and period, and later reported to PDF and Workbook. +update_new_static_report = Update static report \ No newline at end of file