From 15366182ea51fd5e913116c50f116ae1e758254d Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Wed, 19 Jun 2024 08:43:56 +0200
Subject: [PATCH] feat(timeseries): Translations, link from observation to
timeseries
---
observations/locale/bg/LC_MESSAGES/django.po | 21 +++++++++++++---
.../locale/bg/LC_MESSAGES/djangojs.po | 15 ++++++------
observations/locale/bs/LC_MESSAGES/django.po | 21 +++++++++++++---
.../locale/bs/LC_MESSAGES/djangojs.po | 19 ++++++++-------
observations/locale/de/LC_MESSAGES/django.po | 21 +++++++++++++---
.../locale/de/LC_MESSAGES/djangojs.po | 14 +++++------
observations/locale/fi/LC_MESSAGES/django.po | 21 +++++++++++++---
.../locale/fi/LC_MESSAGES/djangojs.po | 15 ++++++------
observations/locale/nb/LC_MESSAGES/django.mo | Bin 1408 -> 1565 bytes
observations/locale/nb/LC_MESSAGES/django.po | 21 +++++++++++++---
.../locale/nb/LC_MESSAGES/djangojs.po | 14 +++++------
observations/locale/vi/LC_MESSAGES/django.po | 21 +++++++++++++---
.../locale/vi/LC_MESSAGES/djangojs.po | 15 ++++++------
.../locale/zh_Hans/LC_MESSAGES/django.po | 23 +++++++++++++++---
.../locale/zh_Hans/LC_MESSAGES/djangojs.po | 14 +++++------
.../templates/observations/detail.html | 17 ++++++++++---
.../templates/observations/timeseries.html | 4 +--
17 files changed, 192 insertions(+), 84 deletions(-)
diff --git a/observations/locale/bg/LC_MESSAGES/django.po b/observations/locale/bg/LC_MESSAGES/django.po
index 4731b169..bd6ddb64 100644
--- a/observations/locale/bg/LC_MESSAGES/django.po
+++ b/observations/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-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\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,18 +23,25 @@ msgid "Observation"
msgstr ""
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr ""
+#: templates/observations/detail.html:29
+msgid "View all observations in time series"
+msgstr ""
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr ""
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr ""
@@ -47,15 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr ""
@@ -109,3 +117,8 @@ msgstr ""
#: templates/observations/index_old.html:136
msgid "View details"
msgstr ""
+
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr ""
diff --git a/observations/locale/bg/LC_MESSAGES/djangojs.po b/observations/locale/bg/LC_MESSAGES/djangojs.po
index 610729fb..3c2e3db7 100644
--- a/observations/locale/bg/LC_MESSAGES/djangojs.po
+++ b/observations/locale/bg/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -17,26 +17,27 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: observations/static/observations/js/observationList.js:185
+
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr ""
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr ""
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr ""
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr ""
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr ""
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr ""
diff --git a/observations/locale/bs/LC_MESSAGES/django.po b/observations/locale/bs/LC_MESSAGES/django.po
index cbe5916d..eb67e9cd 100644
--- a/observations/locale/bs/LC_MESSAGES/django.po
+++ b/observations/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-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\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,18 +24,25 @@ msgid "Observation"
msgstr ""
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr ""
+#: templates/observations/detail.html:29
+msgid "View all observations in time series"
+msgstr ""
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr ""
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr ""
@@ -48,15 +55,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr ""
@@ -110,3 +118,8 @@ msgstr ""
#: templates/observations/index_old.html:136
msgid "View details"
msgstr ""
+
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr ""
diff --git a/observations/locale/bs/LC_MESSAGES/djangojs.po b/observations/locale/bs/LC_MESSAGES/djangojs.po
index e4fa42be..6829abee 100644
--- a/observations/locale/bs/LC_MESSAGES/djangojs.po
+++ b/observations/locale/bs/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -16,28 +16,29 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: observations/static/observations/js/observationList.js:185
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr ""
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr ""
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr ""
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr ""
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr ""
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr ""
diff --git a/observations/locale/de/LC_MESSAGES/django.po b/observations/locale/de/LC_MESSAGES/django.po
index 4731b169..bd6ddb64 100755
--- a/observations/locale/de/LC_MESSAGES/django.po
+++ b/observations/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-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\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,18 +23,25 @@ msgid "Observation"
msgstr ""
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr ""
+#: templates/observations/detail.html:29
+msgid "View all observations in time series"
+msgstr ""
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr ""
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr ""
@@ -47,15 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr ""
@@ -109,3 +117,8 @@ msgstr ""
#: templates/observations/index_old.html:136
msgid "View details"
msgstr ""
+
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr ""
diff --git a/observations/locale/de/LC_MESSAGES/djangojs.po b/observations/locale/de/LC_MESSAGES/djangojs.po
index fe07d322..3c2e3db7 100644
--- a/observations/locale/de/LC_MESSAGES/djangojs.po
+++ b/observations/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -18,26 +18,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: observations/static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr ""
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr ""
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr ""
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr ""
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr ""
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr ""
diff --git a/observations/locale/fi/LC_MESSAGES/django.po b/observations/locale/fi/LC_MESSAGES/django.po
index 4731b169..bd6ddb64 100644
--- a/observations/locale/fi/LC_MESSAGES/django.po
+++ b/observations/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-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\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,18 +23,25 @@ msgid "Observation"
msgstr ""
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr ""
+#: templates/observations/detail.html:29
+msgid "View all observations in time series"
+msgstr ""
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr ""
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr ""
@@ -47,15 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr ""
@@ -109,3 +117,8 @@ msgstr ""
#: templates/observations/index_old.html:136
msgid "View details"
msgstr ""
+
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr ""
diff --git a/observations/locale/fi/LC_MESSAGES/djangojs.po b/observations/locale/fi/LC_MESSAGES/djangojs.po
index 610729fb..3c2e3db7 100644
--- a/observations/locale/fi/LC_MESSAGES/djangojs.po
+++ b/observations/locale/fi/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -17,26 +17,27 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: observations/static/observations/js/observationList.js:185
+
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr ""
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr ""
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr ""
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr ""
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr ""
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr ""
diff --git a/observations/locale/nb/LC_MESSAGES/django.mo b/observations/locale/nb/LC_MESSAGES/django.mo
index dd5c8aff24103c45080a796510f29378c22406b8..9fc6cf3260d71eb6ad11ff6a79cb07acf3bb3107 100755
GIT binary patch
delta 677
zcmZqRp375zPl#nI0|Ntt1Oo$u3<Cqh9R>ylRR#uzIgB7t1_lEr1_n+B1_nbW1_l-e
z1_o;;1_pix1_lQv1_o9J28IA81_mAm28J*u1_ogU28LuN1_o{h28MDb1_m|;28L#+
zzAh#P26hGphJGdn23`gRhUrWU4B89~^$bgy7#PGD7#J=>HNIeCU=UznVEDqsz#zxK
zz`)83u|S2Hfq?_$5N3!4R?G|xObiSRZp;h}q6`cSp3DpkDhvz^@lf?G%nS@lj0_AD
znIR6|!UA#75f+H~r@{Ps28KH<3=Dh>3=EH<5}#Ng7BRCzEaqWlU|?ooV31^GVBlh4
zV31{nsMlbHgqS%i1A{CB149Ta#9>9O5DV&985op7K4yjZcrz;`Bo9LA(;#!}85kI@
zvO;`tla+x%k%58XJ=7pUHU<W0EPz8q1QH`)$3mG5pr`=_GmH-k2^bp`s-UP6hYEnA
z3B&|>0z`wbAt=s3aSw_Ukbn>a#228r2E`Z1=b&H*1vMzX1vkHC<YVN@%uQ7&PA$qz
zEuQ?7NnS27Cr2SasW`Q$EU_drKd)FJGf$xeu4c0!vo{l4N-;>o<Oo)I?Zlj%RG9kW
eto*#xB85zal1zw-REFSGg_P8i#GI_uA_f5JT1mJ7
delta 555
zcmbQs)4*MSPl#nI0|Ntt7y|=?3<Cqh83qOhSq27%8b**P1H%VK1_n+B28NG}3=Av`
z3=F>+85sCMQcMgCtPBhc0!$1HJRto{3=F~y3=GOl3=G^13=HN>3=C`x3=Gap5Pe=u
z3=HfH3=IBE3=F&s3=H8+3=G-~4D}4DOc2W_LN%^nVqg$pU|`t7#K0iOz`$@6YQYmG
z1_ln0LzoyCm>3uselamHh%zuR{DsO3GczzKF)}bHFhd;Z%mQ&hFbl-IC@4Rhg@J*O
zfq|h2EMCvR(8vNYcoGZ5C$m`?7?>Ft7*?<_FmN$2Fsy-U*v<k8p<^tN5PHl4@hKxK
z!~$Mc1_osY1_n7+h!34uAt4vQ3NbH=72@DHR*1e5Rt5&fdIpGZKtTtJ0#L|;Tn7p|
zkmaDD1_dW5$Uwmi@-aw_2m>TIL2N+=hy|d~0r5c?6lFpn1{8y$3KV^ykY#Yp$x$ds
yEiNf$aGq?#^q(<*avZbR<Tz%w&7I6HOpG~`-?57EG6bh8q@<Q4=47Q7F#rHO3NEMs
diff --git a/observations/locale/nb/LC_MESSAGES/django.po b/observations/locale/nb/LC_MESSAGES/django.po
index 0cb163e8..33c379f0 100755
--- a/observations/locale/nb/LC_MESSAGES/django.po
+++ b/observations/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-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\n"
"PO-Revision-Date: 2024-06-06 13:42+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -24,18 +24,25 @@ msgid "Observation"
msgstr "Observasjon"
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr "Se alle observasjoner"
+#: templates/observations/detail.html:29
+msgid "View all observations in time series"
+msgstr "Se alle observasjoner i tidsserie"
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr "Organisme"
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr "Kultur"
@@ -48,15 +55,16 @@ msgstr "Observasjonsdato"
msgid "Observation data"
msgstr "Observasjonsdata"
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr "Observasjonen ble ikke kvantifisert"
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
msgid "Illustrations"
msgstr "Illustrasjoner"
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr "Kartvisning ikke tilgjengelig"
@@ -111,5 +119,10 @@ msgstr "Kultur"
msgid "View details"
msgstr "Se detaljer"
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr "Tidsserie"
+
#~ msgid "Observer"
#~ msgstr "Observatør"
diff --git a/observations/locale/nb/LC_MESSAGES/djangojs.po b/observations/locale/nb/LC_MESSAGES/djangojs.po
index 8b3f93b8..973b8e1e 100644
--- a/observations/locale/nb/LC_MESSAGES/djangojs.po
+++ b/observations/locale/nb/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -18,26 +18,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: observations/static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr "Observasjon(er) funnet på lokalitet"
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr "i"
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr "Detaljer"
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr "Dager siden observasjon"
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr "Dager"
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr "Eldre"
diff --git a/observations/locale/vi/LC_MESSAGES/django.po b/observations/locale/vi/LC_MESSAGES/django.po
index 28da2c7a..de9d9ca1 100644
--- a/observations/locale/vi/LC_MESSAGES/django.po
+++ b/observations/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-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\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,18 +23,25 @@ msgid "Observation"
msgstr ""
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr ""
+#: templates/observations/detail.html:29
+msgid "View all observations in time series"
+msgstr ""
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr ""
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr ""
@@ -47,15 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr ""
@@ -109,3 +117,8 @@ msgstr ""
#: templates/observations/index_old.html:136
msgid "View details"
msgstr ""
+
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr ""
diff --git a/observations/locale/vi/LC_MESSAGES/djangojs.po b/observations/locale/vi/LC_MESSAGES/djangojs.po
index 0bf1eb77..2a64a40e 100644
--- a/observations/locale/vi/LC_MESSAGES/djangojs.po
+++ b/observations/locale/vi/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -17,26 +17,27 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: observations/static/observations/js/observationList.js:185
+
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr ""
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr ""
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr ""
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr ""
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr ""
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr ""
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/django.po b/observations/locale/zh_Hans/LC_MESSAGES/django.po
index 0107c33f..8b41e939 100755
--- a/observations/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/observations/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:04+0200\n"
"PO-Revision-Date: 2016-10-27 11:26+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -22,18 +22,27 @@ msgid "Observation"
msgstr "观测"
#: templates/observations/detail.html:29
+#: templates/observations/timeseries.html:29
msgid "View all observations"
msgstr "查看所有观测"
+#: templates/observations/detail.html:29
+#, fuzzy
+#| msgid "View all observations"
+msgid "View all observations in time series"
+msgstr "查看所有观测"
+
#: templates/observations/detail.html:32 templates/observations/index.html:46
#: templates/observations/index.html:68
#: templates/observations/index_old.html:63
+#: templates/observations/timeseries.html:30
msgid "Organism"
msgstr "生物"
#: templates/observations/detail.html:34 templates/observations/index.html:50
#: templates/observations/index.html:69
#: templates/observations/index_old.html:64
+#: templates/observations/timeseries.html:32
msgid "Crop"
msgstr "作物"
@@ -46,17 +55,18 @@ msgstr "观测时间"
msgid "Observation data"
msgstr "观测数据"
-#: templates/observations/detail.html:86
+#: templates/observations/detail.html:91
msgid "Observation was not quantified"
msgstr "观测没有定量化"
-#: templates/observations/detail.html:90
+#: templates/observations/detail.html:95
#, fuzzy
#| msgid "Observations"
msgid "Illustrations"
msgstr "观测"
-#: templates/observations/detail.html:119
+#: templates/observations/detail.html:124
+#: templates/observations/timeseries.html:146
msgid "Map view not available"
msgstr ""
@@ -113,5 +123,10 @@ msgstr "作物"
msgid "View details"
msgstr "看细节"
+#: templates/observations/timeseries.html:23
+#: templates/observations/timeseries.html:28
+msgid "Time series"
+msgstr ""
+
#~ msgid "Observer"
#~ msgstr "观测者"
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po b/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
index 1cf68347..2a64a40e 100644
--- a/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
+++ b/observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-16 09:23+0200\n"
+"POT-Creation-Date: 2024-06-18 15:05+0200\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"
@@ -18,26 +18,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: observations/static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:185
msgid "Observation(s) found at location"
msgstr ""
-#: observations/static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:203
msgid "in"
msgstr ""
-#: observations/static/observations/js/observationList.js:360
+#: static/observations/js/observationList.js:368
msgid "Details"
msgstr ""
-#: observations/static/observations/js/observationList.js:630
+#: static/observations/js/observationList.js:638
msgid "Days since observation"
msgstr ""
-#: observations/static/observations/js/observationList.js:633
+#: static/observations/js/observationList.js:641
msgid "Days"
msgstr ""
-#: observations/static/observations/js/observationList.js:635
+#: static/observations/js/observationList.js:643
msgid "Older"
msgstr ""
diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html
index 1c5654da..8611b0e4 100755
--- a/observations/templates/observations/detail.html
+++ b/observations/templates/observations/detail.html
@@ -26,7 +26,7 @@
{% block content %}
<div class="singleBlockContainer">
<h1>{% trans "Observation" %}</h1>
- <p><a href="/observations" class="btn btn-default back" role="button">{% trans "View all observations" %}</a></p>
+ <p><a href="/observations" class="btn btn-default back" role="button">{% trans "View all observations" %}</a> <a id="timeSeriesLink" class="btn btn-default back" role="button">{% trans "View all observations in time series" %}</a></p>
<div class="row">
<div class="col-md-6">
<h4>{% trans "Organism" %}</h4>
@@ -63,6 +63,11 @@
var uuidParam = settings.userUuid != null ? "?userUUID=" + settings.userUuid : "";
$.getJSON( "/vipslogicproxy/rest/observation/{{observation_id}}/" + uuidParam , function( observation ) {
//console.log(observation);
+ if(observation.observationTimeSeriesId) {
+ document.getElementById("timeSeriesLink").href = "/observations/timeseries/" + observation.observationTimeSeriesId;
+ } else {
+ document.getElementById("timeSeriesLink").hidden = true;
+ }
document.getElementById("organismName").innerHTML = getLocalizedOrganismName(observation.organism) + " <i>(" + observation.organism.latinName + ")</i>";
document.getElementById("cropOrganismName").innerHTML = getLocalizedOrganismName(observation.cropOrganism) + " <i>(" + observation.cropOrganism.latinName + ")</i>";
document.getElementById("timeOfObservation").innerHTML = getStandardFormattedDate(observation.timeOfObservation);
@@ -71,11 +76,17 @@
document.getElementById("observationText").innerHTML = observation.observationText;
if(observation.isQuantified != undefined && observation.isQuantified)
{
- var observationDataHTML = "<ul>";
+ const dataSchema = JSON.parse(observation.observationDataSchema["dataSchema"])
+ let dataVars = {}
+ Object.keys(dataSchema['properties']).forEach(function(key) {
+ dataVars[key] = dataSchema['properties'][key]['title']
+ });
+
+ var observationDataHTML = "<ul>";
var observationData = JSON.parse(observation.observationData);
for(var fieldName in observationData)
{
- observationDataHTML += "<li>" + capitalizeFirstLetter(fieldName) + ": " + observationData[fieldName] + "</li>";
+ observationDataHTML += "<li>" + dataVars[fieldName] + ": " + observationData[fieldName] + "</li>";
}
observationDataHTML += "</ul>";
document.getElementById("observationData").innerHTML = observationDataHTML;
diff --git a/observations/templates/observations/timeseries.html b/observations/templates/observations/timeseries.html
index 8c9f9234..33a21db7 100644
--- a/observations/templates/observations/timeseries.html
+++ b/observations/templates/observations/timeseries.html
@@ -116,7 +116,7 @@
const headers = Object.keys(observations[0]);
const dateCell = headerRow.insertCell();
- dateCell.outerHTML = `<th>Observasjonsdag</th>`;
+ dateCell.outerHTML = "<th>" + gettext("Observasjonsdato") + "</th>";
Object.keys(dataVars).forEach((key, index) => {
const dataCell = headerRow.insertCell();
@@ -127,7 +127,7 @@
observations.forEach((observation, rowIndex) => {
const row = tbody.insertRow(rowIndex);
const dateCell = row.insertCell();
- dateCell.innerText = getStandardFormattedDate(observation.timeOfObservation);
+ dateCell.outerHTML = "<td><a href='/observations/" +observation.observationId + "'>" + getStandardFormattedDate(observation.timeOfObservation) + "</a></td>";
Object.keys(dataVars).forEach((key, index) => {
const dataCell = row.insertCell();
--
GitLab