From d6ce35716bd39f4f387de9c2e15f86f825e6e0f2 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Mon, 24 Jun 2024 12:32:04 +0200
Subject: [PATCH] feat(timeseries): Add timeseries label in observation list,
display location
---
VIPSWeb/static/css/vipsweb.css | 24 +++++++++++++
observations/locale/bg/LC_MESSAGES/django.po | 26 +++++++++++---
.../locale/bg/LC_MESSAGES/djangojs.po | 14 ++++----
observations/locale/bs/LC_MESSAGES/django.po | 26 +++++++++++---
.../locale/bs/LC_MESSAGES/djangojs.po | 14 ++++----
observations/locale/de/LC_MESSAGES/django.po | 26 +++++++++++---
.../locale/de/LC_MESSAGES/djangojs.po | 14 ++++----
observations/locale/fi/LC_MESSAGES/django.po | 26 +++++++++++---
.../locale/fi/LC_MESSAGES/djangojs.po | 14 ++++----
observations/locale/nb/LC_MESSAGES/django.mo | Bin 1565 -> 1724 bytes
observations/locale/nb/LC_MESSAGES/django.po | 26 +++++++++++---
.../locale/nb/LC_MESSAGES/djangojs.po | 14 ++++----
observations/locale/vi/LC_MESSAGES/django.po | 26 +++++++++++---
.../locale/vi/LC_MESSAGES/djangojs.po | 14 ++++----
.../locale/zh_Hans/LC_MESSAGES/django.po | 28 ++++++++++++---
.../locale/zh_Hans/LC_MESSAGES/djangojs.po | 14 ++++----
.../static/observations/js/observationList.js | 10 +++---
.../templates/observations/timeseries.html | 33 ++++++++++--------
18 files changed, 246 insertions(+), 103 deletions(-)
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index b2d983cf..8a1a3750 100755
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -432,6 +432,17 @@ span.inverseSign {
font-size: 80%;
}
+span.timeseries-label {
+ display: inline-block;
+ background-color: #008136;
+ font-family: monospace;
+ border-radius: 5px;
+ color: #FFFFFF;
+ padding: 3px;
+ text-decoration: none !important;
+ font-size: 80%;
+}
+
div.second {
/*font-family: "Roboto", Arial, Helvetica, sans-serif;*/
width: 320px;
@@ -782,6 +793,19 @@ td.dateCell {
background-color: white;
}
+#observationTimeSeries .label {
+ color: darkgrey;
+ font-size: 1.1em;
+ padding: 0;
+ font-weight: lighter;
+}
+
+#observationTimeSeries .description {
+ padding: 3px;
+ margin-top: 3px;
+ margin-bottom: 15px;
+ font-style: italic;
+}
table.messageTable tr, table.messageTable td
diff --git a/observations/locale/bg/LC_MESSAGES/django.po b/observations/locale/bg/LC_MESSAGES/django.po
index bd6ddb64..99ca44a1 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
@@ -54,16 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr ""
@@ -122,3 +122,19 @@ msgstr ""
#: templates/observations/timeseries.html:28
msgid "Time series"
msgstr ""
+
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr ""
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr ""
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr ""
+
+#: templates/observations/timeseries.html:40
+msgid "Number of observations"
+msgstr ""
diff --git a/observations/locale/bg/LC_MESSAGES/djangojs.po b/observations/locale/bg/LC_MESSAGES/djangojs.po
index 3c2e3db7..89037f2a 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
-#: static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr ""
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr ""
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr ""
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr ""
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr ""
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr ""
diff --git a/observations/locale/bs/LC_MESSAGES/django.po b/observations/locale/bs/LC_MESSAGES/django.po
index eb67e9cd..861d1f4c 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
@@ -55,16 +55,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr ""
@@ -123,3 +123,19 @@ msgstr ""
#: templates/observations/timeseries.html:28
msgid "Time series"
msgstr ""
+
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr ""
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr ""
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr ""
+
+#: templates/observations/timeseries.html:40
+msgid "Number of observations"
+msgstr ""
diff --git a/observations/locale/bs/LC_MESSAGES/djangojs.po b/observations/locale/bs/LC_MESSAGES/djangojs.po
index 6829abee..1e5b96e5 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
@@ -19,26 +19,26 @@ msgstr ""
"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
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr ""
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr ""
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr ""
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr ""
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr ""
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr ""
diff --git a/observations/locale/de/LC_MESSAGES/django.po b/observations/locale/de/LC_MESSAGES/django.po
index bd6ddb64..99ca44a1 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
@@ -54,16 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr ""
@@ -122,3 +122,19 @@ msgstr ""
#: templates/observations/timeseries.html:28
msgid "Time series"
msgstr ""
+
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr ""
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr ""
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr ""
+
+#: templates/observations/timeseries.html:40
+msgid "Number of observations"
+msgstr ""
diff --git a/observations/locale/de/LC_MESSAGES/djangojs.po b/observations/locale/de/LC_MESSAGES/djangojs.po
index 3c2e3db7..89037f2a 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
-#: static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr ""
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr ""
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr ""
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr ""
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr ""
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr ""
diff --git a/observations/locale/fi/LC_MESSAGES/django.po b/observations/locale/fi/LC_MESSAGES/django.po
index bd6ddb64..99ca44a1 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
@@ -54,16 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr ""
@@ -122,3 +122,19 @@ msgstr ""
#: templates/observations/timeseries.html:28
msgid "Time series"
msgstr ""
+
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr ""
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr ""
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr ""
+
+#: templates/observations/timeseries.html:40
+msgid "Number of observations"
+msgstr ""
diff --git a/observations/locale/fi/LC_MESSAGES/djangojs.po b/observations/locale/fi/LC_MESSAGES/djangojs.po
index 3c2e3db7..89037f2a 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
-#: static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr ""
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr ""
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr ""
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr ""
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr ""
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr ""
diff --git a/observations/locale/nb/LC_MESSAGES/django.mo b/observations/locale/nb/LC_MESSAGES/django.mo
index 9fc6cf3260d71eb6ad11ff6a79cb07acf3bb3107..c85bd2f6014c28a4e67c3addb43da994d7dcceb4 100755
GIT binary patch
delta 778
zcmbQsvxm3-o)F7a1_lNO87Th4z`&r&z`$^a5hTjMP{72%z{$YCP{_o<z{0@5P|d`^
zz|X+I(7?pNz{<eDFoB7Ifro*CVHy(ygD?XF!(t`|25trhhV4-LFcSj<8v_Hwd8qzt
zObiU{3=9mnnHU&&85rsr9y2j8XfrS{d}Lx^;9y{2kY#3I5My9qP=nI8%n$=Zm>C!Z
z7#J85m>C%4Kn`MtSUiClqHiu#-7;o~!!|K9FfcJNFzjGvU=U?sVA##fz@Wmwz;F?&
z?;A4%gA!vs0|PS)#7AnZ5SN;<LM*a{^8HvD82A_%7($`qDXb6+OIaZft7C;Yq>Gh-
zfti7UVLB@V0~Z4W!)&O&Wvr0U-O36H!Aq<R46+Oi4A)s17)0tB7#O}n4dP;hSS-fI
zz@W^)z@W|s4k89`Hb@jiLg{2Sh(mMPAQqOeL3~)j#=xM+z`)SQ265O1HU<VzEJ`yl
zFbFX)Fo;896da0BCPOI5rJ(o$#Xm?;5JWIAFi0>kFi0^#LPioQ#>)VS8c_T~g}`wR
zN*|yQ0*QfwnrE^glQg5qWL>5(ZkN>J<f6=ilFa<P$xTfD96tHUiD1qJCJ8aW(%huf
zB8B`kh5V%A)S@!5O!4IBObP6nB{``KA^DTzn8h~7F|T9fc1kVIF3K!R%_&Zu%+2a)
z9$b=|!r+})R8p2%oR^uGu8^6XovKihnUkKCnwOrMlbO!om{*dRlLIrmI4eIdwP<o7
YYZ^yMNoo#5NM_FDcdTNQ-?8cg0H6wJqyPW_
delta 606
zcmdnPJC~>ao)F7a1_lNO2?hoR83qQ1I}8jAstgPaa~MIQ3=9TL3=EtM3=D=$3=Av`
z3=Gyx3=I4X3=9rT3=FIc3=9EG3=BLB3=CmR3=F~y3=GLk3=G^13=HK=3=C`x3=GXs
zeO*ip4D1XH4E;<D47>~s4AYqy7_=D}>KT?YF))ZRFfd$%YJ9=Oz#zcD!0?5MfkBRe
zfq|77Vu1=X0|N)hA<Pg9te6=Xm>3us+?W{{L>U+uJee67R2Uc-;-TtWm>C$97#SEQ
zGD94^g$3fEBP<Z}PlNgO3=DTz7#R2%7#JQyB|fo0EMjJbSj@x9z`)GFz#z%Wz`(`8
zz#z*CQLn)Y2{Ch41_oIM28Iw;h{K9lAr{oJGB7BEe9Q{*@n%*?NFIdJr$Oe{GcYh*
zWrg_QCMyGjA_D`%d#FKzYzz$0SOABJ2qZ?pj)gKAKv4q<W*8q75->I>R6$WC4ix}J
z6Nm}&1c(M<QBa(L;vN(yAORr;1_tiQflShjf|GNZ!X}?*@)Pq-EKn%ROf6T)%P&z#
tEKAJHNleN~ogB=Zz?eVz0<+lW3(V^nCwH-WOuo)4H<^nqb#fV-8vsXFIWPbK
diff --git a/observations/locale/nb/LC_MESSAGES/django.po b/observations/locale/nb/LC_MESSAGES/django.po
index 33c379f0..241e5a0d 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+0200\n"
"PO-Revision-Date: 2024-06-06 13:42+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -55,16 +55,16 @@ msgstr "Observasjonsdato"
msgid "Observation data"
msgstr "Observasjonsdata"
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr "Observasjonen ble ikke kvantifisert"
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
msgid "Illustrations"
msgstr "Illustrasjoner"
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr "Kartvisning ikke tilgjengelig"
@@ -124,5 +124,21 @@ msgstr "Se detaljer"
msgid "Time series"
msgstr "Tidsserie"
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr "Tittel"
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr "Sted"
+
+#: templates/observations/timeseries.html:40
+msgid "Number of observations"
+msgstr "Antall observasjoner"
+
#~ msgid "Observer"
#~ msgstr "Observatør"
diff --git a/observations/locale/nb/LC_MESSAGES/djangojs.po b/observations/locale/nb/LC_MESSAGES/djangojs.po
index 973b8e1e..1960c5cd 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
-#: static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr "Observasjon(er) funnet på lokalitet"
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr "i"
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr "Detaljer"
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr "Dager siden observasjon"
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr "Dager"
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr "Eldre"
diff --git a/observations/locale/vi/LC_MESSAGES/django.po b/observations/locale/vi/LC_MESSAGES/django.po
index de9d9ca1..276a0ae2 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
@@ -54,16 +54,16 @@ msgstr ""
msgid "Observation data"
msgstr ""
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr ""
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
msgid "Illustrations"
msgstr ""
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr ""
@@ -122,3 +122,19 @@ msgstr ""
#: templates/observations/timeseries.html:28
msgid "Time series"
msgstr ""
+
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr ""
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr ""
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr ""
+
+#: templates/observations/timeseries.html:40
+msgid "Number of observations"
+msgstr ""
diff --git a/observations/locale/vi/LC_MESSAGES/djangojs.po b/observations/locale/vi/LC_MESSAGES/djangojs.po
index 2a64a40e..d1ebf601 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
-#: static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr ""
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr ""
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr ""
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr ""
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr ""
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr ""
diff --git a/observations/locale/zh_Hans/LC_MESSAGES/django.po b/observations/locale/zh_Hans/LC_MESSAGES/django.po
index 8b41e939..e1347943 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-18 15:04+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+0200\n"
"PO-Revision-Date: 2016-10-27 11:26+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -55,18 +55,18 @@ msgstr "观测时间"
msgid "Observation data"
msgstr "观测数据"
-#: templates/observations/detail.html:91
+#: templates/observations/detail.html:97
msgid "Observation was not quantified"
msgstr "观测没有定量化"
-#: templates/observations/detail.html:95
+#: templates/observations/detail.html:101
#, fuzzy
#| msgid "Observations"
msgid "Illustrations"
msgstr "观测"
-#: templates/observations/detail.html:124
-#: templates/observations/timeseries.html:146
+#: templates/observations/detail.html:130
+#: templates/observations/timeseries.html:156
msgid "Map view not available"
msgstr ""
@@ -128,5 +128,23 @@ msgstr "看细节"
msgid "Time series"
msgstr ""
+#: templates/observations/timeseries.html:34
+msgid "Title"
+msgstr ""
+
+#: templates/observations/timeseries.html:36
+msgid "Description"
+msgstr ""
+
+#: templates/observations/timeseries.html:38
+msgid "Location"
+msgstr ""
+
+#: templates/observations/timeseries.html:40
+#, fuzzy
+#| msgid "Date of observation"
+msgid "Number of observations"
+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 2a64a40e..d1ebf601 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-18 15:05+0200\n"
+"POT-Creation-Date: 2024-06-21 14:19+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"
-#: static/observations/js/observationList.js:185
+#: static/observations/js/observationList.js:187
msgid "Observation(s) found at location"
msgstr ""
-#: static/observations/js/observationList.js:203
+#: static/observations/js/observationList.js:205
msgid "in"
msgstr ""
-#: static/observations/js/observationList.js:368
+#: static/observations/js/observationList.js:370
msgid "Details"
msgstr ""
-#: static/observations/js/observationList.js:638
+#: static/observations/js/observationList.js:640
msgid "Days since observation"
msgstr ""
-#: static/observations/js/observationList.js:641
+#: static/observations/js/observationList.js:643
msgid "Days"
msgstr ""
-#: static/observations/js/observationList.js:643
+#: static/observations/js/observationList.js:645
msgid "Older"
msgstr ""
diff --git a/observations/static/observations/js/observationList.js b/observations/static/observations/js/observationList.js
index 635bb919..a8bf87ae 100644
--- a/observations/static/observations/js/observationList.js
+++ b/observations/static/observations/js/observationList.js
@@ -351,19 +351,19 @@ var renderObservationTable = function(data)
tbodyHTML.push("<td>" + obs.cropOrganismName + "</td>");
tbodyHTML.push("<td>" + obs.observationHeading + "</td>");
- if (obs.observationTimeSeriesId) {
+ if (obs.observationTimeSeriesLabel) {
tbodyHTML.push(
- "<td><a href='/observations/timeseries/" + obs.observationTimeSeriesId + "' target='new'><i class='fa fa-list'/></a></td>"
+ "<td><a href='/observations/timeseries/" + obs.observationTimeSeriesId + "' target='new'><span class='timeseries-label'/> " + obs.observationTimeSeriesLabel + "</a></td>"
);
} else {
tbodyHTML.push("<td></td>");
}
if(Object.keys(measuredVal).length != 0){
- tbodyHTML.push("<td><a tabindex='0' class='btn btn-lg' role='button' data-toggle='popover' data-placement='left' data-trigger='focus' data-html='true' data-content='" + printVal.join("<br/>").replace("'","'") + "' ><i class='fa fa-balance-scale' aria-hidden='true' </i></a></td>")
+ tbodyHTML.push("<td><a tabindex='0' role='button' data-toggle='popover' data-placement='left' data-trigger='focus' data-html='true' data-content='" + printVal.join("<br/>").replace("'","'") + "' ><span class='fa fa-balance-scale' aria-hidden='true'/></a></td>")
} else{
- tbodyHTML.push("<td></td>")
- }
+ tbodyHTML.push("<td></td>")
+ }
tbodyHTML.push("<td><a href='/observations/" + obs.observationId + "' target='new'>" + gettext("Details") + "</a></td>");
tbodyHTML.push("</tr>");
diff --git a/observations/templates/observations/timeseries.html b/observations/templates/observations/timeseries.html
index 33a21db7..a7a591a2 100644
--- a/observations/templates/observations/timeseries.html
+++ b/observations/templates/observations/timeseries.html
@@ -22,17 +22,20 @@
{% load i18n %}
{% block title%}{% trans "Time series" %}{%endblock%}
{% block content %}
- <div class="singleBlockContainer">
+ <div id="observationTimeSeries" class="singleBlockContainer">
<div class="row">
<div class="col-md-6">
- <h1>{% trans "Time series" %}</h1>
- <p><a href="/observations" class="btn btn-default back" role="button">{% trans "View all observations" %}</a></p>
- <h4>{% trans "Organism" %}</h4>
- <p id="organismName"></p>
- <h4>{% trans "Crop" %}</h4>
- <p id="cropOrganismName"></p>
- <h2 id="timeSeriesName"></h2>
- <p id="timeSeriesDescription"></p>
+ <p style=""><a href="/observations" class="btn btn-default back" role="button">{% trans "View all observations" %}</a></p>
+ <h1>{% trans "Time series" %} <span id="timeSeriesName"></span></h1>
+ <div class="description" id="timeSeriesDescription"></div>
+ <p class="label">{% trans "Organism" %}</p>
+ <p class="value" id="organismName"></p>
+ <p class="label">{% trans "Crop" %}</p>
+ <p class="value" id="cropOrganismName"></p>
+ <p class="label">{% trans "Location" %}</p>
+ <p class="value" id="timeSeriesLocation"></p>
+ <p class="label">{% trans "Number of observations" %}</p>
+ <p class="value" id="observationCount"></p>
</div>
<div class="col-md-6">
<div id="observationViewMap" class="map" style="height: 400px;"></div>
@@ -60,16 +63,15 @@
$(document).ready(function() {
var uuidParam = settings.userUuid != null ? "?userUUID=" + settings.userUuid : "";
$.getJSON( "/vipslogicproxy/rest/observationtimeseries/{{observation_time_series_id}}/" + uuidParam , function( observationTimeSeries ) {
- //console.log(observation);
document.getElementById("organismName").innerHTML = getLocalizedOrganismName(observationTimeSeries.organism) + " <i>(" + observationTimeSeries.organism.latinName + ")</i>";
document.getElementById("cropOrganismName").innerHTML = getLocalizedOrganismName(observationTimeSeries.cropOrganism) + " <i>(" + observationTimeSeries.cropOrganism.latinName + ")</i>";
document.getElementById("timeSeriesName").innerHTML = observationTimeSeries.name;
document.getElementById("timeSeriesDescription").innerHTML = observationTimeSeries.description;
-
- console.info("observationTimeSeries", observationTimeSeries);
+ document.getElementById("timeSeriesLocation").innerHTML = observationTimeSeries.locationPointOfInterest.name;
let observations = [];
$.getJSON( "/vipslogicproxy/rest/observation/list/filter/{{ organization_id }}?observationTimeSeriesId={{ observation_time_series_id }}", function( observations ) {
+ document.getElementById("observationCount").innerHTML = observations.length;
initTable(observations);
});
@@ -106,7 +108,6 @@
Object.keys(dataSchema['properties']).forEach(function(key) {
dataVars[key] = dataSchema['properties'][key]['title']
});
- console.info("dataSchema", dataSchema);
const table = document.createElement("table");
table.className = "table table-striped"
@@ -116,7 +117,9 @@
const headers = Object.keys(observations[0]);
const dateCell = headerRow.insertCell();
- dateCell.outerHTML = "<th>" + gettext("Observasjonsdato") + "</th>";
+ dateCell.outerHTML = "<th>" + gettext("Date") + "</th>";
+ const titleCell = headerRow.insertCell();
+ titleCell.outerHTML = "<th>" + gettext("Title") + "</th>";
Object.keys(dataVars).forEach((key, index) => {
const dataCell = headerRow.insertCell();
@@ -128,6 +131,8 @@
const row = tbody.insertRow(rowIndex);
const dateCell = row.insertCell();
dateCell.outerHTML = "<td><a href='/observations/" +observation.observationId + "'>" + getStandardFormattedDate(observation.timeOfObservation) + "</a></td>";
+ const titleCell = row.insertCell();
+ titleCell.outerHTML = "<td>" + observation.observationHeading + "</td>";
Object.keys(dataVars).forEach((key, index) => {
const dataCell = row.insertCell();
--
GitLab