From dde6782475c1b5fe84b578de85ff9119345e754e Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Tue, 14 Feb 2023 11:37:07 +0100
Subject: [PATCH] (bug)  wrong times in admin/event monitoring

---
 CHANGELOG.md                                        | 2 ++
 app/frontend/templates/admin/events/monitoring.html | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8994a9b6c..9bd45c438 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog Fab-manager
 
+- Fix a bug: wrong times in admin/event monitoring
+- Fix a bug: event update over daylight saving time's day results in wrong date
 - Fix a bug: unable to run `rails db:seed` when first setup Fab-manager
 
 ## v5.6.11 2023 February 07
diff --git a/app/frontend/templates/admin/events/monitoring.html b/app/frontend/templates/admin/events/monitoring.html
index 7d77bf9ed..91b2a73b7 100644
--- a/app/frontend/templates/admin/events/monitoring.html
+++ b/app/frontend/templates/admin/events/monitoring.html
@@ -29,9 +29,9 @@
 	  <span ng-if="(event.start_date | amDateFormat:'LL')==(event.end_date | amDateFormat:'LL')">
 		{{ 'app.admin.events.on_DATE' | translate:{DATE:(event.start_date | amDateFormat:'LL')} }}
         <span ng-if="event.all_day === false">
-          {{ 'app.admin.events.from_TIME' | translate:{TIME:(event.start_date | amDateFormat:'LT')} }}
+          {{ 'app.admin.events.from_TIME' | translate:{TIME:event.start_time} }}
           <span class="text-sm font-thin" translate>{{ 'app.admin.events.to_time' }}</span>
-          {{event.end_date | amDateFormat:'LT'}}
+          {{event.end_time}}
         </span>
 	  </span>
 
@@ -41,9 +41,9 @@
 	    {{'app.admin.events.to_date' | translate}} {{event.end_date | amDateFormat:'LL'}}
         <br ng-if="event.all_day === false"/>
         <span ng-if="event.all_day === false">
-          {{ 'app.admin.events.from_TIME' | translate:{TIME:(event.start_date | amDateFormat:'LT')} }}
+          {{ 'app.admin.events.from_TIME' | translate:{TIME:event.start_time} }}
           <span class="text-sm font-thin" translate>{{ 'app.admin.events.to_time' }}</span>
-          {{event.end_date | amDateFormat:'LT'}}
+          {{event.end_time}}
         </span>
       </span>
     </td>