HAVRBLOMST-4

fusarium/static/fusarium/js/oatFloweringModelForm.js

@@ -217,9 +217,12 @@ var displayResults = function(data)
 	var weekZ625 = getWeekForZ(data,62.5);
 	var dateZ69 = getDateForZ(data,69);
 	now = getNow();
-	var weekNow = now.week();
+	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());*/