=== modified file 'local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js'
--- local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-05-10 16:18:43 +0000
+++ local/vn/dhis-web-dataentry-hospital/src/main/webapp/dhis-web-dataentry-hospital/javascript/form.js	2012-05-11 03:39:22 +0000
@@ -196,7 +196,7 @@
 		dataSetId : dataSetId,
 		value: value
 	}, function(html){
-		loadDataValues();
+		loadDataValues(dataSetId);
 	});
 }
 
@@ -451,23 +451,22 @@
 // Form
 // -----------------------------------------------------------------------------
 
-function loadDataValues()
+function loadDataValues(dataSetId)
 {
     $( '#completeButton' ).removeAttr( 'disabled' );
     $( '#undoButton' ).attr( 'disabled', 'disabled' );
     $( '#infoDiv' ).css( 'display', 'none' );
 
-    insertDataValues();
+    insertDataValues(dataSetId);
     displayEntryFormCompleted();
 }
 
-function insertDataValues()
+function insertDataValues(dataSetId)
 {
     var dataValueMap = [];
 	currentMinMaxValueMap = []; // Reset
 
     var periodId = $( '#selectedPeriodId option:selected' ).val();
-    var dataSetId = $( '#selectedDataSetId option:selected' ).val();
 
     // Clear existing values and colors, grey disabled fields