diff --git a/applefruitmoth/static/applefruitmoth/applefruitmoth.png b/applefruitmoth/static/applefruitmoth/applefruitmoth.png index 6abac7ad726c0c12440fb553c692cdb3dea8b03e..7fae789d6229fdd25b80ed7581d583a590428839 100644 Binary files a/applefruitmoth/static/applefruitmoth/applefruitmoth.png and b/applefruitmoth/static/applefruitmoth/applefruitmoth.png differ diff --git a/applefruitmoth/static/applefruitmoth/applefruitmothblooming.png b/applefruitmoth/static/applefruitmoth/applefruitmothblooming.png deleted file mode 100644 index 2ee0a8706e186bc1d8f7a688351d0e0d66df70a7..0000000000000000000000000000000000000000 Binary files a/applefruitmoth/static/applefruitmoth/applefruitmothblooming.png and /dev/null differ diff --git a/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js b/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js index 728127cc6b2af504567a048aed67d21be3f6cca4..a5dbb79bed81ab3f3db49c221e3caca09bbbcaf2 100644 --- a/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js +++ b/applefruitmoth/static/applefruitmoth/js/applefruitmoth.js @@ -5,8 +5,7 @@ document.title="Rognebærmøllvarsling"; var stations = new Array(); -var serverUri = "https://coremanager.testvips.nibio.no"; -//var serverUri = "http://localhost:8080/VIPSCore"; +var serverUri = "https://coremanager.vips.nibio.no"; var runUri= serverUri + "/models/DAYDEGREES/run"; var emptyChart; @@ -69,7 +68,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); + console.info(observations); runModel(basisTemp, observations, name, startTime, endTime); }); }); diff --git a/applefruitmoth/templates/applefruitmoth/index.html b/applefruitmoth/templates/applefruitmoth/index.html index 7cdd7ccdda5f06e042b2768ef50417bb8e112818..d3366eba3db33751b3e6a07c5b78522c6c5d76d5 100755 --- a/applefruitmoth/templates/applefruitmoth/index.html +++ b/applefruitmoth/templates/applefruitmoth/index.html @@ -72,7 +72,7 @@ <div class="row"> <div class="col-md-12"> <div class="form-group"> - <p>Utviklinga til rognebærmøll er avhengig av temperatur, slik at utviklingsfarten og tidspunkt for tiltak varierer mellom ulike distrikt. For å vurdere tidspunktet må du ha notert når rogna sto i full blom og rekne ut varmesum etter det.</p> + <p>Utviklinga til rognebærmøll er avhengig av temperatur, slik at utviklingsfarten og tidspunkt for tiltak varierer mellom ulike distrikt. For å vurdere tidspunktet må du ha notert når rogna sto i full blom og rekne ut varmesum (døgngrader) etter det.</p> <div class="row"><br><br> <div style="font-size:75%;" id="setBasis"></div>