diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
index 92fd0d778e134a8b898154a6d84f9004369724b1..bad2a76fa7b33b00fd55564b6ac230a75a732642 100644
--- a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-05 11:16+0100\n"
+"POT-Creation-Date: 2024-11-12 13:03+0100\n"
"PO-Revision-Date: 2024-04-04 12:59+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -20,227 +20,232 @@ msgstr ""
"X-Generator: Poedit 3.4.2\n"
#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:25
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:61
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:64
msgid "Barley net blotch – Elen’s model"
msgstr "Byggbrunflekk - Elens modell"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:70
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:73
msgid ""
"<a href='https://www.vips-landbruk.no/forecasts/models/BARLEYNETB/'>Elen's "
"model for barley net blotch</a> generates a disease development curve based "
-"on weather data. You can run the model with weather data from your selected "
-"location in the map, or from a public or private weather station. The model "
-"also requires information about disease incidence, sowing date, variety, "
-"crop rotation and tillage. If you have a <a href='https://www.vips-landbruk."
-"no/information/27/'>private weather station</a> registered in VIPS, this "
-"will be available in the weather station list when you are <a href='https://"
-"logic.vips.nibio.no/login'>logged in</a>."
+"on weather data. The model also requires information about disease "
+"incidence, sowing date, variety, crop rotation and tillage."
msgstr ""
"<a href='https://www.vips-landbruk.no/forecasts/models/BARLEYNETB/'>Elens "
"modell for byggbrunflekk</a> lager en tilvekstkurve for byggbrunflekk med "
-"værdata som grunnlag. Du kan velge å kjøre modellen med værdata for et "
-"vilkårlig punkt i kartet, eller fra en værstasjon. Det er i tillegg "
-"nødvendig å legge inn informasjon om nivået på angrep av sjukdommen, samt "
-"sådato, sort, vekstskifte og jordarbeiding. Dersom du har en <a "
-"href='https://www.vips-landbruk.no/information/27/'>privat værstasjon</a> "
-"som er registrert i VIPS, vil denne være tilgjengelig i skjemaet etter <a "
-"href='https://logic.vips.nibio.no/login'>innlogging</a>."
+"værdata som grunnlag. Det er i tillegg nødvendig å legge inn informasjon "
+"om nivået på angrep av sjukdommen, samt sådato, sort, vekstskifte og jordarbeiding."
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:78
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:81
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:64
msgid "Select weather data"
msgstr "Jeg vil bruke værdata"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:83
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:82
+msgid ""
+"You can run the model with <a href='https://www.vips-landbruk.no/information/7/'>"
+"weather data</a> from your selected location in the map, or "
+"from a public or private weather station. If you have a <a href='https://www."
+"vips-landbruk.no/information/27/'>private weather station</a> registered in "
+"VIPS, this will be available in the weather station list when you are <a "
+"href='https://logic.vips.nibio.no/login'>logged in</a>."
+msgstr ""
+"Du kan velge å kjøre modellen med <a href='https://www.vips-landbruk.no/information/7/'>"
+"værdata</a> for et vilkårlig punkt i kartet, eller fra en værstasjon. Dersom du har en "
+"<a href='https://www.vips-landbruk.no/information/27/'>privat værstasjon</a> "
+"som er registrert i VIPS, vil denne være tilgjengelig i skjemaet etter <a "
+"href='https://logic.vips.nibio.no/login'>innlogging</a>."
+
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:87
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:69
msgid "for a location in the map"
msgstr "for et punkt i kartet"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:89
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:102
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:93
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:106
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:76
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:92
msgid "Open map"
msgstr "Velg i kart"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:96
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:100
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:83
msgid "from a weather station"
msgstr "fra en værstasjon"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:100
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:537
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:104
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:551
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:90
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:530
msgid "Select weather station"
msgstr "Velg værstasjon"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:112
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:116
msgid "Crop information"
msgstr "Jeg dyrker"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:119
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:123
msgid "Sowing date"
msgstr "Sådato"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:124
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:128
msgid "Crop rotation"
msgstr "Vekstskifte"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:125
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:129
msgid "Barley was grown in this field last year"
msgstr "Jeg dyrket bygg på samme skifte i fjor"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:129
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:133
msgid "Cultivation"
msgstr "Jordarbeiding"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:130
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:134
msgid "Field has been plowed"
msgstr "Jeg har pløyd"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:137
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:141
msgid "Observations"
msgstr "Observasjon"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:139
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:143
msgid "Enter date and disease incidence if symptoms are observed"
msgstr "Legg inn dato og omfang dersom du har observert symptomer"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:144
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:148
#, python-format
msgid "%% of leaves showing symptoms"
msgstr "%% blad med symptomer"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:150
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:154
msgid "Fungicide applications"
msgstr "Sprøyting"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:152
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:156
msgid "Enter date and details of the most recent fungicide application"
msgstr "Legg inn dato og detaljer for eventuell siste sprøyting"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:157
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:161
msgid "Fungicide used"
msgstr "med preparat"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:163
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:167
msgid "Dosage (ml/daa)"
msgstr "og preparatdose (ml/daa)"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:172
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:176
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:203
msgid "Run model"
msgstr "Kjør modell"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:179
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:183
msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:190
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:194
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr "Scroll forbi grafen ved å sveipe den prikkede linjen til høyre"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:344
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:358
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:347
msgid "Location"
msgstr "Sted"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:345
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:359
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:348
msgid "Latitude"
msgstr "Breddegrad"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:346
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:360
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:349
msgid "Longitude"
msgstr "Lengdegrad"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:347
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:361
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:350
msgid "Time zone"
msgstr "Tidssone"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:368
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:382
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:429
msgid "Missing valid location"
msgstr "Manglende gyldig punkt"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:373
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:387
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:435
msgid "Missing weather station"
msgstr "Manglende værstasjon"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:377
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:391
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:439
msgid "Missing type of weather data source"
msgstr "Manglende type værdatakilde"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:384
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:398
msgid "Missing observation information"
msgstr "Manglende informasjon om feltobservasjoner"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:393
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:407
msgid "Missing spraying information"
msgstr "Manglende sprøytedata"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:451
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:465
msgid "Temperature, daily mean"
msgstr "Temperatur, daglig gjennomsnitt"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:452
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:466
msgid "Rain last 28 days"
msgstr "Regn siste 28 dager"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:453
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:467
msgid "Rain, daily"
msgstr "Regn, daglig sum"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:454
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:468
msgid "Day degrees since sowing"
msgstr "Døgngrader siden såing"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:455
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:522
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:469
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:536
msgid "Threshold"
msgstr "Terskel"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:456
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:523
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:470
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:537
msgid "Disease"
msgstr "Sykdom"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:463
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:477
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:608
msgid "Time"
msgstr "Tid"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:471
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:485
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:615
msgid "Warning status"
msgstr "Varselstatus"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:506
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:520
msgid "No data returned"
msgstr "Ingen data returnert"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:519
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:533
msgid "Disease value"
msgstr "Sykdomsverdi"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:526
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:540
msgid "Barley net blotch development"
msgstr "Utvikling av byggbrunflekk"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:563
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:577
msgid "Cultivar"
msgstr "Velg sort"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:590
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:604
msgid "Select fungicide"
msgstr "Velg preparat"
-#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:619
+#: cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html:633
#: cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html:395
msgid ""
"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
index 83a6177b9b6d1667e884766da119b6d734429de6..3e04a6f0e35b60932ae03267621a2f02df477032 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
@@ -47,12 +47,15 @@
margin-bottom: 30px;
}
.btn-map {
- margin-top: 5px;
- margin-bottom: 20px;
+ margin-bottom: 4px;
}
#gridPointInfo {
margin: 10px 0;
}
+ .fa-question-circle {
+ margin-left: 10px;
+ color: #008136;
+ }
</style>
{% endblock %}
@@ -67,7 +70,7 @@
<div class="row">
<div class="col-md-12 mb-3">
<p class="lead">
- {% trans "<a href='https://www.vips-landbruk.no/forecasts/models/BARLEYNETB/'>Elen's model for barley net blotch</a> generates a disease development curve based on weather data. You can run the model with weather data from your selected location in the map, or from a public or private weather station. The model also requires information about disease incidence, sowing date, variety, crop rotation and tillage. If you have a <a href='https://www.vips-landbruk.no/information/27/'>private weather station</a> registered in VIPS, this will be available in the weather station list when you are <a href='https://logic.vips.nibio.no/login'>logged in</a>." %}
+ {% trans "<a href='https://www.vips-landbruk.no/forecasts/models/BARLEYNETB/'>Elen's model for barley net blotch</a> generates a disease development curve based on weather data. The model also requires information about disease incidence, sowing date, variety, crop rotation and tillage." %}
</p>
</div>
</div>
@@ -75,7 +78,8 @@
<div class="col-md-6">
<input type="hidden" name="timeZone"/>
<fieldset>
- <legend>{% trans "Select weather data" %}</legend>
+ <legend>{% trans "Select weather data" %} <i class="fa fa-question-circle" onclick="toggleWeatherDataInfo()"></i></legend>
+ <div id="weather-data-info" class="alert alert-info" style="display: none;">{% trans "You can run the model with <a href='https://www.vips-landbruk.no/information/7/'>weather data</a> from your selected location in the map, or from a public or private weather station. If you have a <a href='https://www.vips-landbruk.no/information/27/'>private weather station</a> registered in VIPS, this will be available in the weather station list when you are <a href='https://logic.vips.nibio.no/login'>logged in</a>." %}</div>
<div class="form-group">
<div class="radio">
<label>
@@ -213,6 +217,7 @@
const radioGrid = document.getElementById("grid")
const radioWeatherstation = document.getElementById("weatherstation")
const selectWeatherstationElement = document.getElementById("weatherStationId");
+ const showWeatherDataInfo = false;
let poiIdList = []
let selectedPoint = null;
@@ -262,6 +267,15 @@
}
}
+ window.toggleWeatherDataInfo = () => {
+ const infoElement = document.getElementById("weather-data-info");
+ if(!infoElement.style.display || infoElement.style.display === 'block') {
+ infoElement.style.display = 'none';
+ } else {
+ infoElement.style.display = 'block';
+ }
+ }
+
window.openCoordinatesMap = () => {
if (inputLatitudeElement.value && inputLongitudeElement.value) {
selectedPoint = -1;
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
index b545f23b6f0db9ac67d651c30af2800556c47f9a..7f86c549127a96ab4bf962066819156243115440 100644
--- a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
@@ -50,6 +50,10 @@
#gridPointInfo {
margin: 10px 0;
}
+ .fa-question-circle {
+ margin-left: 10px;
+ color: #008136;
+ }
</style>
{% endblock %}
@@ -61,7 +65,8 @@
<div class="row">
<div class="col-md-3">
<fieldset>
- <legend>{% trans "Select weather data" %}</legend>
+ <legend>{% trans "Select weather data" %} <i class="fa fa-question-circle" onclick="toggleWeatherDataInfo()"></i></legend>
+ <div id="weather-data-info" class="alert alert-info" style="display: none;">{% trans "You can run the model with <a href='https://www.vips-landbruk.no/information/7/'>weather data</a> from your selected location in the map, or from a public or private weather station. If you have a <a href='https://www.vips-landbruk.no/information/27/'>private weather station</a> registered in VIPS, this will be available in the weather station list when you are <a href='https://logic.vips.nibio.no/login'>logged in</a>." %}</div>
<div class="form-group">
<div class="radio">
<label>
@@ -351,6 +356,15 @@
});
}
+ window.toggleWeatherDataInfo = () => {
+ const infoElement = document.getElementById("weather-data-info");
+ if(!infoElement.style.display || infoElement.style.display === 'block') {
+ infoElement.style.display = 'none';
+ } else {
+ infoElement.style.display = 'block';
+ }
+ }
+
const getTimezoneForSelectedPoint = () => {
const lat = theForm["latitude"].value;
const lon = theForm["longitude"].value;