Merge branch 'feature/vipsutv-710-download-excel-new' into develop

.gitignore

@@ -23,4 +23,5 @@ venv
 ipmd/.$IPMD_DSS_Metadata_structure.drawio.bkp
 .DS_Store
 .idea
-makefile
+makefile
\ No newline at end of file
+/static
\ No newline at end of file

VIPSWeb/locale/bg/LC_MESSAGES/django.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+0200\n"
 "PO-Revision-Date: 2014-05-14 09:31+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,38 +30,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr ""
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr ""

VIPSWeb/locale/bs/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+0200\n"
 "PO-Revision-Date: 2015-02-13 11:26+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -19,38 +19,6 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr ""
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr ""

VIPSWeb/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-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,38 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr ""
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr ""

VIPSWeb/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-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,38 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr ""
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr ""

VIPSWeb/locale/nb/LC_MESSAGES/django.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VIPSWeb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+0200\n"
 "PO-Revision-Date: 2024-03-22 09:25+0100\n"
 "Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
 "Language-Team: \n"
@@ -30,38 +30,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.4.2\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr "Risikokart"
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr "Om risikokart"
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr "Septoria referansefuktmodell"
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr "Gulrotflue svermetidspunktmodell"
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr "Korn og oljevekster"
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr "Poteter og grønnsaker"
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr "Frukt og bær"
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr "Andre modeller og tjenester"
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr "Fil ikke funnet"
@@ -230,5 +198,29 @@ msgstr "Modeller fra IPM Decisions"
 msgid "Saddle gall midge"
 msgstr "Salgallmygg"
 
+#~ msgid "Risk maps"
+#~ msgstr "Risikokart"
+
+#~ msgid "About risk maps"
+#~ msgstr "Om risikokart"
+
+#~ msgid "Septoria reference humidity model"
+#~ msgstr "Septoria referansefuktmodell"
+
+#~ msgid "Carrot rust fly temperature model"
+#~ msgstr "Gulrotflue svermetidspunktmodell"
+
+#~ msgid "Cereals and oilseeds"
+#~ msgstr "Korn og oljevekster"
+
+#~ msgid "Potato and vegetables"
+#~ msgstr "Poteter og grønnsaker"
+
+#~ msgid "Fruits and berries"
+#~ msgstr "Frukt og bær"
+
+#~ msgid "Other models and services"
+#~ msgstr "Andre modeller og tjenester"
+
 #~ msgid "Naerstad Late Blight Model"
 #~ msgstr "Nærstads modell"

VIPSWeb/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-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,38 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr ""
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr "File không tìm thấy"

VIPSWeb/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-26 08:59+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+0200\n"
 "PO-Revision-Date: 2019-06-24 12:21+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,38 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: VIPSWeb/local_settings.py:211
-msgid "Risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:215
-msgid "About risk maps"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:219
-msgid "Septoria reference humidity model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:223
-msgid "Carrot rust fly temperature model"
-msgstr ""
-
-#: VIPSWeb/local_settings.py:234
-msgid "Cereals and oilseeds"
-msgstr "谷物和油籽"
-
-#: VIPSWeb/local_settings.py:267
-msgid "Potato and vegetables"
-msgstr "土豆和蔬菜"
-
-#: VIPSWeb/local_settings.py:277
-msgid "Fruits and berries"
-msgstr "水果和浆果"
-
-#: VIPSWeb/local_settings.py:292
-msgid "Other models and services"
-msgstr "其他模型和服务"
-
 #: VIPSWeb/templates/404.html:3 VIPSWeb/templates/404.html:5
 msgid "File not found"
 msgstr "找不到文件"
@@ -213,6 +181,18 @@ msgstr ""
 msgid "Saddle gall midge"
 msgstr ""
 
+#~ msgid "Cereals and oilseeds"
+#~ msgstr "谷物和油籽"
+
+#~ msgid "Potato and vegetables"
+#~ msgstr "土豆和蔬菜"
+
+#~ msgid "Fruits and berries"
+#~ msgstr "水果和浆果"
+
+#~ msgid "Other models and services"
+#~ msgstr "其他模型和服务"
+
 #~ msgid "Temporarily down for maintenance"
 #~ msgstr "暂时停机维护"
 

VIPSWeb/views.py

@@ -101,8 +101,6 @@ def vipslogicproxy(request, path):
         return HttpResponseNotAllowed("Permitted methods are POST and GET")
     params = request.urlencode()
 
-
-    #print ("Params:" + params)
     try:
         url = "%s://%s/%s" % (settings.VIPSLOGIC_PROTOCOL, settings.VIPSLOGIC_SERVER_NAME,path)
         #print(url)
@@ -112,6 +110,17 @@ def vipslogicproxy(request, path):
     params_encoded = params.encode("ascii")
     response = r(url, params=params_encoded)
     if response.status_code == 200:
-        return HttpResponse(response.text, status=int(response.status_code), content_type=response.headers.get('content-type',"text/plain"))
+        content_type = response.headers.get('content-type')
+        if 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' in content_type: 
+            response_content = response.content
+            content_disposition = response.headers.get('Content-Disposition', '')
+            response = HttpResponse(response_content, content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+            if 'filename=' in content_disposition:
+                filename = content_disposition.split('filename=')[1].strip().strip('"')
+                response['Content-Disposition'] = f'attachment; filename="{filename}"'
+            return response
+        else:
+            # Handle other content types normally
+            return HttpResponse(response.text, status=response.status_code, content_type=content_type)
     else:
         return HttpResponse("[]", status=200, content_type="application/json")

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-26 09:11+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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"
@@ -30,7 +30,7 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:36
 #: observations/templates/observations/index.html:46
-#: observations/templates/observations/index.html:68
+#: observations/templates/observations/index.html:74
 #: observations/templates/observations/index_old.html:63
 #: observations/templates/observations/timeseries.html:34
 msgid "Organism"
@@ -38,27 +38,27 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:38
 #: observations/templates/observations/index.html:50
-#: observations/templates/observations/index.html:69
+#: observations/templates/observations/index.html:75
 #: observations/templates/observations/index_old.html:64
 #: observations/templates/observations/timeseries.html:36
 msgid "Crop"
 msgstr ""
 
 #: observations/templates/observations/detail.html:40
-#: observations/templates/observations/index.html:67
+#: observations/templates/observations/index.html:73
 #: observations/templates/observations/index_old.html:62
 msgid "Date of observation"
 msgstr ""
 
 #: observations/templates/observations/detail.html:43
-#: observations/templates/observations/index.html:71
+#: observations/templates/observations/index.html:77
 #: observations/templates/observations/timeseries.html:23
 #: observations/templates/observations/timeseries.html:28
 msgid "Time series"
 msgstr ""
 
 #: observations/templates/observations/detail.html:47
-#: observations/templates/observations/timeseries.html:38
+#: observations/templates/observations/timeseries.html:39
 msgid "Location"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Illustrations"
 msgstr ""
 
 #: observations/templates/observations/detail.html:68
-#: observations/templates/observations/timeseries.html:54
+#: observations/templates/observations/timeseries.html:56
 msgid "View all observations"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgid "Observation was not quantified"
 msgstr ""
 
 #: observations/templates/observations/detail.html:164
-#: observations/templates/observations/timeseries.html:165
+#: observations/templates/observations/timeseries.html:167
 msgid "Map view not available"
 msgstr ""
 
@@ -107,12 +107,20 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: observations/templates/observations/index.html:70
+#: observations/templates/observations/index.html:66
+msgid "No observations found for specified search criteria"
+msgstr ""
+
+#: observations/templates/observations/index.html:69
+msgid "Download as Excel"
+msgstr ""
+
+#: observations/templates/observations/index.html:76
 #: observations/templates/observations/index_old.html:65
 msgid "Heading"
 msgstr ""
 
-#: observations/templates/observations/index.html:72
+#: observations/templates/observations/index.html:78
 msgid "Details"
 msgstr ""
 
@@ -140,6 +148,6 @@ msgstr ""
 msgid "View details"
 msgstr ""
 
-#: observations/templates/observations/timeseries.html:40
+#: observations/templates/observations/timeseries.html:42
 msgid "Number of observations"
 msgstr ""

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-26 09:00+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: observations/static/observations/js/observationList.js:185
+#: observations/static/observations/js/observationList.js:190
 msgid "Observation(s) found at location"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:203
+#: observations/static/observations/js/observationList.js:208
 msgid "in"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:637
+#: observations/static/observations/js/observationList.js:657
 msgid "Days since observation"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:640
+#: observations/static/observations/js/observationList.js:660
 msgid "Days"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:642
+#: observations/static/observations/js/observationList.js:662
 msgid "Older"
 msgstr ""

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-26 09:11+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:36
 #: observations/templates/observations/index.html:46
-#: observations/templates/observations/index.html:68
+#: observations/templates/observations/index.html:74
 #: observations/templates/observations/index_old.html:63
 #: observations/templates/observations/timeseries.html:34
 msgid "Organism"
@@ -39,27 +39,27 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:38
 #: observations/templates/observations/index.html:50
-#: observations/templates/observations/index.html:69
+#: observations/templates/observations/index.html:75
 #: observations/templates/observations/index_old.html:64
 #: observations/templates/observations/timeseries.html:36
 msgid "Crop"
 msgstr ""
 
 #: observations/templates/observations/detail.html:40
-#: observations/templates/observations/index.html:67
+#: observations/templates/observations/index.html:73
 #: observations/templates/observations/index_old.html:62
 msgid "Date of observation"
 msgstr ""
 
 #: observations/templates/observations/detail.html:43
-#: observations/templates/observations/index.html:71
+#: observations/templates/observations/index.html:77
 #: observations/templates/observations/timeseries.html:23
 #: observations/templates/observations/timeseries.html:28
 msgid "Time series"
 msgstr ""
 
 #: observations/templates/observations/detail.html:47
-#: observations/templates/observations/timeseries.html:38
+#: observations/templates/observations/timeseries.html:39
 msgid "Location"
 msgstr ""
 
@@ -72,7 +72,7 @@ msgid "Illustrations"
 msgstr ""
 
 #: observations/templates/observations/detail.html:68
-#: observations/templates/observations/timeseries.html:54
+#: observations/templates/observations/timeseries.html:56
 msgid "View all observations"
 msgstr ""
 
@@ -81,7 +81,7 @@ msgid "Observation was not quantified"
 msgstr ""
 
 #: observations/templates/observations/detail.html:164
-#: observations/templates/observations/timeseries.html:165
+#: observations/templates/observations/timeseries.html:167
 msgid "Map view not available"
 msgstr ""
 
@@ -108,12 +108,20 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: observations/templates/observations/index.html:70
+#: observations/templates/observations/index.html:66
+msgid "No observations found for specified search criteria"
+msgstr ""
+
+#: observations/templates/observations/index.html:69
+msgid "Download as Excel"
+msgstr ""
+
+#: observations/templates/observations/index.html:76
 #: observations/templates/observations/index_old.html:65
 msgid "Heading"
 msgstr ""
 
-#: observations/templates/observations/index.html:72
+#: observations/templates/observations/index.html:78
 msgid "Details"
 msgstr ""
 
@@ -141,6 +149,6 @@ msgstr ""
 msgid "View details"
 msgstr ""
 
-#: observations/templates/observations/timeseries.html:40
+#: observations/templates/observations/timeseries.html:42
 msgid "Number of observations"
 msgstr ""

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-26 09:00+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,22 +19,22 @@ 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"
 
-#: observations/static/observations/js/observationList.js:185
+#: observations/static/observations/js/observationList.js:190
 msgid "Observation(s) found at location"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:203
+#: observations/static/observations/js/observationList.js:208
 msgid "in"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:637
+#: observations/static/observations/js/observationList.js:657
 msgid "Days since observation"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:640
+#: observations/static/observations/js/observationList.js:660
 msgid "Days"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:642
+#: observations/static/observations/js/observationList.js:662
 msgid "Older"
 msgstr ""

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-26 09:11+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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"
@@ -30,7 +30,7 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:36
 #: observations/templates/observations/index.html:46
-#: observations/templates/observations/index.html:68
+#: observations/templates/observations/index.html:74
 #: observations/templates/observations/index_old.html:63
 #: observations/templates/observations/timeseries.html:34
 msgid "Organism"
@@ -38,27 +38,27 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:38
 #: observations/templates/observations/index.html:50
-#: observations/templates/observations/index.html:69
+#: observations/templates/observations/index.html:75
 #: observations/templates/observations/index_old.html:64
 #: observations/templates/observations/timeseries.html:36
 msgid "Crop"
 msgstr ""
 
 #: observations/templates/observations/detail.html:40
-#: observations/templates/observations/index.html:67
+#: observations/templates/observations/index.html:73
 #: observations/templates/observations/index_old.html:62
 msgid "Date of observation"
 msgstr ""
 
 #: observations/templates/observations/detail.html:43
-#: observations/templates/observations/index.html:71
+#: observations/templates/observations/index.html:77
 #: observations/templates/observations/timeseries.html:23
 #: observations/templates/observations/timeseries.html:28
 msgid "Time series"
 msgstr ""
 
 #: observations/templates/observations/detail.html:47
-#: observations/templates/observations/timeseries.html:38
+#: observations/templates/observations/timeseries.html:39
 msgid "Location"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Illustrations"
 msgstr ""
 
 #: observations/templates/observations/detail.html:68
-#: observations/templates/observations/timeseries.html:54
+#: observations/templates/observations/timeseries.html:56
 msgid "View all observations"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgid "Observation was not quantified"
 msgstr ""
 
 #: observations/templates/observations/detail.html:164
-#: observations/templates/observations/timeseries.html:165
+#: observations/templates/observations/timeseries.html:167
 msgid "Map view not available"
 msgstr ""
 
@@ -107,12 +107,20 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: observations/templates/observations/index.html:70
+#: observations/templates/observations/index.html:66
+msgid "No observations found for specified search criteria"
+msgstr ""
+
+#: observations/templates/observations/index.html:69
+msgid "Download as Excel"
+msgstr ""
+
+#: observations/templates/observations/index.html:76
 #: observations/templates/observations/index_old.html:65
 msgid "Heading"
 msgstr ""
 
-#: observations/templates/observations/index.html:72
+#: observations/templates/observations/index.html:78
 msgid "Details"
 msgstr ""
 
@@ -140,6 +148,6 @@ msgstr ""
 msgid "View details"
 msgstr ""
 
-#: observations/templates/observations/timeseries.html:40
+#: observations/templates/observations/timeseries.html:42
 msgid "Number of observations"
 msgstr ""

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-26 09:00+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: observations/static/observations/js/observationList.js:185
+#: observations/static/observations/js/observationList.js:190
 msgid "Observation(s) found at location"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:203
+#: observations/static/observations/js/observationList.js:208
 msgid "in"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:637
+#: observations/static/observations/js/observationList.js:657
 msgid "Days since observation"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:640
+#: observations/static/observations/js/observationList.js:660
 msgid "Days"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:642
+#: observations/static/observations/js/observationList.js:662
 msgid "Older"
 msgstr ""

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-26 09:11+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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"
@@ -30,7 +30,7 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:36
 #: observations/templates/observations/index.html:46
-#: observations/templates/observations/index.html:68
+#: observations/templates/observations/index.html:74
 #: observations/templates/observations/index_old.html:63
 #: observations/templates/observations/timeseries.html:34
 msgid "Organism"
@@ -38,27 +38,27 @@ msgstr ""
 
 #: observations/templates/observations/detail.html:38
 #: observations/templates/observations/index.html:50
-#: observations/templates/observations/index.html:69
+#: observations/templates/observations/index.html:75
 #: observations/templates/observations/index_old.html:64
 #: observations/templates/observations/timeseries.html:36
 msgid "Crop"
 msgstr ""
 
 #: observations/templates/observations/detail.html:40
-#: observations/templates/observations/index.html:67
+#: observations/templates/observations/index.html:73
 #: observations/templates/observations/index_old.html:62
 msgid "Date of observation"
 msgstr ""
 
 #: observations/templates/observations/detail.html:43
-#: observations/templates/observations/index.html:71
+#: observations/templates/observations/index.html:77
 #: observations/templates/observations/timeseries.html:23
 #: observations/templates/observations/timeseries.html:28
 msgid "Time series"
 msgstr ""
 
 #: observations/templates/observations/detail.html:47
-#: observations/templates/observations/timeseries.html:38
+#: observations/templates/observations/timeseries.html:39
 msgid "Location"
 msgstr ""
 
@@ -71,7 +71,7 @@ msgid "Illustrations"
 msgstr ""
 
 #: observations/templates/observations/detail.html:68
-#: observations/templates/observations/timeseries.html:54
+#: observations/templates/observations/timeseries.html:56
 msgid "View all observations"
 msgstr ""
 
@@ -80,7 +80,7 @@ msgid "Observation was not quantified"
 msgstr ""
 
 #: observations/templates/observations/detail.html:164
-#: observations/templates/observations/timeseries.html:165
+#: observations/templates/observations/timeseries.html:167
 msgid "Map view not available"
 msgstr ""
 
@@ -107,12 +107,20 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: observations/templates/observations/index.html:70
+#: observations/templates/observations/index.html:66
+msgid "No observations found for specified search criteria"
+msgstr ""
+
+#: observations/templates/observations/index.html:69
+msgid "Download as Excel"
+msgstr ""
+
+#: observations/templates/observations/index.html:76
 #: observations/templates/observations/index_old.html:65
 msgid "Heading"
 msgstr ""
 
-#: observations/templates/observations/index.html:72
+#: observations/templates/observations/index.html:78
 msgid "Details"
 msgstr ""
 
@@ -140,6 +148,6 @@ msgstr ""
 msgid "View details"
 msgstr ""
 
-#: observations/templates/observations/timeseries.html:40
+#: observations/templates/observations/timeseries.html:42
 msgid "Number of observations"
 msgstr ""

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-26 09:00+0200\n"
+"POT-Creation-Date: 2024-08-20 12:20+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,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: observations/static/observations/js/observationList.js:185
+#: observations/static/observations/js/observationList.js:190
 msgid "Observation(s) found at location"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:203
+#: observations/static/observations/js/observationList.js:208
 msgid "in"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:637
+#: observations/static/observations/js/observationList.js:657
 msgid "Days since observation"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:640
+#: observations/static/observations/js/observationList.js:660
 msgid "Days"
 msgstr ""
 
-#: observations/static/observations/js/observationList.js:642
+#: observations/static/observations/js/observationList.js:662
 msgid "Older"
 msgstr ""