Bugfix related to JSON parsing

fusarium/static/fusarium/js/oatFloweringModelForm.js

@@ -34,7 +34,7 @@
 // Internal ID for the form
 var theFormId = "_oatFloweringModelForm";
 var detailURL = null;
-var DEBUG = false;
+var DEBUG = true;
 
 // Settings for VIPS forecasting system
 //var serverUri = settings.vipsCoremanagerServerName;
@@ -45,8 +45,8 @@ var coreUserName = "";
 var corePass = "";
 
 // Location of weather data source
-var weatherDataBaseUri = "https://lmt.nibio.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
-//var weatherDataBaseUri = "http://agrometbase-local/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
+//var weatherDataBaseUri = "https://lmt.nibio.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
+var weatherDataBaseUri = "http://agrometbase-local/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
 
 // Setting current time
 var now = moment();
@@ -219,15 +219,16 @@ var displayResults = function(data)
 	now = getNow();
 	var weekNow = now.isoWeek();
 	var weeksFromNowToZ625 = Math.abs(weekZ625-weekNow);
-	/*console.log("now: " + now.tz("Europe/Oslo").format());
-	console.log("week now: " +weekNow);
-	console.log("weekZ625: " +weekZ625);
-	console.log("weeksFromNowToZ625: " + weeksFromNowToZ625);
-	console.log("z60: " + dateZ60.tz("Europe/Oslo").format());
-	console.log("z62.5: " + getDateForZ(data,62.5).tz("Europe/Oslo").format());
-	console.log("z69: " + dateZ69.tz("Europe/Oslo").format());*/
-	
-	
+	/*
+		console.info(data);
+		console.log("now: " + now.tz("Europe/Oslo").format());
+		console.log("week now: " +weekNow);
+		console.log("weekZ625: " +weekZ625);
+		console.log("weeksFromNowToZ625: " + weeksFromNowToZ625);
+		console.log("z60: " + dateZ60.tz("Europe/Oslo").format());
+		console.log("z62.5: " + getDateForZ(data,62.5).tz("Europe/Oslo").format());
+		console.log("z69: " + dateZ69.tz("Europe/Oslo").format());
+	*/
 	// Scenario 1: Today is before date of sowing
 	if(now.isBefore(dateOfSowing))
 	{
@@ -320,8 +321,10 @@ var getDateForZ = function(data,z)
 {
 	for(var key in data)
 	{
-		if(data[key].allValues["OATFLOWERM.ZREACHED"] == z)
+		//console.info (key + ":" + getAllValues(data[key].allValues)["OATFLOWERM.ZREACHED"]);
+		if(getAllValues(data[key].allValues)["OATFLOWERM.ZREACHED"] == z)
 		{
+			//console.info(moment(data[key].validTimeStart));
 			return moment(data[key].validTimeStart);
 		}
 	}
@@ -335,9 +338,9 @@ var getWeekForZ = function(data,z)
 {
 	for(var key in data)
 	{
-		if(data[key].allValues["OATFLOWERM.ZREACHED"] == z)
+		if(getAllValues(data[key].allValues)["OATFLOWERM.ZREACHED"] == z)
 		{
-			return data[key].allValues["OATFLOWERM.WEEK_IN_YEAR"];
+			return getAllValues(data[key].allValues)["OATFLOWERM.WEEK_IN_YEAR"];
 		}
 	}
 }
@@ -394,3 +397,8 @@ var getStartHTML = function()
                  "<div id='resultsTable'></div>"
                  ].join("");
 }
+
+var getAllValues = function(allValuesStr)
+{
+	return JSON.parse(allValuesStr);
+};