dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6248
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-03-12 10:31:46 +0100
message:
  Data entry, minor fix to completeness registration
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-02-21 18:45:10 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-03-12 09:31:46 +0000
@@ -858,8 +858,8 @@
         var params = storageManager.getCurrentCompleteDataSetParams();
 
         $.ajax( { url: 'getValidationViolations.action',
+        	data: params,
         	cache: false,
-        	data: params,
         	dataType: 'json',
         	success: function( data )
 	        {
@@ -884,6 +884,7 @@
     	url: 'registerCompleteDataSet.action',
     	data: params,
     	cache: false,
+        dataType: 'json',
     	success: function(data)
         {
             if( data.status == 2 )
@@ -902,7 +903,11 @@
                     validate();
                 }
             }
-        }
+        },
+	    error: function()
+	    {
+	    	disableCompleteButton();
+	    }
     } );
 }
 
@@ -917,6 +922,7 @@
         	url: 'undoCompleteDataSet.action',
         	data: params,
         	cache: false,
+        	dataType: 'json',
         	success: function(data)
 	        {
                 if( data.status == 2 )