Skip to content

Date ranges list in component #1242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
didoda merged 2 commits into from
Mar 13, 2025
Merged

Date ranges list in component #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5058e0c
refactor: date ranges list
didoda Mar 13, 2025
74e9bea
fix: do not deprecate class
didoda Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions resources/js/app/components/date-ranges-list/date-ranges-list.js
View file
Open in desktop

This file was deleted.

113 changes: 113 additions & 0 deletions resources/js/app/components/date-ranges-list/date-ranges-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<template>
<div
class="index-date-ranges"
:class="showAll? 'show-all' : ''"
>
<div>
<div
v-for="(item, index) in items"
:key="index"
>
<div
class="date-range"
v-show="showAll || index < 1"
>
<div class="date-item">
{{ isInterval(item) ? msgFrom : msgOn }}
<span
class="date"
v-title="fmtFull(item?.start_date)"
>
{{ dateStart(item) }}
</span>
</div>
<div
class="date-item"
v-if="isInterval(item)"
>
{{ msgTo }}
&nbsp;
<span
class="date"
v-title="fmtFull(item?.end_date)"
>
{{ dateEnd(item) }}
</span>
</div>
</div>
</div>
</div>
<div v-if="items?.length > 1">
<button
class="show-toggle icon icon-only-icon"
:title="msgMore"
@click.stop.prevent="showAll = !showAll"
v-if="showAll"
>
<app-icon icon="carbon:subtract" />
<span class="is-sr-only">{{ msgMore }}</span>
</button>
<button
class="show-toggle icon icon-only-icon"
:title="msgMore"
@click.stop.prevent="showAll = !showAll"
v-else
>
<app-icon icon="carbon:add" />
<span class="is-sr-only">{{ msgMore }}</span>
</button>
</div>
</div>
</template>
<script>
import { t } from 'ttag';

export default {
name: 'DateRangesList',
props: {
items: {
type: Array,
default: () => [],
},
},
data() {
return {
locale: BEDITA?.locale?.slice(0, 2) || 'en',
msgFrom: t`from`,
msgMore: t`More`,
msgOn: t`on`,
msgTo: t`to`,
showAll: false,
};
},
methods: {
dateEnd(dateRange) {
return !dateRange?.end_date ? '' : `${this.fmtDate(dateRange?.end_date)} ${this.fmtTime(dateRange?.end_date)}`;
},
dateStart(dateRange) {
if (!dateRange?.start_date) {
return '';
}
if (dateRange?.params?.all_day || false) {
return this.fmtDate(dateRange?.start_date);
}
return `${this.fmtDate(dateRange?.start_date)} ${this.fmtTime(dateRange?.start_date)}`;
},
fmtDate(d) {
return d ? new Date(d).toLocaleDateString(this.locale, {dateStyle: 'medium'}) : '';
},
fmtFull(d) {
const dd = d ? new Date(d).toLocaleDateString(this.locale, {dateStyle: 'full'}) : '';
const tt = d ? new Date(d).toLocaleTimeString(this.locale, {timeStyle: 'full'}) : '';

return `${dd} ${tt}`;
},
fmtTime(d) {
return d ? new Date(d).toLocaleTimeString(this.locale, {timeStyle: 'short'}) : '';
},
isInterval(dateRange) {
return dateRange?.end_date && !(dateRange?.params?.all_day || false);
},
},
}
</script>
18 changes: 1 addition & 17 deletions templates/Element/Modules/index_properties_date_ranges.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,2 @@
<date-ranges-list inline-template>
<div class="index-date-ranges" :class="showAll? 'show-all' : ''">
<div>
{{ Calendar.list(dateRanges)|raw }}
</div>

{% if dateRanges|length > 1 %}
<button class="show-toggle icon icon-only-icon" title="{{ __('More') }}" v-on:click.stop.prevent="showAll = !showAll" v-if="showAll">
<app-icon icon="carbon:subtract"></app-icon>
<span class="is-sr-only">{{ __('More') }}</span>
</button>
<button class="show-toggle icon icon-only-icon" title="{{ __('More') }}" v-on:click.stop.prevent="showAll = !showAll" v-else>
<app-icon icon="carbon:add"></app-icon>
<span class="is-sr-only">{{ __('More') }}</span>
</button>
{% endif %}
</div>
<date-ranges-list :items="{{ dateRanges|json_encode }}">
</date-ranges-list>
Loading