From f1f78a5d01a309939d87efc2cd2797e6a7b1d40d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 2 May 2018 14:01:52 +0200
Subject: [PATCH] Couple of bug fixes
---
.../cerealblotchmodels/septoriahumiditymodelform.html | 3 +--
forecasts/static/forecasts/js/forecasts.js | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
index 8521ab64..35ced989 100644
--- a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
@@ -424,7 +424,6 @@
document.getElementById("chartContainer").style.display="block";
data.reverse();
var warningStatusPlotBandData = getWarningStatusPlotBandData(data);
- //console.log(warningStatusPlotBandData);
var data = getHighChartsSeries(
data,
[
@@ -437,7 +436,7 @@
{key: "SEPTORIAHU.SPP", type: "spline", lineWidth: 5, color: "blue", name: "{% trans "Spraying protection period" %}", yAxis: 1},
]
);
- renderForecastChart("chartContainer", "{% trans "Barley net blotch development" %}", warningStatusPlotBandData, data);
+ renderForecastChart("chartContainer", "{% trans "Septoria humidity model" %}", warningStatusPlotBandData, data);
}
var handleAjaxError = function(jqXHR,textStatus,errorThrown){
diff --git a/forecasts/static/forecasts/js/forecasts.js b/forecasts/static/forecasts/js/forecasts.js
index 4358c0d0..70559a3b 100755
--- a/forecasts/static/forecasts/js/forecasts.js
+++ b/forecasts/static/forecasts/js/forecasts.js
@@ -229,7 +229,7 @@ function changeLatestDays(theForm){
*/
function getWarningStatusPlotBandData(forecastResults)
{
- //console.log(forecastResults);
+ //console.info(forecastResults);
var warningStatuses = {
0: {name:"No forecast available", color:"#C9C9C9"},
1: {name:"Missing data", color:"#4DA0FE"},
@@ -275,7 +275,7 @@ function getWarningStatusPlotBandData(forecastResults)
if(plotBand != null && plotBand["to"] == null)
{
// Moment.js!!!
- plotBand.to = getUnixTimestampFromJSON([forecastResults.length -1]["validTimeStart"]) + bandOffset;
+ plotBand.to = getUnixTimestampFromJSON(forecastResults[forecastResults.length -1]["validTimeStart"]) + bandOffset;
plotBands.push(plotBand);
}
--
GitLab