From c821036319c1325806471b205ff254a91fcd0ec8 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 31 Oct 2024 14:53:42 +0100
Subject: [PATCH] feat: Remember user settings. Add progress icon for impatient
users
---
VIPSWeb/static/css/vipsweb.css | 5 ++
.../locale/bg/LC_MESSAGES/django.po | 62 +++++++-------
.../locale/bs/LC_MESSAGES/django.po | 62 +++++++-------
.../locale/de/LC_MESSAGES/django.po | 62 +++++++-------
.../locale/fi/LC_MESSAGES/django.po | 62 +++++++-------
.../locale/nb/LC_MESSAGES/django.mo | Bin 2533 -> 2582 bytes
.../locale/nb/LC_MESSAGES/django.po | 64 +++++++-------
.../locale/vi/LC_MESSAGES/django.po | 62 +++++++-------
.../locale/zh_Hans/LC_MESSAGES/django.po | 62 +++++++-------
cydiapomonella/static/js/cydiapomonella.js | 3 +
.../templates/cydiapomonella/index.html | 79 ++++++++++++++++--
cydiapomonella/views.py | 10 +--
12 files changed, 311 insertions(+), 222 deletions(-)
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index 859cf7a7..8d7ca6aa 100755
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -879,6 +879,11 @@ button.btn-primary {
color: white;
}
+button.btn-info {
+ background-color: #79bd8b;
+ color: white;
+}
+
table.table {
border-collapse: collapse;
}
diff --git a/cydiapomonella/locale/bg/LC_MESSAGES/django.po b/cydiapomonella/locale/bg/LC_MESSAGES/django.po
index 383586e0..26d8afe3 100644
--- a/cydiapomonella/locale/bg/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,77 +23,77 @@ msgstr ""
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -101,16 +101,20 @@ msgstr ""
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -119,17 +123,17 @@ msgstr ""
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
diff --git a/cydiapomonella/locale/bs/LC_MESSAGES/django.po b/cydiapomonella/locale/bs/LC_MESSAGES/django.po
index 435b2265..807177a9 100644
--- a/cydiapomonella/locale/bs/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/bs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,77 +24,77 @@ msgstr ""
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -102,16 +102,20 @@ msgstr ""
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -120,17 +124,17 @@ msgstr ""
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
diff --git a/cydiapomonella/locale/de/LC_MESSAGES/django.po b/cydiapomonella/locale/de/LC_MESSAGES/django.po
index 383586e0..26d8afe3 100644
--- a/cydiapomonella/locale/de/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,77 +23,77 @@ msgstr ""
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -101,16 +101,20 @@ msgstr ""
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -119,17 +123,17 @@ msgstr ""
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
diff --git a/cydiapomonella/locale/fi/LC_MESSAGES/django.po b/cydiapomonella/locale/fi/LC_MESSAGES/django.po
index 383586e0..26d8afe3 100644
--- a/cydiapomonella/locale/fi/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,77 +23,77 @@ msgstr ""
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -101,16 +101,20 @@ msgstr ""
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -119,17 +123,17 @@ msgstr ""
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
diff --git a/cydiapomonella/locale/nb/LC_MESSAGES/django.mo b/cydiapomonella/locale/nb/LC_MESSAGES/django.mo
index 4d775eb22dee0f38f37338581eba9a743fda64f4..152099afda2261cea5427bfc8f7009d8d9d5d21c 100644
GIT binary patch
delta 710
zcmaDVJWZtjo)F7a1_lNOIR*v>83qOh9!3TRO$G*rKa3zz28IPp5b=df3=D=03=I32
z7#I>57#Kb<F);8mFfar%GcfQmFfb%CGcd3)FfbG_Gca&4Fff!dGcb5CFfi0HGcZ^)
zFfbfvW?+zFU|?WoVPFUX*~bD_SI<z$!oc9gz`#(&!oa}Gz`$^ng@J*Sfq~&N3q<2x
z7KjCstPpVxR){(yRt5$!1_lNPRt5%k1_p+3R<MB#@vIPsWw0_Za5FG4RIoxE*22ob
zpvu6&&<WMIo|S=tiJ_i>;TS6egAM}&!%0>K1|>!YhHtD43=#|s43g{&3@Qu^3`Xn>
z3{fBp*clkO7#J8fu`@96FfcIeWrrAiiXCF{d3FW{eFg@G8|)B^I5;2<)Z<`aC}3b<
zaOHsL-^Rhf;LE_kaFBz6fwP{0fq|bBA|c7iz+l6`z@Wm(z#s?;Qcj4^ia8-ZsfLQT
zL&axuLM&bg)xU}p5<*)!85md@7#Q|*GBAjOLX?w%L5P8Y;Wj78#|#YbI3XVU2vP@%
zX6eZv8TIQyDS!#&90rKLKw$uiSx`Cv83Uq0DFj4=up|Q{MnOh1g9M-$6d5865GM$O
zQWOINgDe9BgE#{uJV22Gif9Js#GK^PoWzn;g^bk1lFjp(vY7Y+a#9nEQx(b+GfVXJ
o^fq&_N-{E=Sea~AVUuGP3`@<+%gIbHE>S2;%>&6#cH~?F08yJqO#lD@
delta 671
zcmbOx@>IC~o)F7a1_lNOSq26M83qOh7DfgJO$G*rH;f=r28Ibt5b=pj3=D=03=Hd-
z7#I>57#JQfF);8mFfceWGcfQmFfar%Gcd3)Ffb%AGca&4FfgPtGcb5CFfimXGcZ^)
zFfeRqW?+zFU|{&n%)k)Dz`(%A0#;YgkjTQo;Kjhekj28lz{|kEu$6^@fs=uO;V=tC
z<5?)5lNBN_%*wzZ#=yX!$jZRL&cMK6!3s8r!GRUxAWv2X25trhhDcV3gHl-;7*s*#
zL-kEyWnf@pU|?9z%D|w*P|v`yij{#uiIIWfIx7Q%1Oo%ZFE$1S6$S<dVRi<FD3As0
z3=CWh3=EUm85npN7#QZULkwQc4zYLxI|GA00|UcOc8EnU*&z<(=U`wcU|?WS<ACU&
z&cVRo%fP^}hy&um4<PY+kcAu!3^oi546K|GA31SCeBi~&z#z!Lzz_x%&)|euSilJ}
zu#yvEPzxsm11kdqLmwvtgD3+7!xT;i1|bFphE<#ppYG*^c<2Bp0|O{lLD2v*7Zkyh
zd6-n{L2(ZX5>R}C;!qqEKOk8K1_lu*Ee)kX6eyG=K@0{424*M?qCn9h4DtvA!~vkt
z0;MTXbb%ZOiWX25GdL&aB$wtSmZU0Vq$ZYZUeA=pv{{2yf|1$C%4oAQn;i4xV$Q_?
DxN<ov
diff --git a/cydiapomonella/locale/nb/LC_MESSAGES/django.po b/cydiapomonella/locale/nb/LC_MESSAGES/django.po
index 3cbd390d..a17d7ea1 100644
--- a/cydiapomonella/locale/nb/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/nb/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
-"PO-Revision-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
+"PO-Revision-Date: 2024-10-31 14:49+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: nb\n"
@@ -23,28 +23,28 @@ msgstr ""
msgid "Cydia pomonella"
msgstr "Eplevikler"
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr "Stedsnavn"
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr "Breddegrad"
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr "Lengdegrad"
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr "Tidssone"
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr "Beregn fare for angrep av eplevikler"
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
@@ -52,11 +52,11 @@ msgstr ""
"Her kan du sjekke kveldstemperatur og nedbør for værstasjoner i regioner med "
"eplevikler."
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr "Les mer"
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
@@ -64,40 +64,40 @@ msgstr ""
"Dersom alle kriteriene for egglegging er oppfylt, beregn påløpt varmesum ved "
"å skrive inn startdato nedenfor."
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr "Ingen værdata er tilgjengelig fra den valgte målestasjonen"
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr "Jeg vil bruke værdata"
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr "for et punkt i kartet"
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr "Velg i kart"
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr "fra en værstasjon"
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr "Velg målestasjon"
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr "Jeg vil hente data tilbake i tid fra:"
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -105,16 +105,20 @@ msgstr "Jeg vil hente data tilbake i tid fra:"
msgid "days"
msgstr "dager"
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr "Vennligst vent..."
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr "Dato"
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -123,17 +127,17 @@ msgstr "Dato"
msgid "Temp at"
msgstr "Temp kl"
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr "Døgnnedbør"
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr "Varmesum"
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr "Beregn varmesum fra dato"
diff --git a/cydiapomonella/locale/vi/LC_MESSAGES/django.po b/cydiapomonella/locale/vi/LC_MESSAGES/django.po
index e906b45a..9da9adb3 100644
--- a/cydiapomonella/locale/vi/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/vi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,77 +23,77 @@ msgstr ""
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -101,16 +101,20 @@ msgstr ""
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -119,17 +123,17 @@ msgstr ""
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
diff --git a/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
index e906b45a..9da9adb3 100644
--- a/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/cydiapomonella/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-31 12:29+0100\n"
+"POT-Creation-Date: 2024-10-31 14:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,77 +23,77 @@ msgstr ""
msgid "Cydia pomonella"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:85
+#: cydiapomonella/templates/cydiapomonella/index.html:141
msgid "Location name"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:86
+#: cydiapomonella/templates/cydiapomonella/index.html:142
msgid "Latitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:87
+#: cydiapomonella/templates/cydiapomonella/index.html:143
msgid "Longitude"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:88
+#: cydiapomonella/templates/cydiapomonella/index.html:144
msgid "Timezone"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:169
+#: cydiapomonella/templates/cydiapomonella/index.html:225
#: cydiapomonella/templates/cydiapomonella/index_old.html:718
msgid "Calculate the risk of attack by the coddling moth"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid ""
"Check night temps and rainfall for weather stations and locations in regions "
"with coddling moth."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:170
+#: cydiapomonella/templates/cydiapomonella/index.html:226
msgid "Read more"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:171
+#: cydiapomonella/templates/cydiapomonella/index.html:227
msgid ""
"If all criteria for oviposition are met, calculate heat sum from start date "
"below."
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:178
+#: cydiapomonella/templates/cydiapomonella/index.html:234
#: cydiapomonella/templates/cydiapomonella/index_old.html:727
msgid "No weather data available from the selected weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:184
+#: cydiapomonella/templates/cydiapomonella/index.html:240
msgid "I want to use weather data"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:188
+#: cydiapomonella/templates/cydiapomonella/index.html:244
msgid "for a specific location (coordinates)"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:195
-#: cydiapomonella/templates/cydiapomonella/index.html:208
+#: cydiapomonella/templates/cydiapomonella/index.html:251
+#: cydiapomonella/templates/cydiapomonella/index.html:264
msgid "Select in map"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:202
+#: cydiapomonella/templates/cydiapomonella/index.html:258
msgid "from a weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:206
+#: cydiapomonella/templates/cydiapomonella/index.html:262
#: cydiapomonella/templates/cydiapomonella/index_old.html:733
msgid "Select weather station"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:220
+#: cydiapomonella/templates/cydiapomonella/index.html:276
msgid "I want to get night temperatures and rainfall back in time:"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:222
-#: cydiapomonella/templates/cydiapomonella/index.html:225
-#: cydiapomonella/templates/cydiapomonella/index.html:228
+#: cydiapomonella/templates/cydiapomonella/index.html:278
+#: cydiapomonella/templates/cydiapomonella/index.html:281
+#: cydiapomonella/templates/cydiapomonella/index.html:284
#: cydiapomonella/templates/cydiapomonella/index_old.html:765
#: cydiapomonella/templates/cydiapomonella/index_old.html:768
#: cydiapomonella/templates/cydiapomonella/index_old.html:771
@@ -101,16 +101,20 @@ msgstr ""
msgid "days"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:240
+#: cydiapomonella/templates/cydiapomonella/index.html:292
+msgid "Please wait..."
+msgstr ""
+
+#: cydiapomonella/templates/cydiapomonella/index.html:301
#: cydiapomonella/templates/cydiapomonella/index_old.html:782
msgid "Date"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:241
-#: cydiapomonella/templates/cydiapomonella/index.html:242
-#: cydiapomonella/templates/cydiapomonella/index.html:243
-#: cydiapomonella/templates/cydiapomonella/index.html:244
-#: cydiapomonella/templates/cydiapomonella/index.html:245
+#: cydiapomonella/templates/cydiapomonella/index.html:302
+#: cydiapomonella/templates/cydiapomonella/index.html:303
+#: cydiapomonella/templates/cydiapomonella/index.html:304
+#: cydiapomonella/templates/cydiapomonella/index.html:305
+#: cydiapomonella/templates/cydiapomonella/index.html:306
#: cydiapomonella/templates/cydiapomonella/index_old.html:783
#: cydiapomonella/templates/cydiapomonella/index_old.html:784
#: cydiapomonella/templates/cydiapomonella/index_old.html:785
@@ -119,17 +123,17 @@ msgstr ""
msgid "Temp at"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:246
+#: cydiapomonella/templates/cydiapomonella/index.html:307
#: cydiapomonella/templates/cydiapomonella/index_old.html:788
msgid "Daily rainfall"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:258
+#: cydiapomonella/templates/cydiapomonella/index.html:319
#: cydiapomonella/templates/cydiapomonella/index_old.html:803
msgid "Heat sum"
msgstr ""
-#: cydiapomonella/templates/cydiapomonella/index.html:261
+#: cydiapomonella/templates/cydiapomonella/index.html:322
#: cydiapomonella/templates/cydiapomonella/index_old.html:807
msgid "Calculate heat sum from date"
msgstr ""
diff --git a/cydiapomonella/static/js/cydiapomonella.js b/cydiapomonella/static/js/cydiapomonella.js
index e79d1667..964f06fb 100644
--- a/cydiapomonella/static/js/cydiapomonella.js
+++ b/cydiapomonella/static/js/cydiapomonella.js
@@ -27,6 +27,7 @@ class CydiaPomonella
HEATSUM_BASE_TEMP = 10.0;
WEATHER_DATASOURCE_TYPE_COORDINATES = "coordinates";
WEATHER_DATASOURCE_TYPE_WEATHERSTATION = "weatherstation";
+ progressIconRow = document.getElementById("progressIconRow");
appleWeatherStations = [
@@ -81,6 +82,7 @@ class CydiaPomonella
}
async runModel() {
+ this.progressIconRow.style.display = "block";
let selectedWeatherStationId = this.getSelectedWeatherstation();
let selectedCoordinate = this.getSelectedCoordinate();
if(selectedWeatherStationId == undefined && selectedCoordinate == undefined)
@@ -139,6 +141,7 @@ class CydiaPomonella
{
console.error(error.message);
}
+ this.progressIconRow.style.display = "none";
}
async runHeatSumCalculations()
diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html
index bb0f25f1..b78c3234 100644
--- a/cydiapomonella/templates/cydiapomonella/index.html
+++ b/cydiapomonella/templates/cydiapomonella/index.html
@@ -39,13 +39,69 @@ Created: 2024-10-28
<script type="module">
import CydiaPomonella from "../static/js/cydiapomonella.js";
const cydiaPomonella = new CydiaPomonella();
+ const userSettingsFields = ["latitude","longitude","timezone","weatherStationId","heatSumStartDate"];
+ const userSettingsRadios = ["weatherdataType","radioDays"];
window.onload = (event) => {
cydiaPomonella.renderWeatherstations();
+ //console.info(getNameSpaced("{{ form_id }}",userSettingsFields.concat(userSettingsRadios)));
+ let userSettings = getLocalSettings(getNameSpaced("{{ form_id }}",userSettingsFields.concat(userSettingsRadios)), false);
+
+ // Settings found, render form and run model
+ if(Object.keys(userSettings).length > 0)
+ {
+ userSettingsFields.forEach((fieldId) =>{
+ document.getElementById(fieldId).value = userSettings[`{{ form_id }}.${fieldId}`];
+ });
+ userSettingsRadios.forEach((radioName) => {
+ let radioValue = userSettings[`{{ form_id }}.${radioName}`];
+ document.getElementsByName(radioName).forEach((radioElement) => {
+ radioElement.checked = (radioElement.value == radioValue);
+ });
+ });
+
+ // Check that heat sum start date is in current year. If not: Update to current year
+ let heatSumStartDateElement = document.getElementById("heatSumStartDate");
+ let heatSumStartDate = moment(heatSumStartDateElement.value);
+ if(heatSumStartDate.year() != moment().year())
+ {
+ heatSumStartDate.year(moment().year());
+ heatSumStartDateElement.value = heatSumStartDate.format(cydiaPomonella.DATE_FORMAT);
+ }
+
+
+ if(document.getElementById("coordinates").checked)
+ {
+ displayCoordinatesInput();
+ getTimezoneForPoint(inputLatitudeElement.value, inputLongitudeElement.value);
+ }
+ else
+ {
+ displayWeatherstationInput();
+ }
+
+ cydiaPomonella.runModel();
+ }
}
// We need to do it this way to keep the "this" reference of the class
window.runModel = function () {cydiaPomonella.runModel()};
window.runHeatSumCalculations = function () {cydiaPomonella.runHeatSumCalculations();};
+ window.storeUserSettings = function() {
+ let userSettings = {};
+ userSettingsFields.forEach((fieldId) => {
+ userSettings[`{{ form_id }}.${fieldId}`] = document.getElementById(fieldId).value;
+ });
+ userSettingsRadios.forEach((radioName) => {
+ document.getElementsByName(radioName).forEach((radioElement) => {
+ if(radioElement.checked)
+ {
+ userSettings[`{{ form_id }}.${radioName}`] = radioElement.value;
+ }
+ });
+
+ });
+ storeLocalSettings(userSettings);
+ }
/* ######## MAP UI FUNCTIONALITY ######### */
import MapModal from 'https://logic.testvips.nibio.no/js/mapModal.js';
@@ -65,7 +121,6 @@ Created: 2024-10-28
selectWeatherstationElement.selectedIndex = 0;
}
-
// Callback for coordinates map
function selectCoordinates(coordinatesData) {
const selectedLatitude = coordinatesData ? coordinatesData.latitude : undefined;
@@ -77,6 +132,7 @@ Created: 2024-10-28
}
getTimezoneForPoint(selectedLatitude, selectedLongitude);
cydiaPomonella.runModel();
+ storeUserSettings();
}
const getTimezoneForPoint = (latitude, longitude) => {
@@ -184,7 +240,7 @@ Created: 2024-10-28
<h4>{% trans "I want to use weather data" %}</h4>
<div class="radio">
<label>
- <input type="radio" name="weatherdataType" id="coordinates" value="coordinates" onchange="displayCoordinatesInput()">
+ <input type="radio" name="weatherdataType" id="coordinates" value="coordinates" onchange="displayCoordinatesInput();storeUserSettings();">
{% trans "for a specific location (coordinates)" %}
</label>
<div id="input-coordinates" class="form-inline" style="margin-top: 10px; display: none;"">
@@ -192,17 +248,17 @@ Created: 2024-10-28
<input type="hidden" class="form-control" name="longitude" id="longitude" placeholder="Lengdegrad" aria-label="Lengdegrad">
<input type="hidden" class="form-control" name="timezone" id="timezone" placeholder="Tidssone" aria-label="Tidssone">
<div id="gridPointInfo"></div>
- <button type="button" class="btn btn-primary" onclick="openCoordinatesMap()" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> {% trans "Select in map" %}</button>
+ <button type="button" class="btn btn-primary" onclick="openCoordinatesMap();" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> {% trans "Select in map" %}</button>
</div>
<div id="coordinates-map" class="map-modal"></div>
</div>
<div class="radio">
<label>
- <input type="radio" name="weatherdataType" id="weatherstation" value="weatherstation" checked onchange="displayWeatherstationInput()">
+ <input type="radio" name="weatherdataType" id="weatherstation" value="weatherstation" onchange="displayWeatherstationInput();storeUserSettings();">
{% trans "from a weather station" %}
</label>
<div id="input-weatherstation" class="form-inline" style="margin-top: 10px;" >
- <select name="weatherStationName" id="weatherStationId" class="form-control" style="width: 60%;" onchange="runModel();">
+ <select name="weatherStationName" id="weatherStationId" class="form-control" style="width: 60%;" onchange="runModel();storeUserSettings();">
<option value="-1">-- {% trans "Select weather station" %} --</option>
</select>
<button type="button" class="btn btn-primary" onclick="openPoiMap()" style="margin-left: 5px;"><i class="fa fa-map-marker fa-lg"></i> {% trans "Select in map" %}</button>
@@ -219,18 +275,23 @@ Created: 2024-10-28
<form>
<h4>{% trans "I want to get night temperatures and rainfall back in time:" %} </h4>
<label class="radio-inline">
- <input type="radio" name="radioDays" value="7" checked onclick="runModel()">7 {% trans "days" %}
+ <input type="radio" name="radioDays" value="7" checked onclick="runModel(); storeUserSettings();">7 {% trans "days" %}
</label>
<label class="radio-inline">
- <input type="radio" name="radioDays" value="14" onclick="runModel()">14 {% trans "days" %}
+ <input type="radio" name="radioDays" value="14" onclick="runModel(); storeUserSettings();">14 {% trans "days" %}
</label>
<label class="radio-inline">
- <input type="radio" name="radioDays" value="21" onclick="runModel()">21 {% trans "days" %}
+ <input type="radio" name="radioDays" value="21" onclick="runModel(); storeUserSettings();">21 {% trans "days" %}
</label>
</form>
</div>
</div>
+<div class="row" id="progressIconRow" style="margin-bottom: 10px; display: none;">
+ <div class="col-md-6">
+ <button type="button" class="btn btn-info" style="margin-left: 5px;"><i class="fa fa-hourglass-half fa-lg"></i> {% trans "Please wait..." %}</button>
+ </div>
+</div>
<div class="row">
<div class="col-sm-10">
@@ -259,7 +320,7 @@ Created: 2024-10-28
<form class="form-inline">
<div class="form-group form-inline">
<label for="heatSumStartDate">{% trans "Calculate heat sum from date" %}:</label>
- <input id="heatSumStartDate" name="heatSumStartDate" class="form-control" type="date" placeholder="yyyy-mm-dd" onchange="runHeatSumCalculations()" value="{% now "Y" %}-05-01" />
+ <input id="heatSumStartDate" name="heatSumStartDate" class="form-control" type="date" placeholder="yyyy-mm-dd" onchange="runHeatSumCalculations();storeUserSettings();" value="{% now "Y" %}-05-01" />
</div>
</form>
</div>
diff --git a/cydiapomonella/views.py b/cydiapomonella/views.py
index 3dceb66b..686e7998 100644
--- a/cydiapomonella/views.py
+++ b/cydiapomonella/views.py
@@ -29,15 +29,7 @@ from django.http import HttpResponse
def index(request):
context = {
-
+ "form_id": "cydiapomonella"
}
return render(request,'cydiapomonella/index.html', context)
- #return HttpResponse("Hello - 01 !!.. This is new app for VIPSWeb")
-
-def index_new(request):
-
- context = {
-
- }
- return render(request,'cydiapomonella/index_new.html', context)
#return HttpResponse("Hello - 01 !!.. This is new app for VIPSWeb")
\ No newline at end of file
--
GitLab