diff --git a/applefruitmoth/locale/nb/LC_MESSAGES/django.mo b/applefruitmoth/locale/nb/LC_MESSAGES/django.mo index 784e2554930e646350289eeae727d34ddd130260..c937b0490da606b169e5a2aee0a5c54d5ef23aed 100755 Binary files a/applefruitmoth/locale/nb/LC_MESSAGES/django.mo and b/applefruitmoth/locale/nb/LC_MESSAGES/django.mo differ diff --git a/applefruitmoth/locale/nb/LC_MESSAGES/django.po b/applefruitmoth/locale/nb/LC_MESSAGES/django.po index e3a3a0bada17f706130a52dc2b551e7b1128cd6f..170c6ac91aa76a1f5417210eae4de688e4da3eac 100755 --- a/applefruitmoth/locale/nb/LC_MESSAGES/django.po +++ b/applefruitmoth/locale/nb/LC_MESSAGES/django.po @@ -44,7 +44,9 @@ msgstr "" "<p>Du kan lese meir om rognebærmøll i <a href=\"https://www." "plantevernleksikonet.no/l/oppslag/276/\" " "target=\"_blank\">Plantevernleksikonet</a> og meir om varslingsmodellen <a " -"href=\"/information/12/#rognebaermoll\" target=\"_blank\">her</a>.</p>\n" +"href=\"/information/12/#rognebaermoll\" target=\"_blank\">her</a>, eller i infoskrivet <a " +"href=\"https://www.vips-landbruk.no/media/attachments/information/VIPS_ark_Rognebaermoll-v1.0.pdf\" " +"target=\"_blank\">VIPS Rognebærmøll</a>.</p>\n" "<p>Generelle meldingar om prognose, utvikling og tiltak finn du <a href=\"/" "messages/\" target=\"_blank\">her</a>.</p>" diff --git a/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js b/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js index 3bdfabe3219bb40a5992500738732a1798b93cf3..728127cc6b2af504567a048aed67d21be3f6cca4 100644 --- a/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js +++ b/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js @@ -1,6 +1,6 @@ document.addEventListener('DOMContentLoaded', setBasis); -document.title="Døgngrader"; +document.title="Rognebærmøllvarsling"; @@ -49,7 +49,7 @@ function setBasis () { function getBasis () { - var basisTemp = document.getElementById('temp').value; + var basisTemp = "0"; var startTime = document.getElementById('startdate').value; var endTime = document.getElementById('enddate').value; var weatherStation = document.getElementById('weatherstation').value; @@ -57,13 +57,7 @@ function getBasis () { var temperature = []; weatherstationId = weatherStation; - - if (basisTemp > 20 || basisTemp < 0) { - alert("Basistemperaturen er usannsynlig"); - return false; - } - - + if (startTime > endTime) { alert("Datoen er ikke gyldig"); return false; @@ -75,6 +69,7 @@ function getBasis () { $.getJSON("https://lmt.nibio.no/services/rest/weatherstation/getstation?weatherStationId="+weatherStation, function( weatherstation ) { allObservations = weatherstation; var name = String(weatherstation.name); + console.info(name); runModel(basisTemp, observations, name, startTime, endTime); }); }); @@ -112,9 +107,6 @@ function runModel (basisTemp, data, name, start, end) { .fail(function( jqXHR, textStatus,errorThrown ) { alert( "Request failed: " + errorThrown ); }) - //.always(function() { - // alert( "complete" ); - //}) ; } @@ -161,7 +153,7 @@ function displayResults(data, basisTemp, name, start, end) { document.getElementById("textInfo").innerText = ""; let infotext = document.createElement("p"); - var text1 = "<p>Varmesum, med basistemperatur " + basisTemp + " °C, rekna ut frå middeltemperaturen 2 m over bakken for " + name + " vêrstasjon for perioden fra og med " + start + " til og med " + end + " er: </p>"; + var text1 = "<p>Varmesum, med basistemperatur 0 °C, rekna ut frå middeltemperaturen 2 m over bakken for " + name + " vêrstasjon for perioden fra og med " + start + " til og med " + end + " er: </p>"; var text2 = "<p><b>" + lastValue + "</b> døgngrader\n\n</p>"; infotext = text1 + text2; diff --git a/applefruitmoth/templates/applefruitmoth/index.html b/applefruitmoth/templates/applefruitmoth/index.html index 31ab9f5dbae77cf7a40bffcf8d0dce50ff03502c..7cdd7ccdda5f06e042b2768ef50417bb8e112818 100755 --- a/applefruitmoth/templates/applefruitmoth/index.html +++ b/applefruitmoth/templates/applefruitmoth/index.html @@ -68,7 +68,7 @@ </div> <div class="singleBlockContainer"> - <br><h2>Døgngrader for rognebærmøll</h2><br> + <br><h2>Varmesum for rognebærmøll</h2><br> <div class="row"> <div class="col-md-12"> <div class="form-group"> @@ -82,11 +82,6 @@ <select id="weatherstation" class="form-control"></select> </div> - <div class="form-group"> - <label for="temp">Basistemperatur, °C</label> - <input type="text" value=0.0 id="temp" class="form-control"> - </div> - <div class="form-group"> <label for="startdate">Dato for full blom i rogn</label> <input type="date" id="startdate" class="form-control">