From 998e500154bd37dff6160d723671d1735ff48bee Mon Sep 17 00:00:00 2001
From: Pierre <pierre@hubert.fr>
Date: Wed, 2 May 2018 16:16:18 +0200
Subject: [PATCH] Added date to conversations

---
 .../css/components/conversations/windows.css  |  8 ++++++
 .../components/conversations/chatWindows.js   | 25 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/assets/css/components/conversations/windows.css b/assets/css/components/conversations/windows.css
index 8b75f0ca..e21ddf59 100644
--- a/assets/css/components/conversations/windows.css
+++ b/assets/css/components/conversations/windows.css
@@ -80,6 +80,14 @@
 /**
  * Conversations messages
  */
+
+#conversationsElem .date-conversation-message {
+	margin-top: 2px;
+	text-align: center;
+	font-size: 70%;
+	font-style: italic;
+}
+
 #conversationsElem .conversation-msg-image {
 	height: 50px;
 }
diff --git a/assets/js/components/conversations/chatWindows.js b/assets/js/components/conversations/chatWindows.js
index ab83cd56..ebbbd051 100644
--- a/assets/js/components/conversations/chatWindows.js
+++ b/assets/js/components/conversations/chatWindows.js
@@ -814,11 +814,17 @@ ComunicWeb.components.conversations.chatWindows = {
 			class: "direct-chat-info clearfix"
 		});
 
+		//Add top information
+		var topInfosElem = createElem2({
+			appendTo: messageHeader,
+			type: "div",
+			class: "direct-chat-name pull-" + (userIsPoster ? "right" : "left"),
+		});
+
 		//Add user name
 		var usernameElem = createElem2({
-			appendTo: messageHeader,
+			appendTo: topInfosElem,
 			type: "span",
-			class: "direct-chat-name pull-" + (userIsPoster ? "right" : "left"),
 			innerHTML: "Loading",
 		});
 
@@ -887,6 +893,14 @@ ComunicWeb.components.conversations.chatWindows = {
 			}
 		}
 
+		//Add date
+		var dateElem = createElem2({
+			appendTo: messageContainer,
+			type: "div",
+			class: "date-conversation-message",
+			innerHTML: ComunicWeb.common.date.timeDiffToStr(message.time_insert)
+		});
+
 		//Parse emojies in text message
 		ComunicWeb.components.emoji.parser.parse({
 			element: textMessage,
@@ -897,6 +911,8 @@ ComunicWeb.components.conversations.chatWindows = {
 			userID: message.ID_user,
 			rootElem: messageContainer,
 			userNameElem: usernameElem,
+			dateElem: dateElem,
+			time_insert: message.time_insert,
 			messageTargetElem: messageTargetElem,
 			accountImage: userAccountImage
 		};
@@ -928,6 +944,11 @@ ComunicWeb.components.conversations.chatWindows = {
 
 			}
 
+
+			//Check the difference of time between the two messages
+			if(conv.messages[num].time_insert - conv.messages[num - 1].time_insert < 3600
+				|| conv.messages[num].dateElem.innerHTML == conv.messages[num - 1].dateElem.innerHTML)
+				conv.messages[num].dateElem.style.display = "none";
 		}
 
 	},