dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1964
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-10-29 16:20:23 +0200
message:
  Removed popups for zero setting in dataentry
modified:
  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/multidimensional.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js	2010-10-29 14:20:23 +0000
@@ -79,16 +79,7 @@
          if ( type == 'int' || type == 'number' || type == 'positiveNumber' || type == 'negativeNumber' )      
         {
         	var value = new Number( field.value );       	        	
-        	 
-        	if( value * 1 == 0 && !zeroValueSaveMode )
-        	{
-        		window.alert( i18n_saving_zero_values_unnecessary  );
-        		field.select();
-   	            field.focus(); 
-   	                   		
-				return;    
-				    		
-        	}
+        	
             if (  type == 'int' && !isInt( field.value ))
             {
                 field.style.backgroundColor = '#ffcc00';

=== 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-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js	2010-10-29 14:20:23 +0000
@@ -80,16 +80,7 @@
         if ( type == 'int' || type == 'number' || type == 'positiveNumber' || type == 'negativeNumber' )
         {
             var value = new Number( field.value );       	
-        	 
-        	if( value * 1 == 0 && !zeroValueSaveMode )
-        	{
-        		window.alert( i18n_saving_zero_values_unnecessary  );
-        		field.select();
-   	            field.focus(); 
-
-				return;
-        	}
-            
+        	
             if (  type == 'int' && !isInt( field.value ))
             {
                 field.style.backgroundColor = '#ffcc00';