dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10715
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-30 10:31:58 +0200
message:
  Fixed bug with validation rule analysis, validate button got disabled even if analysis could not be started because of lacking user input
modified:
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.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-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js	2012-07-26 09:59:38 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js	2013-04-30 08:31:58 +0000
@@ -23,7 +23,7 @@
             }
             else
             {
-            	setMessage( json.message );
+            	setHeaderDelayMessage( json.message );
                 $( '#startButton').removeAttr( 'disabled' );
             }
         } );
@@ -34,13 +34,13 @@
 {
     if ( $( "#fromDate" ).val().length == 0 )
     {
-        setMessage( i18n_specify_a_start_date );
+    	setHeaderDelayMessage( i18n_specify_a_start_date );
         return false;
     }
 
     if ( $( "#toDate" ).val().length == 0 )
     {
-        setMessage( i18n_specify_an_ending_date );
+    	setHeaderDelayMessage( i18n_specify_an_ending_date );
         return false;
     }
 
@@ -48,7 +48,7 @@
 
     if ( dataSets.options.length == 0 )
     {
-        setMessage( i18n_specify_dataset );
+    	setHeaderDelayMessage( i18n_specify_dataset );
         return false;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js	2012-09-22 18:42:59 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js	2013-04-30 08:31:58 +0000
@@ -16,13 +16,13 @@
 	aggregate = $( '#aggregate' ).val();
 	validationRuleGroupId = $( '#validationRuleGroupId' ).val();
 
-    $( '#validateButton' ).attr( 'disabled', true )
-
 	$.getJSON( 'validateRunValidation.action',
 	{ startDate:startDate, endDate:endDate, aggregate:aggregate }, function( json )
 	{
 		if ( json.response == 'success' )
 	    {
+		    $( '#validateButton' ).attr( 'disabled', true )
+
 	        setWaitMessage( i18n_analysing_please_wait );
 
 	        $.get( 'runValidationAction.action', 
@@ -38,7 +38,7 @@
 	    }
 	    else if ( json.response == 'input' )
 	    {
-	        setMessage( json.message );
+	    	setHeaderDelayMessage( json.message );
 	    }
 	} );