ToDo-Listen UI
This commit is contained in:
1 parent
3eb3b746ab
commit
6e24c79008
7 files changed
+290
-125
No files matched your search
@@ -5,18 +5,6 @@ let currentStreetId = null;
|
||||
let editMode = false;
|
||||
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) {
|
||||
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}`, {
|
||||
@@ -95,7 +83,7 @@ function selectedStreetNames(selected) {
|
||||
const row = checkbox.closest('tr');
|
||||
if (!row || !row.cells[2]) return `#${checkbox.value}`;
|
||||
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;
|
||||
});
|
||||
const limit = 10;
|
||||
@@ -156,10 +144,6 @@ function openCreateStrasseModal() {
|
||||
document.getElementById('strasseHnMin').value = '';
|
||||
document.getElementById('strasseHnMax').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();
|
||||
}
|
||||
|
||||
@@ -169,14 +153,10 @@ function editStrasse(streetId) {
|
||||
document.getElementById('strasseModalTitle').innerText = 'Straße bearbeiten';
|
||||
document.getElementById('strasseId').value = streetId;
|
||||
document.getElementById('strasseName').value = row.cells[2].innerText.trim();
|
||||
document.getElementById('strasseZusatz').value = row.cells[8].innerText.trim();
|
||||
document.getElementById('strasseHnMin').value = row.cells[5].innerText === '-' ? '' : row.cells[5].innerText;
|
||||
document.getElementById('strasseHnMax').value = row.cells[6].innerText === '-' ? '' : row.cells[6].innerText;
|
||||
document.getElementById('strasseZusatz').value = row.cells[6].innerText.trim();
|
||||
document.getElementById('strasseHnMin').value = row.cells[3].innerText === '-' ? '' : row.cells[3].innerText;
|
||||
document.getElementById('strasseHnMax').value = row.cells[4].innerText === '-' ? '' : row.cells[4].innerText;
|
||||
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();
|
||||
}
|
||||
|
||||
@@ -191,9 +171,7 @@ function saveStrasse() {
|
||||
zusatz: document.getElementById('strasseZusatz').value,
|
||||
hn_min: document.getElementById('strasseHnMin').value || null,
|
||||
hn_max: document.getElementById('strasseHnMax').value || null,
|
||||
bbox: document.getElementById('strasseBbox').value || null,
|
||||
state: document.getElementById('strasseState').value,
|
||||
group_id: document.getElementById('strasseGroup').value || null
|
||||
bbox: document.getElementById('strasseBbox').value || null
|
||||
};
|
||||
|
||||
if (!editMode) {
|
||||
@@ -439,32 +417,13 @@ function normalizeForFilter(text) {
|
||||
|
||||
function applyStreetFilters() {
|
||||
const nameInput = document.getElementById('streetNameFilter');
|
||||
const stateInput = document.getElementById('streetStateFilter');
|
||||
const groupInput = document.getElementById('streetGroupFilter');
|
||||
const nameQuery = normalizeForFilter(nameInput ? nameInput.value : '');
|
||||
const stateQuery = stateInput ? stateInput.value : '';
|
||||
const groupQuery = groupInput ? groupInput.value : '';
|
||||
|
||||
document.querySelectorAll('#strassenTable tbody tr').forEach(row => {
|
||||
if (!row.dataset.id) return;
|
||||
const nameCell = row.cells[2];
|
||||
const nameText = normalizeForFilter(nameCell ? nameCell.innerText : '');
|
||||
const stateSelect = row.cells[3] ? row.cells[3].querySelector('select') : null;
|
||||
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';
|
||||
row.style.display = !nameQuery || nameText.indexOf(nameQuery) !== -1 ? '' : 'none';
|
||||
});
|
||||
updateStreetSelectionState();
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ const DEFAULT_SETTINGS = {
|
||||
const STREET_STATES = ['unbearbeitet', 'zugewiesen', 'erledigt'];
|
||||
const GROUP_STATES = ['offen', 'unterwegs', 'online', 'pausierend', 'fertig'];
|
||||
const GROUP_MARKER_MAX_AGE_SECONDS = 30 * 60;
|
||||
const GROUP_STREET_HOVER_COLOR = '#f5c518';
|
||||
const STREET_COLORS = {
|
||||
unbearbeitet: '#1f6feb',
|
||||
zugewiesen: '#d62828',
|
||||
@@ -54,6 +55,8 @@ const dispatcherState = {
|
||||
crosshairGroupId: null,
|
||||
currentStreetId: null,
|
||||
streetsDialogGroupId: null,
|
||||
streetsDialogSelectedStreetIds: new Set(),
|
||||
streetsDialogHoverId: null,
|
||||
aliasGroupId: null,
|
||||
chatGroupId: null,
|
||||
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) {
|
||||
const lines = dispatcherState.polylinesByStreetId.get(Number(street.id));
|
||||
if (!lines) return;
|
||||
|
||||
const color = STREET_COLORS[street.state] || STREET_COLORS.unbearbeitet;
|
||||
lines.forEach(line => {
|
||||
line.setStyle({
|
||||
color,
|
||||
opacity: dispatcherState.settings.opacity,
|
||||
color: streetPolylineColor(street),
|
||||
opacity: polylineOpacityForStreet(street),
|
||||
weight: currentPolylineWeight()
|
||||
});
|
||||
line.setTooltipContent(tooltipElement(`${streetDisplayName(street)} (${street.state})`));
|
||||
@@ -576,12 +605,13 @@ function recolorStreet(street) {
|
||||
|
||||
function updateAllPolylineStyles() {
|
||||
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 => {
|
||||
line.setStyle({
|
||||
opacity: dispatcherState.settings.opacity,
|
||||
weight
|
||||
});
|
||||
line.setStyle({opacity, weight});
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -1516,7 +1546,11 @@ function positionGroupStreetsDialog(dialog, left, top, width = null, height = nu
|
||||
|
||||
function initGroupStreetsDialogDrag() {
|
||||
const dialog = document.getElementById('groupStreetsModal');
|
||||
if (!dialog) return;
|
||||
dialog.addEventListener('close', cleanupGroupStreetsDialog);
|
||||
|
||||
const header = dialog.querySelector('header');
|
||||
if (!header) return;
|
||||
let dragState = null;
|
||||
|
||||
const finishDrag = event => {
|
||||
@@ -1577,6 +1611,7 @@ function openGroupStreetsModal(groupId) {
|
||||
if (!group) return;
|
||||
|
||||
dispatcherState.streetsDialogGroupId = Number(group.id);
|
||||
dispatcherState.streetsDialogSelectedStreetIds.clear();
|
||||
renderGroupStreetsDialog(group.id);
|
||||
|
||||
const dialog = document.getElementById('groupStreetsModal');
|
||||
@@ -1584,12 +1619,47 @@ function openGroupStreetsModal(groupId) {
|
||||
|
||||
const rect = dialog.getBoundingClientRect();
|
||||
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() {
|
||||
const dialog = document.getElementById('groupStreetsModal');
|
||||
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.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) {
|
||||
@@ -1599,40 +1669,53 @@ function renderGroupStreetsDialog(groupId) {
|
||||
return;
|
||||
}
|
||||
|
||||
clearGroupStreetHover();
|
||||
|
||||
document.getElementById('groupStreetsTitle').textContent =
|
||||
`Straßen – ${groupDisplayName(group)}`;
|
||||
|
||||
const container = document.getElementById('groupStreetsContent');
|
||||
container.innerHTML = '';
|
||||
|
||||
const assigned = dispatcherState.streets
|
||||
.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 assigned = groupStreetsForDialog(group.id);
|
||||
const assignedStreets = assigned.filter(street => street.state === 'zugewiesen');
|
||||
const completedStreets = assigned.filter(street => street.state === 'erledigt');
|
||||
const otherStreets = assigned.filter(
|
||||
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) {
|
||||
appendGroupStreetSection(container, 'Erledigt', completedStreets, false);
|
||||
}
|
||||
if (otherStreets.length) {
|
||||
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');
|
||||
section.className = 'group-streets-section';
|
||||
|
||||
@@ -1653,9 +1736,33 @@ function appendGroupStreetSection(container, title, streets, showEmpty) {
|
||||
|
||||
const list = document.createElement('ul');
|
||||
list.className = 'group-streets-list';
|
||||
const highlightOnHover = isDispatcherView();
|
||||
|
||||
streets.forEach(street => {
|
||||
const streetId = Number(street.id);
|
||||
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');
|
||||
button.type = 'button';
|
||||
@@ -1673,6 +1780,12 @@ function appendGroupStreetSection(container, title, streets, showEmpty) {
|
||||
button.append(name, state);
|
||||
button.addEventListener('click', () => zoomToStreet(street.id));
|
||||
item.appendChild(button);
|
||||
|
||||
if (highlightOnHover) {
|
||||
item.addEventListener('mouseenter', () => setGroupStreetHover(streetId, true));
|
||||
item.addEventListener('mouseleave', () => setGroupStreetHover(streetId, false));
|
||||
}
|
||||
|
||||
list.appendChild(item);
|
||||
});
|
||||
|
||||
@@ -1680,6 +1793,102 @@ function appendGroupStreetSection(container, title, streets, showEmpty) {
|
||||
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) {
|
||||
const street = dispatcherState.streetById.get(Number(streetId));
|
||||
if (!street) return;
|
||||
@@ -3063,6 +3272,7 @@ function handleStreetUpdate(message) {
|
||||
const streetsDialog = document.getElementById('groupStreetsModal');
|
||||
if (dispatcherState.streetsDialogGroupId && streetsDialog && streetsDialog.open) {
|
||||
renderGroupStreetsDialog(dispatcherState.streetsDialogGroupId);
|
||||
updateAllPolylineStyles();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user