From cd0b32b2409a5b0fa4d4a028b56d393cfc59f230 Mon Sep 17 00:00:00 2001
From: Evan Hallein <ehallein@icloud.com>
Date: Mon, 15 Jan 2024 16:26:35 +0800
Subject: [PATCH] time bug fix

---
 wamtram2/templates/wamtram2/observation_detail.html   | 2 +-
 wamtram2/templates/wamtram2/trtentrybatch_detail.html | 2 +-
 wamtram2/templates/wamtram2/trtturtles_detail.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wamtram2/templates/wamtram2/observation_detail.html b/wamtram2/templates/wamtram2/observation_detail.html
index 14e984b42..138876354 100644
--- a/wamtram2/templates/wamtram2/observation_detail.html
+++ b/wamtram2/templates/wamtram2/observation_detail.html
@@ -25,7 +25,7 @@ <h2>Observation {{ object.observation_date|date:"j M Y" }}</h2>
                     <td><a href="{% url 'wamtram2:turtle_detail' observation.turtle.pk %}">{{ observation.turtle.pk }}</a></td>
                 <tr>
                     <th>Date observed</th>
-                    <td>{{ object.observation_date|date:"j M Y" }} {{ object.observation_time|date:"H:m" }} </td>
+                    <td>{{ object.observation_date|date:"j M Y" }} {{ object.observation_time|date:"H:i" }} </td>
                 </tr>
                 <tr>
                     <th>Entered by</th>
diff --git a/wamtram2/templates/wamtram2/trtentrybatch_detail.html b/wamtram2/templates/wamtram2/trtentrybatch_detail.html
index fb676dac1..8c11eeec8 100644
--- a/wamtram2/templates/wamtram2/trtentrybatch_detail.html
+++ b/wamtram2/templates/wamtram2/trtentrybatch_detail.html
@@ -146,7 +146,7 @@
             <tr>
                 <td><a href="{% url 'wamtram2:trtdataentry' obj.data_entry_id %}">{{ obj.data_entry_id }}</a></td>
                 <td>{% if obj.observation_id %}<a href="{% url 'wamtram2:observationdetail' pk=obj.observation_id.pk %}">{{ obj.observation_id.pk }}</a>{% endif %}</td>
-                <td>{{ obj.observation_date|date:"j M Y H:i" }}</td>
+                <td>{{ obj.observation_date|date:"j M Y" }} {{ obj.observation_time|date:"H:i" }}</td>
                 <td>{% if obj.turtle_id %}<a href="{% url 'wamtram2:turtle_detail' obj.turtle_id %}">{{obj.turtle_id}}</a>{% endif %}</td>
                 <td>{% if obj.recapture_left_tag_id %}{{ obj.recapture_left_tag_id }} {% endif %}
                     {% if obj.recapture_left_tag_id_2 %}{{ obj.recapture_left_tag_id_2 }} {% endif %}
diff --git a/wamtram2/templates/wamtram2/trtturtles_detail.html b/wamtram2/templates/wamtram2/trtturtles_detail.html
index 684cb07d7..c8e0d8adf 100644
--- a/wamtram2/templates/wamtram2/trtturtles_detail.html
+++ b/wamtram2/templates/wamtram2/trtturtles_detail.html
@@ -116,7 +116,7 @@ <h3>Observations</h3>
             <tbody>
                 {% for observation in observations %}
                 <tr>
-                    <td><a href="{% url 'wamtram2:observationdetail' pk=observation.observation_id %}">{{ observation.observation_date|date:"D, j M Y H:i" }}</a></td>
+                    <td><a href="{% url 'wamtram2:observationdetail' pk=observation.observation_id %}">{{ observation.observation_date|date:"j M Y" }} {{ observation.observation_time|date:"H:i" }}</a></td>
                     <td>{{ observation.reporter_person }}</td>
                     <td>{{ observation.measurer_person }}</td>
                     <td>{{ observation.place_code }}</td>