=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm 2010-10-07 12:19:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm 2010-10-08 11:12:29 +0000
@@ -91,7 +91,7 @@
var i18n_success = '$encoder.jsEscape( $i18n.getString( "success" ) , "'")';
var i18n_hide_menu = '$encoder.jsEscape( $i18n.getString( "hide_menu" ) , "'")';
var i18n_waiting = '$encoder.jsEscape( $i18n.getString( "waiting" ) , "'")';
-
+var i18n_enter_digits = '$encoder.jsEscape($i18n.getString( 'please_enter_a_valid_digits' ) , "'")'
// ===========================================================================
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm 2010-09-25 08:21:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/popup.vm 2010-10-08 11:12:29 +0000
@@ -21,6 +21,8 @@
+
+
#foreach( $javascript in $javascripts )
#end
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2010-10-08 09:56:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2010-10-08 11:12:29 +0000
@@ -188,7 +188,7 @@
/popup.vm
/dhis-web-dataentry/history.vm
- javascript/history.js,../request.js
+ javascript/history.js
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2010-10-08 09:56:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm 2010-10-08 11:12:29 +0000
@@ -58,7 +58,9 @@
|
+ #else disabled="disabled" #end onfocus="this.select()">
+
+
|
@@ -66,7 +68,9 @@
|
+ #else disabled="disabled" #end onfocus="this.select()">
+
+
|
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js 2010-10-08 09:56:09 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js 2010-10-08 11:12:29 +0000
@@ -107,11 +107,32 @@
}
}
+function isInt(value){
+ if(((value) == parseInt(value)) && !isNaN(parseInt(value))){
+ return true;
+ } else {
+ return false;
+ }
+}
+
function saveMinLimit( organisationUnitId, dataElementId, optionComboId )
{
var minLimitField = document.getElementById( "minLimit" );
- var maxLimitField = document.getElementById( "maxLimit" );
-
+ if(!isInt(minLimitField.value)){
+ setInnerHTML('minSpan', i18n_enter_digits);
+ return;
+ }else{
+ setInnerHTML('minSpan', "");
+ }
+
+ var maxLimitField = document.getElementById( "maxLimit" );
+ if(!isInt(maxLimitField.value)){
+ setInnerHTML('maxSpan', i18n_enter_digits);
+ return;
+ }else{
+ setInnerHTML('maxSpan', "");
+ }
+
var request = new Request();
request.setCallbackSuccess( refreshWindow );
request.setCallbackError( refreshWindow );
@@ -147,11 +168,23 @@
}
function saveMaxLimit( organisationUnitId, dataElementId, optionComboId )
-{
-
+{
+ var maxLimitField = document.getElementById( "maxLimit" );
+ if(!isInt(maxLimitField.value)){
+ setInnerHTML('maxSpan', i18n_enter_digits);
+ return;
+ }else{
+ setInnerHTML('maxSpan', "");
+ }
+
var minLimitField = document.getElementById( "minLimit" );
- var maxLimitField = document.getElementById( "maxLimit" );
-
+ if(!isInt(minLimitField.value)){
+ setInnerHTML('minSpan', i18n_enter_digits);
+ return;
+ }else{
+ setInnerHTML('minSpan', "");
+ }
+
var request = new Request();
request.setCallbackSuccess( refreshWindow );