Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Pop Erweiterung auf Adressen

See merge request fronk/thetool!2099
This commit is contained in:
Daniel Spitzer
2026-02-20 10:37:02 +00:00
parent 88f6373274 d8046f3b89
commit 9dc01d434e
7 changed files with 208 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
public/js/pages/Pop/PopMap.js
View File

@@ -28,7 +28,12 @@ Vue.component('pop-map-modal', {
<div class="d-flex w-100 justify-content-between">
<h6 class="mb-1" :class="{ 'text-white': index === selectedIndex }">{{ pop.name }}</h6>
</div>
<small :class="index === selectedIndex ? 'text-white' : 'text-muted'">{{ categories[pop.category || 99] }} | {{ pop.location }}</small>
<small :class="index === selectedIndex ? 'text-white' : 'text-muted'">
<template v-if="pop.street || pop.city">
{{ pop.street }} {{ pop.number }}, {{ pop.zip }} {{ pop.city }} |
</template>
{{ categories[pop.category || 99] }}
</small>
</a>
</div>
</div>
@@ -257,11 +262,15 @@ Vue.component('pop-map-modal', {
let categoryName = this.categories[category] || 'Unbekannt';
let stateText = this.states[pop.state] || pop.state || '-';
let addressHtml = (pop.street || pop.city)
? `<div><strong>Adresse:</strong> ${pop.street || ''} ${pop.number || ''}, ${pop.zip || ''} ${pop.city || ''}</div>`
: '';
const popupContent = `
<div style="min-width: 200px;">
<h6 class="p-0"><i class="fas fa-building"></i> <strong>${pop.name}</strong></h6>
<hr class="my-2">
${addressHtml}
<div><strong>Kategorie:</strong> ${categoryName}</div>
<div><strong>Status:</strong> ${stateText}</div>
<div><strong>Info:</strong> ${pop.location || '-'}</div>
@@ -300,7 +309,10 @@ Vue.component('pop-map-modal', {
this.filteredPops = this.allPops.filter(pop =>
pop.name.toLowerCase().includes(query) ||
(pop.location && pop.location.toLowerCase().includes(query))
(pop.location && pop.location.toLowerCase().includes(query)) ||
(pop.street && pop.street.toLowerCase().includes(query)) ||
(pop.city && pop.city.toLowerCase().includes(query)) ||
(pop.zip && pop.zip.toLowerCase().includes(query))
).slice(0, 10);
this.showSuggestions = true;
@@ -345,10 +357,20 @@ Vue.component('pop-map-modal', {
this.showSuggestions = false;
this.selectedIndex = -1;
let found = this.markers.find(m => m.popData.name.toLowerCase().includes(query));
let found = this.markers.find(m =>
m.popData.name.toLowerCase().includes(query) ||
(m.popData.street && m.popData.street.toLowerCase().includes(query)) ||
(m.popData.city && m.popData.city.toLowerCase().includes(query)) ||
(m.popData.zip && m.popData.zip.toLowerCase().includes(query))
);
if (!found) {
const hiddenPop = this.allPops.find(p => p.name.toLowerCase().includes(query));
const hiddenPop = this.allPops.find(p =>
p.name.toLowerCase().includes(query) ||
(p.street && p.street.toLowerCase().includes(query)) ||
(p.city && p.city.toLowerCase().includes(query)) ||
(p.zip && p.zip.toLowerCase().includes(query))
);
if (hiddenPop) {
const category = hiddenPop.category || 99;
if (!this.visibleCategories[category]) {

16
public/js/pages/Pop/PopView.js
View File

@@ -7,7 +7,7 @@ Vue.component('Pop', {
<tt-table :data="window['TT_CONFIG']['POPS']" :config="PopTableConfig" excel-export>
<template v-slot:top-buttons>
<button type="button" class="btn btn-primary" @click="window.location = window['TT_CONFIG']['BASE_URL'] + '/Pop/add'">
<button type="button" class="btn btn-primary" @click="window.location = window['TT_CONFIG']['BASE_URL'] + '/Pop/add?returnto=Pop'">
<i class="fas fa-plus"></i>
Pop hinzufügen
</button>
@@ -20,6 +20,17 @@ Vue.component('Pop', {
<a target="_blank" :href="window['TT_CONFIG']['BASE_URL'] +'/Pop/Detail?id=' + row.id">{{row.name}}</a>
</template>
<template v-slot:address="{ row }">
<a
v-if="row.street || row.city"
:title="'Google Maps: ' + row.street + ' ' + row.number + ', ' + row.zip + ' ' + row.city"
class="mapsLink"
:href="'http://maps.google.com/?q=' + row.street + ' ' + row.number + ', ' + row.zip + ' ' + row.city"
target="_blank">
{{row.street}} {{row.number}}, {{row.zip}} {{row.city}}
</a>
</template>
<template v-slot:category="{ row }">
{{ {1: 'Outdoor', 2: 'Indoor', 3: 'Sender/Funk', 4: 'Container', 99: 'Unbekannt'}[row.category] || 'Unbekannt' }}
</template>
@@ -78,7 +89,8 @@ Vue.component('Pop', {
},
{text: 'Zutritt', key: 'location', class: 'text-center', priority: 1},
{text: 'Standort', key: 'gps', class: 'text-center', priority: 2},
{text: 'Status', key: 'state', class: 'text-center', priority: 3, filter: 'select', filterOptions: [
{text: 'Adresse', key: 'address', class: 'text-center', priority: 3},
{text: 'Status', key: 'state', class: 'text-center', priority: 4, filter: 'select', filterOptions: [
{value: '1', text: 'Planung'},
{value: '2', text: 'Bauphase'},
{value: '3', text: 'Grobdoku'},