From f5557d81e0b97cc1b0b53d6a9888484f564e36b2 Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre.git@communiquons.org>
Date: Wed, 21 Apr 2021 18:30:29 +0200
Subject: [PATCH] Merging is working

---
 assets/js/pages/groups/pages/presence.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/pages/groups/pages/presence.js b/assets/js/pages/groups/pages/presence.js
index bcbff971..a39e7cb7 100644
--- a/assets/js/pages/groups/pages/presence.js
+++ b/assets/js/pages/groups/pages/presence.js
@@ -59,7 +59,7 @@ class GroupPresencePage {
                             let curr = presences[i];
                             let next = presences[i + 1];
 
-                            if(curr.userID != next.userID || curr.year != next.year || curr.month != next.month || curr.day != next.day - 1)
+                            if(curr.userID != next.userID || curr.end.getTime() != next.date.getTime())
                                 break;
                             
                             curr.end = next.end;