Allowing for not all callibrating values to be entered for each row

roughage/static/roughage/js/nutrition.js

@@ -41,6 +41,7 @@ function runNutritionModel(formId)
 		var paramArray = [];
 		var dateIsValid = true;
 		var rowIsValid = true;
+		var numberOfEssentialFieldsWithValue = 0;
 		for(var j in fieldMarkers)
 		{
 			//console.log("observation" + fieldMarkers[j] + "_" + i);
@@ -51,16 +52,22 @@ function runNutritionModel(formId)
 				dateIsValid = false;
 				rowIsValid = false;
 			}
-			else if(j > 0 && dateIsValid && ! $.isNumeric(currentField.value.replace(",",".")))
+			else if(j > 0 && j <= 2 && dateIsValid && $.isNumeric(currentField.value.replace(",",".")))
 			{
-				//console.log("Numeric? " + $.isNumeric(currentField.value));
-				rowIsValid = false;
-				alert("Feil i kalibreringsdata. Alle verdier må være utfylt.");
-				return;
+				numberOfEssentialFieldsWithValue ++;
 			}
+			//console.log("Numeric? " + $.isNumeric(currentField.value));
+			
 			paramArray.push(currentField.value.replace(",","."));
 			// Discard it to avoid pollution of query string
-			currentField.disabled = true;
+			//currentField.disabled = true;
+		}
+		
+		if(numberOfEssentialFieldsWithValue == 0 && dateIsValid)
+		{
+			rowIsValid = false;
+			alert("Feil i kalibreringsdata. Høyde og/eller MSC må være utfylt.");
+			return;
 		}
 		
 		// Add comma separated values from one row (if valid) to a field