Adding check for calibration input

roughage/static/roughage/js/nutrition.js

@@ -39,6 +39,7 @@ function runNutritionModel(formId)
 	for(var i=0;i<numberOfOptimizationInfoRows;i++)
 	{
 		var paramArray = [];
+		var dateIsValid = true;
 		var rowIsValid = true;
 		for(var j in fieldMarkers)
 		{
@@ -47,12 +48,15 @@ function runNutritionModel(formId)
 			//console.log(currentField.value);
 			if(j == 0 && (currentField.value == "" || !moment(currentField.value, "YYYY-MM-DD").isValid()))
 			{
+				dateIsValid = false;
 				rowIsValid = false;
 			}
-			else if(j > 0 && rowIsValid && ! $.isNumeric(currentField.value.replace(",",".")))
+			else if(j > 0 && dateIsValid && ! $.isNumeric(currentField.value.replace(",",".")))
 			{
 				//console.log("Numeric? " + $.isNumeric(currentField.value));
 				rowIsValid = false;
+				alert("Feil i kalibreringsdata. Alle verdier må være utfylt.");
+				return;
 			}
 			paramArray.push(currentField.value.replace(",","."));
 			// Discard it to avoid pollution of query string
@@ -61,6 +65,7 @@ function runNutritionModel(formId)
 		
 		// Add comma separated values from one row (if valid) to a field
 		var optimizationInfoField = document.getElementById("optimizationInfo_" + i);
+		
 		if(rowIsValid)
 		{
 			optimizationInfoField.value = paramArray.join(",");