ToDo-Listen UI
This commit is contained in:
1 parent
3eb3b746ab
commit
6e24c79008
7 files changed
+290
-125
No files matched your search
@@ -14,11 +14,7 @@ def strassen(**kwargs):
|
|||||||
"""Straßenverwaltung"""
|
"""Straßenverwaltung"""
|
||||||
db = get_db()
|
db = get_db()
|
||||||
strassen = db.execute(
|
strassen = db.execute(
|
||||||
'SELECT s.*, g.aliasname as group_name FROM streets s LEFT JOIN groups g ON s.group_id = g.id WHERE s.tenant_id = ? ORDER BY s.name, s.zusatz',
|
'SELECT * FROM streets WHERE tenant_id = ? ORDER BY name, zusatz',
|
||||||
(g.tenant_id,)
|
|
||||||
).fetchall()
|
|
||||||
gruppen = db.execute(
|
|
||||||
'SELECT * FROM groups WHERE tenant_id = ? ORDER BY id',
|
|
||||||
(g.tenant_id,)
|
(g.tenant_id,)
|
||||||
).fetchall()
|
).fetchall()
|
||||||
house_number_count = db.execute(
|
house_number_count = db.execute(
|
||||||
@@ -28,6 +24,5 @@ def strassen(**kwargs):
|
|||||||
return render_template(
|
return render_template(
|
||||||
'admin/strassen.html',
|
'admin/strassen.html',
|
||||||
strassen=strassen,
|
strassen=strassen,
|
||||||
gruppen=gruppen,
|
|
||||||
house_number_count=house_number_count
|
house_number_count=house_number_count
|
||||||
)
|
)
|
||||||
@@ -783,6 +783,33 @@ dialog.group-streets-dialog article > footer {
|
|||||||
padding: 0.5rem var(--block-spacing-horizontal) var(--block-spacing-vertical);
|
padding: 0.5rem var(--block-spacing-horizontal) var(--block-spacing-vertical);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog article > footer.group-streets-footer {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.5rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-bulk-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.4rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-bulk-actions button {
|
||||||
|
width: auto;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0.4rem 0.65rem;
|
||||||
|
font-size: 0.78rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog article > footer.group-streets-footer > button {
|
||||||
|
width: auto;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
dialog.group-streets-dialog article > #groupStreetsContent {
|
dialog.group-streets-dialog article > #groupStreetsContent {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
@@ -831,6 +858,22 @@ dialog.group-streets-dialog.is-dragging article header {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.group-street-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.45rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-street-select {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-street-item .group-street-entry {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.group-street-entry {
|
.group-street-entry {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
* damit er sowohl die mobilen Views als auch die statischen Assets
|
* damit er sowohl die mobilen Views als auch die statischen Assets
|
||||||
* kontrolliert. Der Cache-Name wird pro App-Wurzel gebildet.
|
* kontrolliert. Der Cache-Name wird pro App-Wurzel gebildet.
|
||||||
*/
|
*/
|
||||||
const VERSION = 'cmbnet-pwa-v16';
|
const VERSION = 'cmbnet-pwa-v17';
|
||||||
const BASE = new URL('./', self.location).href;
|
const BASE = new URL('./', self.location).href;
|
||||||
const SHELL_CACHE = `${VERSION}-shell`;
|
const SHELL_CACHE = `${VERSION}-shell`;
|
||||||
const TILE_CACHE = `${VERSION}-tiles`;
|
const TILE_CACHE = `${VERSION}-tiles`;
|
||||||
|
|||||||
@@ -5,18 +5,6 @@ let currentStreetId = null;
|
|||||||
let editMode = false;
|
let editMode = false;
|
||||||
let splitStreetId = null;
|
let splitStreetId = null;
|
||||||
|
|
||||||
function updateStrasse(streetId, data) {
|
|
||||||
fetch(`${apiBase}/strassen/${streetId}`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify(data)
|
|
||||||
}).then(r => r.json()).then(data => {
|
|
||||||
if (data.success) {
|
|
||||||
location.reload();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function deleteStrasse(streetId) {
|
function deleteStrasse(streetId) {
|
||||||
if (!confirm('Straße wirklich löschen?\n\nDabei werden auch die zugehörigen Einträge in der Hausnummern-Tabelle gelöscht, sofern keine weiteren Abschnitte derselben Straße mehr existieren.')) return;
|
if (!confirm('Straße wirklich löschen?\n\nDabei werden auch die zugehörigen Einträge in der Hausnummern-Tabelle gelöscht, sofern keine weiteren Abschnitte derselben Straße mehr existieren.')) return;
|
||||||
fetch(`${apiBase}/strassen/${streetId}`, {
|
fetch(`${apiBase}/strassen/${streetId}`, {
|
||||||
@@ -95,7 +83,7 @@ function selectedStreetNames(selected) {
|
|||||||
const row = checkbox.closest('tr');
|
const row = checkbox.closest('tr');
|
||||||
if (!row || !row.cells[2]) return `#${checkbox.value}`;
|
if (!row || !row.cells[2]) return `#${checkbox.value}`;
|
||||||
const name = row.cells[2].innerText.trim();
|
const name = row.cells[2].innerText.trim();
|
||||||
const zusatz = row.cells[8] ? row.cells[8].innerText.trim() : '';
|
const zusatz = row.cells[6] ? row.cells[6].innerText.trim() : '';
|
||||||
return zusatz ? `${name} ${zusatz}` : name;
|
return zusatz ? `${name} ${zusatz}` : name;
|
||||||
});
|
});
|
||||||
const limit = 10;
|
const limit = 10;
|
||||||
@@ -156,10 +144,6 @@ function openCreateStrasseModal() {
|
|||||||
document.getElementById('strasseHnMin').value = '';
|
document.getElementById('strasseHnMin').value = '';
|
||||||
document.getElementById('strasseHnMax').value = '';
|
document.getElementById('strasseHnMax').value = '';
|
||||||
document.getElementById('strasseBbox').value = '';
|
document.getElementById('strasseBbox').value = '';
|
||||||
document.getElementById('strasseState').value = 'unbearbeitet';
|
|
||||||
document.getElementById('strasseState').disabled = true;
|
|
||||||
document.getElementById('strasseGroup').value = '';
|
|
||||||
document.getElementById('strasseGroup').disabled = true;
|
|
||||||
document.getElementById('strasseModal').showModal();
|
document.getElementById('strasseModal').showModal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -169,14 +153,10 @@ function editStrasse(streetId) {
|
|||||||
document.getElementById('strasseModalTitle').innerText = 'Straße bearbeiten';
|
document.getElementById('strasseModalTitle').innerText = 'Straße bearbeiten';
|
||||||
document.getElementById('strasseId').value = streetId;
|
document.getElementById('strasseId').value = streetId;
|
||||||
document.getElementById('strasseName').value = row.cells[2].innerText.trim();
|
document.getElementById('strasseName').value = row.cells[2].innerText.trim();
|
||||||
document.getElementById('strasseZusatz').value = row.cells[8].innerText.trim();
|
document.getElementById('strasseZusatz').value = row.cells[6].innerText.trim();
|
||||||
document.getElementById('strasseHnMin').value = row.cells[5].innerText === '-' ? '' : row.cells[5].innerText;
|
document.getElementById('strasseHnMin').value = row.cells[3].innerText === '-' ? '' : row.cells[3].innerText;
|
||||||
document.getElementById('strasseHnMax').value = row.cells[6].innerText === '-' ? '' : row.cells[6].innerText;
|
document.getElementById('strasseHnMax').value = row.cells[4].innerText === '-' ? '' : row.cells[4].innerText;
|
||||||
document.getElementById('strasseBbox').value = row.dataset.bbox || '';
|
document.getElementById('strasseBbox').value = row.dataset.bbox || '';
|
||||||
document.getElementById('strasseState').value = row.cells[3].querySelector('select').value;
|
|
||||||
document.getElementById('strasseState').disabled = false;
|
|
||||||
document.getElementById('strasseGroup').value = row.cells[4].querySelector('select').value;
|
|
||||||
document.getElementById('strasseGroup').disabled = false;
|
|
||||||
document.getElementById('strasseModal').showModal();
|
document.getElementById('strasseModal').showModal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -191,9 +171,7 @@ function saveStrasse() {
|
|||||||
zusatz: document.getElementById('strasseZusatz').value,
|
zusatz: document.getElementById('strasseZusatz').value,
|
||||||
hn_min: document.getElementById('strasseHnMin').value || null,
|
hn_min: document.getElementById('strasseHnMin').value || null,
|
||||||
hn_max: document.getElementById('strasseHnMax').value || null,
|
hn_max: document.getElementById('strasseHnMax').value || null,
|
||||||
bbox: document.getElementById('strasseBbox').value || null,
|
bbox: document.getElementById('strasseBbox').value || null
|
||||||
state: document.getElementById('strasseState').value,
|
|
||||||
group_id: document.getElementById('strasseGroup').value || null
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!editMode) {
|
if (!editMode) {
|
||||||
@@ -439,32 +417,13 @@ function normalizeForFilter(text) {
|
|||||||
|
|
||||||
function applyStreetFilters() {
|
function applyStreetFilters() {
|
||||||
const nameInput = document.getElementById('streetNameFilter');
|
const nameInput = document.getElementById('streetNameFilter');
|
||||||
const stateInput = document.getElementById('streetStateFilter');
|
|
||||||
const groupInput = document.getElementById('streetGroupFilter');
|
|
||||||
const nameQuery = normalizeForFilter(nameInput ? nameInput.value : '');
|
const nameQuery = normalizeForFilter(nameInput ? nameInput.value : '');
|
||||||
const stateQuery = stateInput ? stateInput.value : '';
|
|
||||||
const groupQuery = groupInput ? groupInput.value : '';
|
|
||||||
|
|
||||||
document.querySelectorAll('#strassenTable tbody tr').forEach(row => {
|
document.querySelectorAll('#strassenTable tbody tr').forEach(row => {
|
||||||
if (!row.dataset.id) return;
|
if (!row.dataset.id) return;
|
||||||
const nameCell = row.cells[2];
|
const nameCell = row.cells[2];
|
||||||
const nameText = normalizeForFilter(nameCell ? nameCell.innerText : '');
|
const nameText = normalizeForFilter(nameCell ? nameCell.innerText : '');
|
||||||
const stateSelect = row.cells[3] ? row.cells[3].querySelector('select') : null;
|
row.style.display = !nameQuery || nameText.indexOf(nameQuery) !== -1 ? '' : 'none';
|
||||||
const groupSelect = row.cells[4] ? row.cells[4].querySelector('select') : null;
|
|
||||||
const stateVal = stateSelect ? stateSelect.value : '';
|
|
||||||
const groupVal = groupSelect ? groupSelect.value : '';
|
|
||||||
|
|
||||||
let visible = true;
|
|
||||||
if (nameQuery && nameText.indexOf(nameQuery) === -1) {
|
|
||||||
visible = false;
|
|
||||||
}
|
|
||||||
if (visible && stateQuery && stateVal !== stateQuery) {
|
|
||||||
visible = false;
|
|
||||||
}
|
|
||||||
if (visible && groupQuery && groupVal !== groupQuery) {
|
|
||||||
visible = false;
|
|
||||||
}
|
|
||||||
row.style.display = visible ? '' : 'none';
|
|
||||||
});
|
});
|
||||||
updateStreetSelectionState();
|
updateStreetSelectionState();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ const DEFAULT_SETTINGS = {
|
|||||||
const STREET_STATES = ['unbearbeitet', 'zugewiesen', 'erledigt'];
|
const STREET_STATES = ['unbearbeitet', 'zugewiesen', 'erledigt'];
|
||||||
const GROUP_STATES = ['offen', 'unterwegs', 'online', 'pausierend', 'fertig'];
|
const GROUP_STATES = ['offen', 'unterwegs', 'online', 'pausierend', 'fertig'];
|
||||||
const GROUP_MARKER_MAX_AGE_SECONDS = 30 * 60;
|
const GROUP_MARKER_MAX_AGE_SECONDS = 30 * 60;
|
||||||
|
const GROUP_STREET_HOVER_COLOR = '#f5c518';
|
||||||
const STREET_COLORS = {
|
const STREET_COLORS = {
|
||||||
unbearbeitet: '#1f6feb',
|
unbearbeitet: '#1f6feb',
|
||||||
zugewiesen: '#d62828',
|
zugewiesen: '#d62828',
|
||||||
@@ -54,6 +55,8 @@ const dispatcherState = {
|
|||||||
crosshairGroupId: null,
|
crosshairGroupId: null,
|
||||||
currentStreetId: null,
|
currentStreetId: null,
|
||||||
streetsDialogGroupId: null,
|
streetsDialogGroupId: null,
|
||||||
|
streetsDialogSelectedStreetIds: new Set(),
|
||||||
|
streetsDialogHoverId: null,
|
||||||
aliasGroupId: null,
|
aliasGroupId: null,
|
||||||
chatGroupId: null,
|
chatGroupId: null,
|
||||||
chatByGroup: new Map(),
|
chatByGroup: new Map(),
|
||||||
@@ -559,15 +562,41 @@ function polylineStyle(state) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isDispatcherView() {
|
||||||
|
return window.CMBNET_VIEW_MODE !== 'observer';
|
||||||
|
}
|
||||||
|
|
||||||
|
function streetIsInActiveGroupDialog(street) {
|
||||||
|
if (!isDispatcherView()) return true;
|
||||||
|
|
||||||
|
const dialogGroupId = dispatcherState.streetsDialogGroupId;
|
||||||
|
if (dialogGroupId === null || dialogGroupId === undefined) return true;
|
||||||
|
return Boolean(street)
|
||||||
|
&& Number(street.group_id) === Number(dialogGroupId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function polylineOpacityForStreet(street) {
|
||||||
|
return streetIsInActiveGroupDialog(street)
|
||||||
|
? dispatcherState.settings.opacity
|
||||||
|
: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function streetPolylineColor(street) {
|
||||||
|
if (!street) return STREET_COLORS.unbearbeitet;
|
||||||
|
if (dispatcherState.streetsDialogHoverId === Number(street.id)) {
|
||||||
|
return GROUP_STREET_HOVER_COLOR;
|
||||||
|
}
|
||||||
|
return STREET_COLORS[street.state] || STREET_COLORS.unbearbeitet;
|
||||||
|
}
|
||||||
|
|
||||||
function recolorStreet(street) {
|
function recolorStreet(street) {
|
||||||
const lines = dispatcherState.polylinesByStreetId.get(Number(street.id));
|
const lines = dispatcherState.polylinesByStreetId.get(Number(street.id));
|
||||||
if (!lines) return;
|
if (!lines) return;
|
||||||
|
|
||||||
const color = STREET_COLORS[street.state] || STREET_COLORS.unbearbeitet;
|
|
||||||
lines.forEach(line => {
|
lines.forEach(line => {
|
||||||
line.setStyle({
|
line.setStyle({
|
||||||
color,
|
color: streetPolylineColor(street),
|
||||||
opacity: dispatcherState.settings.opacity,
|
opacity: polylineOpacityForStreet(street),
|
||||||
weight: currentPolylineWeight()
|
weight: currentPolylineWeight()
|
||||||
});
|
});
|
||||||
line.setTooltipContent(tooltipElement(`${streetDisplayName(street)} (${street.state})`));
|
line.setTooltipContent(tooltipElement(`${streetDisplayName(street)} (${street.state})`));
|
||||||
@@ -576,12 +605,13 @@ function recolorStreet(street) {
|
|||||||
|
|
||||||
function updateAllPolylineStyles() {
|
function updateAllPolylineStyles() {
|
||||||
const weight = currentPolylineWeight();
|
const weight = currentPolylineWeight();
|
||||||
dispatcherState.polylinesByStreetId.forEach(lines => {
|
dispatcherState.polylinesByStreetId.forEach((lines, streetId) => {
|
||||||
|
const street = dispatcherState.streetById.get(Number(streetId));
|
||||||
|
const opacity = street
|
||||||
|
? polylineOpacityForStreet(street)
|
||||||
|
: dispatcherState.settings.opacity;
|
||||||
lines.forEach(line => {
|
lines.forEach(line => {
|
||||||
line.setStyle({
|
line.setStyle({opacity, weight});
|
||||||
opacity: dispatcherState.settings.opacity,
|
|
||||||
weight
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1516,7 +1546,11 @@ function positionGroupStreetsDialog(dialog, left, top, width = null, height = nu
|
|||||||
|
|
||||||
function initGroupStreetsDialogDrag() {
|
function initGroupStreetsDialogDrag() {
|
||||||
const dialog = document.getElementById('groupStreetsModal');
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
|
if (!dialog) return;
|
||||||
|
dialog.addEventListener('close', cleanupGroupStreetsDialog);
|
||||||
|
|
||||||
const header = dialog.querySelector('header');
|
const header = dialog.querySelector('header');
|
||||||
|
if (!header) return;
|
||||||
let dragState = null;
|
let dragState = null;
|
||||||
|
|
||||||
const finishDrag = event => {
|
const finishDrag = event => {
|
||||||
@@ -1577,6 +1611,7 @@ function openGroupStreetsModal(groupId) {
|
|||||||
if (!group) return;
|
if (!group) return;
|
||||||
|
|
||||||
dispatcherState.streetsDialogGroupId = Number(group.id);
|
dispatcherState.streetsDialogGroupId = Number(group.id);
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.clear();
|
||||||
renderGroupStreetsDialog(group.id);
|
renderGroupStreetsDialog(group.id);
|
||||||
|
|
||||||
const dialog = document.getElementById('groupStreetsModal');
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
@@ -1584,12 +1619,47 @@ function openGroupStreetsModal(groupId) {
|
|||||||
|
|
||||||
const rect = dialog.getBoundingClientRect();
|
const rect = dialog.getBoundingClientRect();
|
||||||
positionGroupStreetsDialog(dialog, rect.left, rect.top);
|
positionGroupStreetsDialog(dialog, rect.left, rect.top);
|
||||||
|
|
||||||
|
if (!isDispatcherView()) return;
|
||||||
|
|
||||||
|
// Alle Straßen außerhalb der Gruppe ausblenden und auf die Gruppe zoomen.
|
||||||
|
updateAllPolylineStyles();
|
||||||
|
const bounds = combinedStreetBounds(groupStreetsForDialog(group.id));
|
||||||
|
if (map && bounds.isValid()) {
|
||||||
|
map.fitBounds(bounds, {padding: [32, 32], maxZoom: 18});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function closeGroupStreetsModal() {
|
function closeGroupStreetsModal() {
|
||||||
const dialog = document.getElementById('groupStreetsModal');
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
if (dialog.open) dialog.close();
|
if (dialog.open) dialog.close();
|
||||||
|
cleanupGroupStreetsDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanupGroupStreetsDialog() {
|
||||||
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
|
// Ein verspätetes close-Event darf einen bereits neu geöffneten Dialog
|
||||||
|
// nicht zurücksetzen.
|
||||||
|
if (dialog && dialog.open) return;
|
||||||
|
|
||||||
dispatcherState.streetsDialogGroupId = null;
|
dispatcherState.streetsDialogGroupId = null;
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.clear();
|
||||||
|
clearGroupStreetHover();
|
||||||
|
updateAllPolylineStyles();
|
||||||
|
updateGroupStreetsActionState();
|
||||||
|
}
|
||||||
|
|
||||||
|
function groupStreetsForDialog(groupId) {
|
||||||
|
return dispatcherState.streets
|
||||||
|
.filter(street => Number(street.group_id) === Number(groupId))
|
||||||
|
.sort((a, b) => {
|
||||||
|
const byName = String(a.name).localeCompare(String(b.name), 'de');
|
||||||
|
return byName || String(a.zusatz || '').localeCompare(String(b.zusatz || ''), 'de');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function canEditGroupStreets() {
|
||||||
|
return isDispatcherView();
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderGroupStreetsDialog(groupId) {
|
function renderGroupStreetsDialog(groupId) {
|
||||||
@@ -1599,40 +1669,53 @@ function renderGroupStreetsDialog(groupId) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearGroupStreetHover();
|
||||||
|
|
||||||
document.getElementById('groupStreetsTitle').textContent =
|
document.getElementById('groupStreetsTitle').textContent =
|
||||||
`Straßen – ${groupDisplayName(group)}`;
|
`Straßen – ${groupDisplayName(group)}`;
|
||||||
|
|
||||||
const container = document.getElementById('groupStreetsContent');
|
const container = document.getElementById('groupStreetsContent');
|
||||||
container.innerHTML = '';
|
container.innerHTML = '';
|
||||||
|
|
||||||
const assigned = dispatcherState.streets
|
const assigned = groupStreetsForDialog(group.id);
|
||||||
.filter(street => Number(street.group_id) === Number(group.id))
|
|
||||||
.sort((a, b) => String(a.name).localeCompare(String(b.name), 'de'));
|
|
||||||
|
|
||||||
if (!assigned.length) {
|
|
||||||
const empty = document.createElement('p');
|
|
||||||
empty.className = 'group-streets-empty';
|
|
||||||
empty.textContent = 'Dieser Gruppe sind noch keine Straßen zugewiesen.';
|
|
||||||
container.appendChild(empty);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const assignedStreets = assigned.filter(street => street.state === 'zugewiesen');
|
const assignedStreets = assigned.filter(street => street.state === 'zugewiesen');
|
||||||
const completedStreets = assigned.filter(street => street.state === 'erledigt');
|
const completedStreets = assigned.filter(street => street.state === 'erledigt');
|
||||||
const otherStreets = assigned.filter(
|
const otherStreets = assigned.filter(
|
||||||
street => street.state !== 'zugewiesen' && street.state !== 'erledigt'
|
street => street.state !== 'zugewiesen' && street.state !== 'erledigt'
|
||||||
);
|
);
|
||||||
|
|
||||||
appendGroupStreetSection(container, 'Zugewiesen', assignedStreets, true);
|
// Auswahl nur für Straßen behalten, die weiterhin im Zustand
|
||||||
|
// „zugewiesen“ und in dieser Gruppe sind.
|
||||||
|
const selectableIds = new Set(
|
||||||
|
assignedStreets.map(street => Number(street.id))
|
||||||
|
);
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.forEach(streetId => {
|
||||||
|
if (!selectableIds.has(Number(streetId))) {
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.delete(streetId);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!assigned.length) {
|
||||||
|
const empty = document.createElement('p');
|
||||||
|
empty.className = 'group-streets-empty';
|
||||||
|
empty.textContent = 'Dieser Gruppe sind noch keine Straßen zugewiesen.';
|
||||||
|
container.appendChild(empty);
|
||||||
|
updateGroupStreetsActionState();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectable = canEditGroupStreets();
|
||||||
|
appendGroupStreetSection(container, 'Zugewiesen', assignedStreets, true, selectable);
|
||||||
if (completedStreets.length) {
|
if (completedStreets.length) {
|
||||||
appendGroupStreetSection(container, 'Erledigt', completedStreets, false);
|
appendGroupStreetSection(container, 'Erledigt', completedStreets, false);
|
||||||
}
|
}
|
||||||
if (otherStreets.length) {
|
if (otherStreets.length) {
|
||||||
appendGroupStreetSection(container, 'Weitere', otherStreets, false);
|
appendGroupStreetSection(container, 'Weitere', otherStreets, false);
|
||||||
}
|
}
|
||||||
|
updateGroupStreetsActionState();
|
||||||
}
|
}
|
||||||
|
|
||||||
function appendGroupStreetSection(container, title, streets, showEmpty) {
|
function appendGroupStreetSection(container, title, streets, showEmpty, selectable = false) {
|
||||||
const section = document.createElement('section');
|
const section = document.createElement('section');
|
||||||
section.className = 'group-streets-section';
|
section.className = 'group-streets-section';
|
||||||
|
|
||||||
@@ -1653,9 +1736,33 @@ function appendGroupStreetSection(container, title, streets, showEmpty) {
|
|||||||
|
|
||||||
const list = document.createElement('ul');
|
const list = document.createElement('ul');
|
||||||
list.className = 'group-streets-list';
|
list.className = 'group-streets-list';
|
||||||
|
const highlightOnHover = isDispatcherView();
|
||||||
|
|
||||||
streets.forEach(street => {
|
streets.forEach(street => {
|
||||||
|
const streetId = Number(street.id);
|
||||||
const item = document.createElement('li');
|
const item = document.createElement('li');
|
||||||
|
item.className = 'group-street-item';
|
||||||
|
|
||||||
|
if (selectable) {
|
||||||
|
const checkbox = document.createElement('input');
|
||||||
|
checkbox.type = 'checkbox';
|
||||||
|
checkbox.className = 'group-street-select';
|
||||||
|
checkbox.value = String(streetId);
|
||||||
|
checkbox.checked = dispatcherState.streetsDialogSelectedStreetIds.has(streetId);
|
||||||
|
checkbox.setAttribute(
|
||||||
|
'aria-label',
|
||||||
|
`Straße ${streetDisplayName(street)} auswählen`
|
||||||
|
);
|
||||||
|
checkbox.addEventListener('change', () => {
|
||||||
|
if (checkbox.checked) {
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.add(streetId);
|
||||||
|
} else {
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.delete(streetId);
|
||||||
|
}
|
||||||
|
updateGroupStreetsActionState();
|
||||||
|
});
|
||||||
|
item.appendChild(checkbox);
|
||||||
|
}
|
||||||
|
|
||||||
const button = document.createElement('button');
|
const button = document.createElement('button');
|
||||||
button.type = 'button';
|
button.type = 'button';
|
||||||
@@ -1673,6 +1780,12 @@ function appendGroupStreetSection(container, title, streets, showEmpty) {
|
|||||||
button.append(name, state);
|
button.append(name, state);
|
||||||
button.addEventListener('click', () => zoomToStreet(street.id));
|
button.addEventListener('click', () => zoomToStreet(street.id));
|
||||||
item.appendChild(button);
|
item.appendChild(button);
|
||||||
|
|
||||||
|
if (highlightOnHover) {
|
||||||
|
item.addEventListener('mouseenter', () => setGroupStreetHover(streetId, true));
|
||||||
|
item.addEventListener('mouseleave', () => setGroupStreetHover(streetId, false));
|
||||||
|
}
|
||||||
|
|
||||||
list.appendChild(item);
|
list.appendChild(item);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -1680,6 +1793,102 @@ function appendGroupStreetSection(container, title, streets, showEmpty) {
|
|||||||
container.appendChild(section);
|
container.appendChild(section);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function selectedGroupStreetIds() {
|
||||||
|
return Array.from(
|
||||||
|
document.querySelectorAll('#groupStreetsContent .group-street-select:checked')
|
||||||
|
)
|
||||||
|
.map(checkbox => Number(checkbox.value))
|
||||||
|
.filter(streetId => Number.isInteger(streetId) && streetId > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateGroupStreetsActionState() {
|
||||||
|
const count = selectedGroupStreetIds().length;
|
||||||
|
['groupStreetsMarkUnbearbeitet', 'groupStreetsMarkErledigt'].forEach(id => {
|
||||||
|
const button = document.getElementById(id);
|
||||||
|
if (button) button.disabled = count === 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function setSelectedGroupStreetsState(newState) {
|
||||||
|
if (!canEditGroupStreets()) return;
|
||||||
|
if (newState !== 'unbearbeitet' && newState !== 'erledigt') return;
|
||||||
|
|
||||||
|
const selectedIds = selectedGroupStreetIds();
|
||||||
|
if (!selectedIds.length) return;
|
||||||
|
|
||||||
|
if (!dispatcherState.ws
|
||||||
|
|| dispatcherState.ws.readyState !== WebSocket.OPEN
|
||||||
|
|| !dispatcherState.authenticated) {
|
||||||
|
alert('Die WebSocket-Verbindung ist noch nicht verfügbar.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const fallbackGroupId = Number(dispatcherState.streetsDialogGroupId) || null;
|
||||||
|
let sentAll = true;
|
||||||
|
|
||||||
|
for (const streetId of selectedIds) {
|
||||||
|
const street = dispatcherState.streetById.get(streetId);
|
||||||
|
if (!street) {
|
||||||
|
sentAll = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
const groupId = newState === 'erledigt'
|
||||||
|
? (Number(street.group_id) || fallbackGroupId)
|
||||||
|
: null;
|
||||||
|
const sent = sendWs({
|
||||||
|
code: 100,
|
||||||
|
msg: JSON.stringify({
|
||||||
|
name: street.name,
|
||||||
|
state: newState,
|
||||||
|
actor: currentAccountId,
|
||||||
|
street_id: street.id,
|
||||||
|
group_id: groupId
|
||||||
|
})
|
||||||
|
});
|
||||||
|
if (!sent) {
|
||||||
|
sentAll = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sentAll) return;
|
||||||
|
|
||||||
|
dispatcherState.streetsDialogSelectedStreetIds.clear();
|
||||||
|
document.querySelectorAll('#groupStreetsContent .group-street-select').forEach(checkbox => {
|
||||||
|
checkbox.checked = false;
|
||||||
|
});
|
||||||
|
updateGroupStreetsActionState();
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearGroupStreetHover() {
|
||||||
|
const streetId = dispatcherState.streetsDialogHoverId;
|
||||||
|
if (streetId === null || streetId === undefined) return;
|
||||||
|
|
||||||
|
dispatcherState.streetsDialogHoverId = null;
|
||||||
|
const street = dispatcherState.streetById.get(Number(streetId));
|
||||||
|
if (street) recolorStreet(street);
|
||||||
|
}
|
||||||
|
|
||||||
|
function setGroupStreetHover(streetId, hovered) {
|
||||||
|
const id = Number(streetId);
|
||||||
|
if (!Number.isFinite(id)) return;
|
||||||
|
|
||||||
|
if (!hovered) {
|
||||||
|
if (dispatcherState.streetsDialogHoverId === id) {
|
||||||
|
clearGroupStreetHover();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dispatcherState.streetsDialogHoverId === id) return;
|
||||||
|
clearGroupStreetHover();
|
||||||
|
|
||||||
|
dispatcherState.streetsDialogHoverId = id;
|
||||||
|
const street = dispatcherState.streetById.get(id);
|
||||||
|
if (street) recolorStreet(street);
|
||||||
|
}
|
||||||
|
|
||||||
function zoomToStreet(streetId) {
|
function zoomToStreet(streetId) {
|
||||||
const street = dispatcherState.streetById.get(Number(streetId));
|
const street = dispatcherState.streetById.get(Number(streetId));
|
||||||
if (!street) return;
|
if (!street) return;
|
||||||
@@ -3063,6 +3272,7 @@ function handleStreetUpdate(message) {
|
|||||||
const streetsDialog = document.getElementById('groupStreetsModal');
|
const streetsDialog = document.getElementById('groupStreetsModal');
|
||||||
if (dispatcherState.streetsDialogGroupId && streetsDialog && streetsDialog.open) {
|
if (dispatcherState.streetsDialogGroupId && streetsDialog && streetsDialog.open) {
|
||||||
renderGroupStreetsDialog(dispatcherState.streetsDialogGroupId);
|
renderGroupStreetsDialog(dispatcherState.streetsDialogGroupId);
|
||||||
|
updateAllPolylineStyles();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,22 +17,6 @@
|
|||||||
<label style="margin: 0;">Name filtern
|
<label style="margin: 0;">Name filtern
|
||||||
<input type="text" id="streetNameFilter" placeholder="z. B. Haupt" oninput="applyStreetFilters()">
|
<input type="text" id="streetNameFilter" placeholder="z. B. Haupt" oninput="applyStreetFilters()">
|
||||||
</label>
|
</label>
|
||||||
<label style="margin: 0;">State
|
|
||||||
<select id="streetStateFilter" onchange="applyStreetFilters()">
|
|
||||||
<option value="">alle</option>
|
|
||||||
<option value="unbearbeitet">unbearbeitet</option>
|
|
||||||
<option value="zugewiesen">zugewiesen</option>
|
|
||||||
<option value="erledigt">erledigt</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label style="margin: 0;">Gruppe
|
|
||||||
<select id="streetGroupFilter" onchange="applyStreetFilters()">
|
|
||||||
<option value="">alle</option>
|
|
||||||
{% for gruppe in gruppen %}
|
|
||||||
<option value="{{ gruppe.id }}">{{ gruppe.aliasname or gruppe.id }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table id="strassenTable">
|
<table id="strassenTable">
|
||||||
@@ -41,8 +25,6 @@
|
|||||||
<th style="width: 4.5rem;">Auswahl</th>
|
<th style="width: 4.5rem;">Auswahl</th>
|
||||||
<th>ID</th>
|
<th>ID</th>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>State</th>
|
|
||||||
<th>Gruppe</th>
|
|
||||||
<th>HN Min</th>
|
<th>HN Min</th>
|
||||||
<th>HN Max</th>
|
<th>HN Max</th>
|
||||||
<th>BBox</th>
|
<th>BBox</th>
|
||||||
@@ -59,21 +41,6 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>{{ strasse.id }}</td>
|
<td>{{ strasse.id }}</td>
|
||||||
<td>{{ strasse.name }}</td>
|
<td>{{ strasse.name }}</td>
|
||||||
<td>
|
|
||||||
<select onchange="updateStrasse({{ strasse.id }}, {state: this.value})">
|
|
||||||
<option value="unbearbeitet" {% if strasse.state == 'unbearbeitet' %}selected{% endif %}>unbearbeitet</option>
|
|
||||||
<option value="zugewiesen" {% if strasse.state == 'zugewiesen' %}selected{% endif %}>zugewiesen</option>
|
|
||||||
<option value="erledigt" {% if strasse.state == 'erledigt' %}selected{% endif %}>erledigt</option>
|
|
||||||
</select>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<select onchange="updateStrasse({{ strasse.id }}, {group_id: this.value})">
|
|
||||||
<option value="">-</option>
|
|
||||||
{% for gruppe in gruppen %}
|
|
||||||
<option value="{{ gruppe.id }}" {% if strasse.group_id == gruppe.id %}selected{% endif %}>{{ gruppe.aliasname or gruppe.id }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</td>
|
|
||||||
<td>{{ strasse.hn_min or '-' }}</td>
|
<td>{{ strasse.hn_min or '-' }}</td>
|
||||||
<td>{{ strasse.hn_max or '-' }}</td>
|
<td>{{ strasse.hn_max or '-' }}</td>
|
||||||
<td style="word-break: break-all;">{{ strasse.bbox or '-' }}</td>
|
<td style="word-break: break-all;">{{ strasse.bbox or '-' }}</td>
|
||||||
@@ -123,21 +90,6 @@
|
|||||||
<label>Bounding Box (JSON Array)
|
<label>Bounding Box (JSON Array)
|
||||||
<textarea id="strasseBbox"></textarea>
|
<textarea id="strasseBbox"></textarea>
|
||||||
</label>
|
</label>
|
||||||
<label>State
|
|
||||||
<select id="strasseState">
|
|
||||||
<option value="unbearbeitet">unbearbeitet</option>
|
|
||||||
<option value="zugewiesen">zugewiesen</option>
|
|
||||||
<option value="erledigt">erledigt</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<label>Gruppe
|
|
||||||
<select id="strasseGroup">
|
|
||||||
<option value="">-</option>
|
|
||||||
{% for gruppe in gruppen %}
|
|
||||||
<option value="{{ gruppe.id }}">{{ gruppe.aliasname or gruppe.id }}</option>
|
|
||||||
{% endfor %}
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<footer>
|
<footer>
|
||||||
<button onclick="closeStrasseModal()">Abbrechen</button>
|
<button onclick="closeStrasseModal()">Abbrechen</button>
|
||||||
<button onclick="saveStrasse()">Speichern</button>
|
<button onclick="saveStrasse()">Speichern</button>
|
||||||
|
|||||||
@@ -164,7 +164,13 @@
|
|||||||
<h3 id="groupStreetsTitle" title="Zum Verschieben ziehen">Straßen</h3>
|
<h3 id="groupStreetsTitle" title="Zum Verschieben ziehen">Straßen</h3>
|
||||||
</header>
|
</header>
|
||||||
<div id="groupStreetsContent" class="dialog-body"></div>
|
<div id="groupStreetsContent" class="dialog-body"></div>
|
||||||
<footer>
|
<footer class="group-streets-footer">
|
||||||
|
<div class="group-streets-bulk-actions">
|
||||||
|
<button type="button" id="groupStreetsMarkUnbearbeitet" class="secondary"
|
||||||
|
onclick="setSelectedGroupStreetsState('unbearbeitet')" disabled>unbearbeitet</button>
|
||||||
|
<button type="button" id="groupStreetsMarkErledigt"
|
||||||
|
onclick="setSelectedGroupStreetsState('erledigt')" disabled>erledigt</button>
|
||||||
|
</div>
|
||||||
<button type="button" class="secondary" onclick="closeGroupStreetsModal()">Schließen</button>
|
<button type="button" class="secondary" onclick="closeGroupStreetsModal()">Schließen</button>
|
||||||
</footer>
|
</footer>
|
||||||
</article>
|
</article>
|
||||||
|
|||||||
Reference in new issue
Block a user