From 99f2692684ad05898e52366c5d8d32122c25d6ba Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 21 Sep 2021 10:06:06 +0200
Subject: [PATCH] activity: correction of displaying activity when durationTime
 or travelTime is null

---
 .../Resources/views/Activity/list.html.twig        |  2 +-
 .../Resources/views/Activity/show.html.twig        | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 07b59c7e7..c227f5539 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -19,7 +19,7 @@
                             {% endif %}
 
                             <div class="duration">
-                                {% if t.durationTimeVisible > 0 %}
+                                {% if activity.durationTime and t.durationTimeVisible %}
                                     <p>
                                         <i class="fa fa-fw fa-hourglass-end"></i>
                                         {{ activity.durationTime|date('H:i') }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 81ebddc05..1f54692d9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -64,12 +64,22 @@
 
     {% if t.durationTimeVisible %}
     <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-    <dd>{{ entity.durationTime|date('H:i') }}</dd>
+    <dd>{% if entity.durationTime is not null %}
+            {{ entity.durationTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
     {% endif %}
 
     {% if t.travelTimeVisible %}
     <dt class="inline">{{ 'Travel Time'|trans }}</dt>
-    <dd>{{ entity.travelTime|date('H:i') }}</dd>
+    <dd>{% if entity.travelTime is not null %}
+            {{ entity.travelTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
     {% endif %}
 
     {% if t.commentVisible %}