mirror of
https://github.com/Theodor-Springmann-Stiftung/musenalm.git
synced 2026-02-04 02:25:30 +00:00
FIX: back-links in bearbeiten-Formularen
This commit is contained in:
@@ -7,10 +7,13 @@
|
||||
loading: false,
|
||||
alphabetOpen: false,
|
||||
selectedLetter: '{{ $model.letter }}',
|
||||
status: '{{ $model.status }}',
|
||||
person: '{{ $model.person }}',
|
||||
user: '{{ $model.user }}',
|
||||
year: '{{ $model.year }}',
|
||||
place: '{{ $model.place }}',
|
||||
sortField: '{{ if $model.sort_field }}{{ $model.sort_field }}{{ else }}title{{ end }}',
|
||||
sortOrder: '{{ if $model.sort_order }}{{ $model.sort_order }}{{ else }}asc{{ end }}',
|
||||
activeFilterType: '{{ $model.active_filter_type }}',
|
||||
activeFilterValue: '{{ $model.active_filter_value }}',
|
||||
statusLabels: {
|
||||
{{- range $k, $v := $model.filter_status_labels -}}
|
||||
{{ printf "%q" $k }}: {{ printf "%q" $v }},
|
||||
@@ -36,14 +39,77 @@
|
||||
{{ printf "%q" $k }}: {{ printf "%q" $v }},
|
||||
{{- end -}}
|
||||
},
|
||||
appendActiveFilter(params) {
|
||||
if (this.activeFilterType && this.activeFilterValue) {
|
||||
params.set(this.activeFilterType, this.activeFilterValue);
|
||||
}
|
||||
appendFilters(params) {
|
||||
if (this.status) params.set('status', this.status);
|
||||
if (this.person) params.set('person', this.person);
|
||||
if (this.user) params.set('user', this.user);
|
||||
if (this.year) params.set('year', this.year);
|
||||
if (this.place) params.set('place', this.place);
|
||||
},
|
||||
buildResultsUrl(overrides = {}) {
|
||||
const params = new URLSearchParams();
|
||||
const next = {
|
||||
search: this.search,
|
||||
letter: this.selectedLetter,
|
||||
status: this.status,
|
||||
person: this.person,
|
||||
user: this.user,
|
||||
year: this.year,
|
||||
place: this.place,
|
||||
sort: this.sortField,
|
||||
order: this.sortOrder,
|
||||
offset: 0,
|
||||
...overrides,
|
||||
};
|
||||
Object.entries(next).forEach(([key, value]) => {
|
||||
if (value !== '' && value !== null && value !== undefined) {
|
||||
params.set(key, value);
|
||||
}
|
||||
});
|
||||
return `/baende/results/?${params.toString()}`;
|
||||
},
|
||||
buildPageUrl(overrides = {}) {
|
||||
const params = new URLSearchParams();
|
||||
const next = {
|
||||
search: this.search,
|
||||
letter: this.selectedLetter,
|
||||
status: this.status,
|
||||
person: this.person,
|
||||
user: this.user,
|
||||
year: this.year,
|
||||
place: this.place,
|
||||
sort: this.sortField,
|
||||
order: this.sortOrder,
|
||||
offset: this.offset,
|
||||
...overrides,
|
||||
};
|
||||
Object.entries(next).forEach(([key, value]) => {
|
||||
if (value !== '' && value !== null && value !== undefined) {
|
||||
params.set(key, value);
|
||||
}
|
||||
});
|
||||
const query = params.toString();
|
||||
return query ? `/baende/?${query}` : '/baende/';
|
||||
},
|
||||
applyFilter(overrides = {}, indicator = 'body') {
|
||||
Object.entries(overrides).forEach(([key, value]) => {
|
||||
this[key] = value;
|
||||
});
|
||||
this.offset = 0;
|
||||
this.hasMore = true;
|
||||
const url = this.buildResultsUrl();
|
||||
htmx.ajax('GET', url, {
|
||||
target: '#baenderesults',
|
||||
swap: 'outerHTML',
|
||||
indicator,
|
||||
});
|
||||
},
|
||||
clearFilters() {
|
||||
this.activeFilterType = '';
|
||||
this.activeFilterValue = '';
|
||||
this.status = '';
|
||||
this.person = '';
|
||||
this.user = '';
|
||||
this.year = '';
|
||||
this.place = '';
|
||||
},
|
||||
closeOtherDropdowns(current) {
|
||||
document.querySelectorAll('details').forEach((d) => {
|
||||
@@ -64,14 +130,12 @@
|
||||
params.set('sort', this.sortField);
|
||||
params.set('order', this.sortOrder);
|
||||
params.set('offset', 0);
|
||||
this.appendActiveFilter(params);
|
||||
if (!this.activeFilterType) {
|
||||
if (this.search) {
|
||||
params.set('search', this.search);
|
||||
}
|
||||
if (this.selectedLetter) {
|
||||
params.set('letter', this.selectedLetter);
|
||||
}
|
||||
this.appendFilters(params);
|
||||
if (this.search) {
|
||||
params.set('search', this.search);
|
||||
}
|
||||
if (this.selectedLetter) {
|
||||
params.set('letter', this.selectedLetter);
|
||||
}
|
||||
|
||||
const queryString = params.toString();
|
||||
@@ -86,14 +150,12 @@
|
||||
params.set('offset', this.offset);
|
||||
params.set('sort', this.sortField);
|
||||
params.set('order', this.sortOrder);
|
||||
this.appendActiveFilter(params);
|
||||
if (!this.activeFilterType) {
|
||||
if (this.search) {
|
||||
params.set('search', this.search);
|
||||
}
|
||||
if (this.selectedLetter) {
|
||||
params.set('letter', this.selectedLetter);
|
||||
}
|
||||
this.appendFilters(params);
|
||||
if (this.search) {
|
||||
params.set('search', this.search);
|
||||
}
|
||||
if (this.selectedLetter) {
|
||||
params.set('letter', this.selectedLetter);
|
||||
}
|
||||
const query = params.toString();
|
||||
const newUrl = query ? `/baende/?${query}` : '/baende/';
|
||||
@@ -104,14 +166,12 @@
|
||||
params.set('offset', this.offset);
|
||||
params.set('sort', this.sortField);
|
||||
params.set('order', this.sortOrder);
|
||||
this.appendActiveFilter(params);
|
||||
if (!this.activeFilterType) {
|
||||
if (this.search) {
|
||||
params.set('search', this.search);
|
||||
}
|
||||
if (this.selectedLetter) {
|
||||
params.set('letter', this.selectedLetter);
|
||||
}
|
||||
this.appendFilters(params);
|
||||
if (this.search) {
|
||||
params.set('search', this.search);
|
||||
}
|
||||
if (this.selectedLetter) {
|
||||
params.set('letter', this.selectedLetter);
|
||||
}
|
||||
return `/baende/more/?${params.toString()}`;
|
||||
}
|
||||
@@ -122,25 +182,13 @@
|
||||
const params = new URL(responseUrl).searchParams;
|
||||
sortField = params.get('sort') || sortField;
|
||||
sortOrder = params.get('order') || sortOrder;
|
||||
const filterKeys = ['status', 'person', 'user', 'year', 'place'];
|
||||
activeFilterType = '';
|
||||
activeFilterValue = '';
|
||||
filterKeys.some((key) => {
|
||||
const val = params.get(key);
|
||||
if (val) {
|
||||
activeFilterType = key;
|
||||
activeFilterValue = val;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
if (activeFilterType) {
|
||||
search = '';
|
||||
selectedLetter = '';
|
||||
} else {
|
||||
search = params.get('search') || '';
|
||||
selectedLetter = params.get('letter') || '';
|
||||
}
|
||||
status = params.get('status') || '';
|
||||
person = params.get('person') || '';
|
||||
user = params.get('user') || '';
|
||||
year = params.get('year') || '';
|
||||
place = params.get('place') || '';
|
||||
search = params.get('search') || '';
|
||||
selectedLetter = params.get('letter') || '';
|
||||
updateUrl();
|
||||
}
|
||||
"
|
||||
@@ -165,13 +213,9 @@ class="container-normal font-sans mt-10">
|
||||
</summary>
|
||||
<div class="absolute left-0 mt-2 z-10 bg-white rounded-md shadow-lg border border-gray-200">
|
||||
<div class="p-2 w-[26rem]">
|
||||
<a href="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a :href="buildPageUrl({ letter: '', offset: 0 })"
|
||||
hx-indicator="#baende-alphabet-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; alphabetOpen = false; selectedLetter = ''; search = ''; clearFilters()"
|
||||
@click.prevent="alphabetOpen = false; applyFilter({ selectedLetter: '' }, '#baende-alphabet-spinner')"
|
||||
x-show="selectedLetter"
|
||||
class="mb-2 inline-flex w-full items-center justify-center gap-2 rounded bg-orange-100 px-2 py-1 text-sm font-semibold text-orange-800 hover:bg-orange-200 no-underline transition-colors">
|
||||
<i class="ri-filter-off-line text-base"></i>
|
||||
@@ -179,13 +223,9 @@ class="container-normal font-sans mt-10">
|
||||
</a>
|
||||
<div class="grid grid-cols-13 gap-1 text-sm text-gray-700">
|
||||
{{- range $_, $ch := $model.letters -}}
|
||||
<a href="/baende/?letter={{ $ch }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?letter={{ $ch }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a :href="buildPageUrl({ letter: '{{ $ch }}', offset: 0 })"
|
||||
hx-indicator="#baende-alphabet-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?letter={{ $ch }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; alphabetOpen = false; selectedLetter = '{{ $ch }}'; search = ''; clearFilters()"
|
||||
@click.prevent="alphabetOpen = false; applyFilter({ selectedLetter: '{{ $ch }}' }, '#baende-alphabet-spinner')"
|
||||
:class="selectedLetter === '{{ $ch }}' ? 'bg-stone-200 font-bold' : ''"
|
||||
class="text-center py-1 px-2 rounded hover:bg-gray-100 no-underline transition-colors">
|
||||
{{ $ch }}
|
||||
@@ -201,8 +241,8 @@ class="container-normal font-sans mt-10">
|
||||
<div class="relative" x-data="{ open: false }" data-role="baende-filter">
|
||||
<details class="font-sans text-base list-none" @toggle="open = $el.open; if ($el.open) { closeOtherDropdowns($el); }">
|
||||
<summary class="cursor-pointer select-none text-gray-700 hover:text-slate-900 bg-gray-100 px-3 py-1.5 rounded-md flex items-center gap-2"
|
||||
:class="activeFilterType === 'status' ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="activeFilterType === 'status' ? `Status: ${statusLabels[activeFilterValue] || activeFilterValue}` : 'Status'"></span>
|
||||
:class="status ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="status ? `Status: ${statusLabels[status] || status}` : 'Status'"></span>
|
||||
<i class="ri-arrow-down-s-line transform origin-center transition-transform" :class="{ 'rotate-180': open }"></i>
|
||||
<span id="baende-status-spinner" class="htmx-indicator text-slate-900">
|
||||
<i class="ri-loader-4-line spinning" aria-hidden="true"></i>
|
||||
@@ -211,27 +251,19 @@ class="container-normal font-sans mt-10">
|
||||
<div class="absolute left-0 mt-2 w-72 z-10 bg-white rounded-md shadow-lg border border-gray-200">
|
||||
<div class="p-3">
|
||||
<div class="max-h-64 overflow-auto flex flex-col gap-1 text-sm text-gray-700 border border-stone-100 rounded-sm" data-role="filter-list">
|
||||
<a data-role="filter-item" data-label="Alle" href="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="Alle" :href="buildPageUrl({ status: '', offset: 0 })"
|
||||
hx-indicator="#baende-status-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; clearFilters(); search = ''; selectedLetter = ''"
|
||||
x-show="activeFilterType === 'status'"
|
||||
@click.prevent="open = false; applyFilter({ status: '' }, '#baende-status-spinner')"
|
||||
x-show="status"
|
||||
class="mb-2 inline-flex w-full items-center justify-center gap-2 rounded bg-orange-100 px-2 py-1 text-sm font-semibold text-orange-800 hover:bg-orange-200 no-underline transition-colors">
|
||||
<i class="ri-filter-off-line text-base"></i>
|
||||
<span>Alle</span>
|
||||
</a>
|
||||
{{- range $_, $s := $model.filter_statuses -}}
|
||||
<a data-role="filter-item" data-label="{{ $s.label }}" href="/baende/?status={{ $s.value }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?status={{ $s.value }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="{{ $s.label }}" :href="buildPageUrl({ status: '{{ $s.value }}', offset: 0 })"
|
||||
hx-indicator="#baende-status-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?status={{ $s.value }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; activeFilterType = 'status'; activeFilterValue = '{{ $s.value }}'; search = ''; selectedLetter = ''"
|
||||
:class="activeFilterType === 'status' && activeFilterValue === '{{ $s.value }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
@click.prevent="open = false; applyFilter({ status: '{{ $s.value }}' }, '#baende-status-spinner')"
|
||||
:class="status === '{{ $s.value }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
class="filter-list-row px-2 py-1 rounded-sm hover:bg-stone-100 no-underline transition-colors">
|
||||
{{ $s.label }}
|
||||
</a>
|
||||
@@ -246,20 +278,16 @@ class="container-normal font-sans mt-10">
|
||||
<div class="relative" x-data="{ open: false }" data-role="baende-filter">
|
||||
<details class="font-sans text-base list-none" @toggle="open = $el.open; if ($el.open) { closeOtherDropdowns($el); }">
|
||||
<summary class="cursor-pointer select-none text-gray-700 hover:text-slate-900 bg-gray-100 px-3 py-1.5 rounded-md flex items-center gap-2"
|
||||
:class="activeFilterType === 'person' ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="activeFilterType === 'person' ? `Person: ${personLabels[activeFilterValue] || activeFilterValue}` : 'Person'"></span>
|
||||
:class="person ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="person ? `Person: ${personLabels[person] || person}` : 'Person'"></span>
|
||||
<i class="ri-arrow-down-s-line transform origin-center transition-transform" :class="{ 'rotate-180': open }"></i>
|
||||
</summary>
|
||||
<div class="absolute left-0 mt-2 w-80 z-10 bg-white rounded-md shadow-lg border border-gray-200">
|
||||
<div class="p-3">
|
||||
<a data-role="filter-item" data-label="Alle" href="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="Alle" :href="buildPageUrl({ person: '', offset: 0 })"
|
||||
hx-indicator="#baende-person-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; clearFilters(); search = ''; selectedLetter = ''"
|
||||
x-show="activeFilterType === 'person'"
|
||||
@click.prevent="open = false; applyFilter({ person: '' }, '#baende-person-spinner')"
|
||||
x-show="person"
|
||||
class="mb-2 inline-flex w-full items-center justify-center gap-2 rounded bg-orange-100 px-2 py-1 text-sm font-semibold text-orange-800 hover:bg-orange-200 no-underline transition-colors">
|
||||
<i class="ri-filter-off-line text-base"></i>
|
||||
<span>Alle</span>
|
||||
@@ -272,14 +300,10 @@ class="container-normal font-sans mt-10">
|
||||
</div>
|
||||
<div class="mt-2 max-h-80 overflow-auto flex flex-col gap-0.5 text-sm text-gray-700 border border-stone-100 rounded-sm" data-role="filter-list">
|
||||
{{- range $_, $a := $model.filter_agents -}}
|
||||
<a data-role="filter-item" data-label="{{ $a.Name }}" href="/baende/?person={{ $a.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?person={{ $a.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="{{ $a.Name }}" :href="buildPageUrl({ person: '{{ $a.Id }}', offset: 0 })"
|
||||
hx-indicator="#baende-person-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?person={{ $a.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; activeFilterType = 'person'; activeFilterValue = '{{ $a.Id }}'; search = ''; selectedLetter = ''"
|
||||
:class="activeFilterType === 'person' && activeFilterValue === '{{ $a.Id }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
@click.prevent="open = false; applyFilter({ person: '{{ $a.Id }}' }, '#baende-person-spinner')"
|
||||
:class="person === '{{ $a.Id }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
class="filter-list-row px-2 py-1 rounded-sm hover:bg-stone-100 no-underline transition-colors">
|
||||
<span class="filter-list-searchable mr-1">{{ $a.Name }}</span>
|
||||
{{- if $a.CorporateBody -}}
|
||||
@@ -299,20 +323,16 @@ class="container-normal font-sans mt-10">
|
||||
<div class="relative" x-data="{ open: false }" data-role="baende-filter">
|
||||
<details class="font-sans text-base list-none" @toggle="open = $el.open; if ($el.open) { closeOtherDropdowns($el); }">
|
||||
<summary class="cursor-pointer select-none text-gray-700 hover:text-slate-900 bg-gray-100 px-3 py-1.5 rounded-md flex items-center gap-2"
|
||||
:class="activeFilterType === 'user' ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="activeFilterType === 'user' ? `Benutzer: ${userLabels[activeFilterValue] || activeFilterValue}` : 'Benutzer'"></span>
|
||||
:class="user ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="user ? `Benutzer: ${userLabels[user] || user}` : 'Benutzer'"></span>
|
||||
<i class="ri-arrow-down-s-line transform origin-center transition-transform" :class="{ 'rotate-180': open }"></i>
|
||||
</summary>
|
||||
<div class="absolute left-0 mt-2 w-80 z-10 bg-white rounded-md shadow-lg border border-gray-200">
|
||||
<div class="p-3">
|
||||
<a data-role="filter-item" data-label="Alle" href="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="Alle" :href="buildPageUrl({ user: '', offset: 0 })"
|
||||
hx-indicator="#baende-user-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; clearFilters(); search = ''; selectedLetter = ''"
|
||||
x-show="activeFilterType === 'user'"
|
||||
@click.prevent="open = false; applyFilter({ user: '' }, '#baende-user-spinner')"
|
||||
x-show="user"
|
||||
class="mb-2 inline-flex w-full items-center justify-center gap-2 rounded bg-orange-100 px-2 py-1 text-sm font-semibold text-orange-800 hover:bg-orange-200 no-underline transition-colors">
|
||||
<i class="ri-filter-off-line text-base"></i>
|
||||
<span>Alle</span>
|
||||
@@ -325,14 +345,10 @@ class="container-normal font-sans mt-10">
|
||||
</div>
|
||||
<div class="mt-2 max-h-80 overflow-auto flex flex-col gap-0.5 text-sm text-gray-700 border border-stone-100 rounded-sm" data-role="filter-list">
|
||||
{{- range $_, $u := $model.filter_users -}}
|
||||
<a data-role="filter-item" data-label="{{ $u.Name }}" href="/baende/?user={{ $u.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?user={{ $u.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="{{ $u.Name }}" :href="buildPageUrl({ user: '{{ $u.Id }}', offset: 0 })"
|
||||
hx-indicator="#baende-user-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?user={{ $u.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; activeFilterType = 'user'; activeFilterValue = '{{ $u.Id }}'; search = ''; selectedLetter = ''"
|
||||
:class="activeFilterType === 'user' && activeFilterValue === '{{ $u.Id }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
@click.prevent="open = false; applyFilter({ user: '{{ $u.Id }}' }, '#baende-user-spinner')"
|
||||
:class="user === '{{ $u.Id }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
class="filter-list-row px-2 py-1 rounded-sm hover:bg-stone-100 no-underline transition-colors">
|
||||
<span class="filter-list-searchable mr-1">{{ $u.Name }}</span>
|
||||
</a>
|
||||
@@ -347,20 +363,16 @@ class="container-normal font-sans mt-10">
|
||||
<div class="relative" x-data="{ open: false }" data-role="baende-filter">
|
||||
<details class="font-sans text-base list-none" @toggle="open = $el.open; if ($el.open) { closeOtherDropdowns($el); }">
|
||||
<summary class="cursor-pointer select-none text-gray-700 hover:text-slate-900 bg-gray-100 px-3 py-1.5 rounded-md flex items-center gap-2"
|
||||
:class="activeFilterType === 'year' ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="activeFilterType === 'year' ? `Jahr: ${yearLabels[activeFilterValue] || activeFilterValue}` : 'Jahr'"></span>
|
||||
:class="year ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="year ? `Jahr: ${yearLabels[year] || year}` : 'Jahr'"></span>
|
||||
<i class="ri-arrow-down-s-line transform origin-center transition-transform" :class="{ 'rotate-180': open }"></i>
|
||||
</summary>
|
||||
<div class="absolute left-0 mt-2 w-72 z-10 bg-white rounded-md shadow-lg border border-gray-200">
|
||||
<div class="p-3">
|
||||
<a data-role="filter-item" data-label="Alle" href="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="Alle" :href="buildPageUrl({ year: '', offset: 0 })"
|
||||
hx-indicator="#baende-year-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; clearFilters(); search = ''; selectedLetter = ''"
|
||||
x-show="activeFilterType === 'year'"
|
||||
@click.prevent="open = false; applyFilter({ year: '' }, '#baende-year-spinner')"
|
||||
x-show="year"
|
||||
class="mb-2 inline-flex w-full items-center justify-center gap-2 rounded bg-orange-100 px-2 py-1 text-sm font-semibold text-orange-800 hover:bg-orange-200 no-underline transition-colors">
|
||||
<i class="ri-filter-off-line text-base"></i>
|
||||
<span>Alle</span>
|
||||
@@ -375,14 +387,10 @@ class="container-normal font-sans mt-10">
|
||||
{{- range $_, $y := $model.filter_years -}}
|
||||
{{- $label := $y -}}
|
||||
{{- if eq $y 0 -}}{{- $label = "ohne Jahr" -}}{{- end -}}
|
||||
<a data-role="filter-item" data-label="{{ $label }}" href="/baende/?year={{ $y }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?year={{ $y }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="{{ $label }}" :href="buildPageUrl({ year: '{{ $y }}', offset: 0 })"
|
||||
hx-indicator="#baende-year-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?year={{ $y }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; activeFilterType = 'year'; activeFilterValue = '{{ $y }}'; search = ''; selectedLetter = ''"
|
||||
:class="activeFilterType === 'year' && activeFilterValue === '{{ $y }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
@click.prevent="open = false; applyFilter({ year: '{{ $y }}' }, '#baende-year-spinner')"
|
||||
:class="year === '{{ $y }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
class="filter-list-row px-2 py-1 rounded-sm hover:bg-stone-100 no-underline transition-colors">
|
||||
{{ $label }}
|
||||
</a>
|
||||
@@ -397,20 +405,16 @@ class="container-normal font-sans mt-10">
|
||||
<div class="relative" x-data="{ open: false }" data-role="baende-filter">
|
||||
<details class="font-sans text-base list-none" @toggle="open = $el.open; if ($el.open) { closeOtherDropdowns($el); }">
|
||||
<summary class="cursor-pointer select-none text-gray-700 hover:text-slate-900 bg-gray-100 px-3 py-1.5 rounded-md flex items-center gap-2"
|
||||
:class="activeFilterType === 'place' ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="activeFilterType === 'place' ? `Ort: ${placeLabels[activeFilterValue] || activeFilterValue}` : 'Ort'"></span>
|
||||
:class="place ? 'font-semibold text-slate-900 ring-1 ring-slate-300' : ''">
|
||||
<span x-text="place ? `Ort: ${placeLabels[place] || place}` : 'Ort'"></span>
|
||||
<i class="ri-arrow-down-s-line transform origin-center transition-transform" :class="{ 'rotate-180': open }"></i>
|
||||
</summary>
|
||||
<div class="absolute left-0 mt-2 w-80 z-10 bg-white rounded-md shadow-lg border border-gray-200">
|
||||
<div class="p-3">
|
||||
<a data-role="filter-item" data-label="Alle" href="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="Alle" :href="buildPageUrl({ place: '', offset: 0 })"
|
||||
hx-indicator="#baende-place-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; clearFilters(); search = ''; selectedLetter = ''"
|
||||
x-show="activeFilterType === 'place'"
|
||||
@click.prevent="open = false; applyFilter({ place: '' }, '#baende-place-spinner')"
|
||||
x-show="place"
|
||||
class="mb-2 inline-flex w-full items-center justify-center gap-2 rounded bg-orange-100 px-2 py-1 text-sm font-semibold text-orange-800 hover:bg-orange-200 no-underline transition-colors">
|
||||
<i class="ri-filter-off-line text-base"></i>
|
||||
<span>Alle</span>
|
||||
@@ -423,14 +427,10 @@ class="container-normal font-sans mt-10">
|
||||
</div>
|
||||
<div class="mt-2 max-h-80 overflow-auto flex flex-col gap-0.5 text-sm text-gray-700 border border-stone-100 rounded-sm" data-role="filter-list">
|
||||
{{- range $_, $p := $model.filter_places -}}
|
||||
<a data-role="filter-item" data-label="{{ $p.Name }}" href="/baende/?place={{ $p.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
hx-get="/baende/results/?place={{ $p.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
<a data-role="filter-item" data-label="{{ $p.Name }}" :href="buildPageUrl({ place: '{{ $p.Id }}', offset: 0 })"
|
||||
hx-indicator="#baende-place-spinner"
|
||||
hx-target="#baenderesults"
|
||||
hx-swap="outerHTML"
|
||||
hx-push-url="/baende/?place={{ $p.Id }}&sort={{ $model.sort_field }}&order={{ $model.sort_order }}"
|
||||
@click="offset = 0; hasMore = true; open = false; activeFilterType = 'place'; activeFilterValue = '{{ $p.Id }}'; search = ''; selectedLetter = ''"
|
||||
:class="activeFilterType === 'place' && activeFilterValue === '{{ $p.Id }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
@click.prevent="open = false; applyFilter({ place: '{{ $p.Id }}' }, '#baende-place-spinner')"
|
||||
:class="place === '{{ $p.Id }}' ? 'bg-stone-100 font-semibold' : ''"
|
||||
class="filter-list-row px-2 py-1 rounded-sm hover:bg-stone-100 no-underline transition-colors">
|
||||
{{ $p.Name }}
|
||||
</a>
|
||||
@@ -464,6 +464,12 @@ class="container-normal font-sans mt-10">
|
||||
aria-label="Bändesuche">
|
||||
<input type="hidden" name="sort" :value="sortField" />
|
||||
<input type="hidden" name="order" :value="sortOrder" />
|
||||
<input type="hidden" name="status" :value="status" />
|
||||
<input type="hidden" name="person" :value="person" />
|
||||
<input type="hidden" name="user" :value="user" />
|
||||
<input type="hidden" name="year" :value="year" />
|
||||
<input type="hidden" name="place" :value="place" />
|
||||
<input type="hidden" name="letter" :value="selectedLetter" />
|
||||
<div class="relative">
|
||||
<input
|
||||
class="px-2 py-0.5 pr-7 font-sans placeholder:italic w-full text-lg"
|
||||
@@ -472,8 +478,8 @@ class="container-normal font-sans mt-10">
|
||||
value="{{ $model.search }}"
|
||||
placeholder="Signatur oder Suchbegriff"
|
||||
x-model="search"
|
||||
@input.debounce.500="selectedLetter = ''; clearFilters(); ((search.trim().length >= 3) || /^[0-9]+$/.test(search.trim()) || search === '') && $el.form.requestSubmit()"
|
||||
@search.debounce.500="selectedLetter = ''; clearFilters(); ((search.trim().length >= 3) || /^[0-9]+$/.test(search.trim()) || search === '') && $el.form.requestSubmit()"
|
||||
@input.debounce.500="((search.trim().length >= 3) || /^[0-9]+$/.test(search.trim()) || search === '') && $el.form.requestSubmit()"
|
||||
@search.debounce.500="((search.trim().length >= 3) || /^[0-9]+$/.test(search.trim()) || search === '') && $el.form.requestSubmit()"
|
||||
autocomplete="off" />
|
||||
<span id="baende-search-spinner" class="htmx-indicator absolute right-1 top-1/2 -translate-y-1/2 text-slate-900">
|
||||
<i class="ri-loader-4-line spinning" aria-hidden="true"></i>
|
||||
|
||||
Reference in New Issue
Block a user