rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity

(bug) wrong times in admin/event monitoring

Browse Source
This commit is contained in:
Sylvain 2023-02-14 11:37:07 +01:00
parent e5eb24a9dc
commit dde6782475
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

8
app/frontend/templates/admin/events/monitoring.html
View File

@ -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>