=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-05-11 17:01:54 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-05-20 11:28:49 +0000 @@ -258,7 +258,7 @@ function handleError( jqXHR, textStatus, errorThrown ) { markValue( COLOR_RED ); - window.alert( i18n_saving_value_failed_error_code + '\n\n' + textStatus ); + window.alert( i18n_saving_value_failed_status_code + '\n\n' + textStatus ); } function markValue( color ) === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm 2011-05-11 17:01:54 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm 2011-05-20 11:28:49 +0000 @@ -17,7 +17,7 @@ #set( $size3 = $indicators.size() ) "indicatorFormulas": { #foreach( $indicator in $indicators ) - "${indicator.id}": "($!{indicator.explodedNumerator})/($!{indicator.explodedDenominator})"#if( $velocityCount < $size3 ),#end + "${indicator.id}": "($!{indicator.explodedNumerator})/($!{indicator.explodedDenominator})*($!{indicator.indicatorType.factor})"#if( $velocityCount < $size3 ),#end #end }, "periodValid": ${periodValid} }