Skip to content
Snippets Groups Projects
Commit 726b8b27 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

feat(observations): Display date instead of timestamp in list and detail view

parent 62b1c9e2
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 27 deletions
observations/locale/bg/LC_MESSAGES/django.po
+ 2
− 2
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
......
observations/locale/bg/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/locale/bs/LC_MESSAGES/django.po
+ 2
− 2
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......@@ -41,7 +41,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
......
observations/locale/bs/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/locale/de/LC_MESSAGES/django.po
+ 2
− 2
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
......
observations/locale/de/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/locale/fi/LC_MESSAGES/django.po
+ 2
− 2
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
......
observations/locale/fi/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/locale/nb/LC_MESSAGES/django.mo
+ 0
− 0
View file @ 726b8b27
No preview for this file type
observations/locale/nb/LC_MESSAGES/django.po
+ 3
− 3
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: 2024-06-06 13:42+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
......@@ -41,8 +41,8 @@ msgstr "Kultur"
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgstr "Observasjonstidspunkt"
msgid "Date of observation"
msgstr "Observasjonsdato"
#: templates/observations/detail.html:40
msgid "Observation data"
......
observations/locale/nb/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/locale/vi/LC_MESSAGES/django.po
+ 2
− 2
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......@@ -40,7 +40,7 @@ msgstr ""
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgid "Date of observation"
msgstr ""
#: templates/observations/detail.html:40
......
observations/locale/vi/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/locale/zh_Hans/LC_MESSAGES/django.mo
+ 0
− 0
View file @ 726b8b27
No preview for this file type
observations/locale/zh_Hans/LC_MESSAGES/django.po
+ 2
− 2
View file @ 726b8b27
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-06 13:36+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+0200\n"
"PO-Revision-Date: 2016-10-27 11:26+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
......@@ -39,7 +39,7 @@ msgstr "作物"
#: templates/observations/detail.html:36 templates/observations/index.html:67
#: templates/observations/index_old.html:62
msgid "Time of observation"
msgid "Date of observation"
msgstr "观测时间"
#: templates/observations/detail.html:40
......
observations/locale/zh_Hans/LC_MESSAGES/djangojs.po
+ 1
− 1
View file @ 726b8b27
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-03 14:01+0200\n"
"POT-Creation-Date: 2024-06-16 09:23+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"
......
observations/static/observations/js/observationList.js
+ 1
− 1
View file @ 726b8b27
......@@ -346,7 +346,7 @@ var renderObservationTable = function(data)
tbodyHTML.push("<tr>");
tbodyHTML.push("<td>" + moment(obs.timeOfObservation).format("YYYY-MM-DD HH:mm ZZ") + "</td>");
tbodyHTML.push("<td>" + moment(obs.timeOfObservation).format("YYYY-MM-DD") + "</td>");
tbodyHTML.push("<td>" + obs.organismName + "</td>");
tbodyHTML.push("<td>" + obs.cropOrganismName + "</td>");
tbodyHTML.push("<td>" + obs.observationHeading + "</td>");
......
observations/templates/observations/detail.html
+ 2
− 2
View file @ 726b8b27
......@@ -33,7 +33,7 @@
<p id="organismName"></p>
<h4>{% trans "Crop" %}</h4>
<p id="cropOrganismName"></p>
<h4>{% trans "Time of observation" %}</h4>
<h4>{% trans "Date of observation" %}</h4>
<p id="timeOfObservation"></p>
<h2 id="observationHeading"></h2>
<p id="observationText"></p>
......@@ -65,7 +65,7 @@
//console.log(observation);
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 = getStandardFormattedTimestamp(observation.timeOfObservation);
document.getElementById("timeOfObservation").innerHTML = getStandardFormattedDate(observation.timeOfObservation);
//document.getElementById("observerName").innerHTML = observation.user.firstName + " " + observation.user.lastName;
document.getElementById("observationHeading").innerHTML = observation.observationHeading;
document.getElementById("observationText").innerHTML = observation.observationText;
......
observations/templates/observations/index.html
+ 1
− 1
View file @ 726b8b27
......@@ -64,7 +64,7 @@
<div class="table-responsive">
<table class="table table-striped" id="observationTable">
<thead>
<th>{% trans "Time of observation" %}</th>
<th>{% trans "Date of observation" %}</th>
<th>{% trans "Organism" %}</th>
<th>{% trans "Crop" %}</th>
<th>{% trans "Heading" %}</th>
......
observations/templates/observations/index_old.html
+ 1
− 1
View file @ 726b8b27
......@@ -59,7 +59,7 @@
<table class="table">
<thead>
<tr>
<th>{% trans "Time of observation" %}</th>
<th>{% trans "Date of observation" %}</th>
<th>{% trans "Organism" %}</th>
<th>{% trans "Crop" %}</th>
<th>{% trans "Heading" %}</th>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment