From 73f6c697b90e31da8d0b130d4c741490184c9b1f Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Sun, 7 Feb 2021 17:21:55 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B03649=20-=20Activity=20panel:=20Fix=20wro?=
 =?UTF-8?q?ng=20elapsed=20time=20displayed=20under=20entries=20after=20a?=
 =?UTF-8?q?=20new=20entry=20has=20been=20added?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/layouts/activity-panel/activity-panel.js                | 7 +++----
 .../layouts/activity-panel/activity-entry/layout.html.twig | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/layouts/activity-panel/activity-panel.js b/js/layouts/activity-panel/activity-panel.js
index 07d06e7dc..d0ba15f61 100644
--- a/js/layouts/activity-panel/activity-panel.js
+++ b/js/layouts/activity-panel/activity-panel.js
@@ -382,14 +382,13 @@ $(function()
 				const me = this;
 
 				this.element.find(this.js_selectors.entry_datetime).each(function(){
-					const oEntryDateTime = moment($(this).text(), me.options.datetime_format);
+					const oEntryDateTime = moment($(this).attr('data-formatted-datetime'), me.options.datetime_format);
 					const oNowDateTime = moment();
 
 					// Reformat date time only if it is not too far in the past (eg. "2 years ago" is not easy to interpret)
 					const fDays = moment.duration(oNowDateTime.diff(oEntryDateTime)).asDays();
-					if(fDays < me.options.datetimes_reformat_limit)
-					{
-						$(this).text( moment($(this).text(), me.options.datetime_format).fromNow() );
+					if (fDays < me.options.datetimes_reformat_limit) {
+						$(this).text(moment($(this).attr('data-formatted-datetime'), me.options.datetime_format).fromNow());
 					}
 				});
 			},
diff --git a/templates/base/layouts/activity-panel/activity-entry/layout.html.twig b/templates/base/layouts/activity-panel/activity-entry/layout.html.twig
index 64521444c..a606581f0 100644
--- a/templates/base/layouts/activity-panel/activity-entry/layout.html.twig
+++ b/templates/base/layouts/activity-panel/activity-entry/layout.html.twig
@@ -32,8 +32,11 @@
 			</div>
 			<div class="ibo-activity-entry--sub-information" data-role="ibo-activity-entry--sub-information">
 				{% block iboActivityEntrySubInformation %}
-					<span class="ibo-activity-entry--datetime" data-role="ibo-activity-entry--datetime" data-tooltip-content="{{ oUIBlock.GetFormattedDateTime() }}">{{ oUIBlock.GetFormattedDateTime() }}</span>
-				{% endblock %}
+                    <span class="ibo-activity-entry--datetime" data-role="ibo-activity-entry--datetime"
+                          data-tooltip-content="{{ oUIBlock.GetFormattedDateTime() }}"
+                          data-raw-datetime="{{ oUIBlock.GetRawDateTime() }}"
+                          data-formatted-datetime="{{ oUIBlock.GetFormattedDateTime() }}">{{ oUIBlock.GetFormattedDateTime() }}</span>
+                {% endblock %}
 			</div>
 		{% endblock %}
 	</div>