';
contacts.forEach(c => {
const subtitle = [c.address, c.town].filter(Boolean).join(', ');
html += `
';
+ }
+
+ // Kunden-Anlagen (ohne Kontaktzuweisung) darunter
+ if (anlagen && anlagen.length) {
+ if (contacts && contacts.length && App.customerAddress) {
+ html += `
`;
+ }
+ anlagen.forEach(a => {
+ html += renderAnlageCard(a);
+ });
}
if (!html) {
@@ -437,13 +488,26 @@
}
function renderAnlageCard(a) {
+ let fieldsHtml = '';
+ if (a.fields && a.fields.length) {
+ fieldsHtml = '
';
+ a.fields.forEach(f => {
+ const style = f.color ? ` style="background:${f.color}"` : '';
+ fieldsHtml += `${escapeHtml(f.value)}`;
+ });
+ fieldsHtml += '
`;
}
@@ -519,6 +583,7 @@
App.equipment = response.equipment || [];
App.equipmentTypes = response.types || [];
App.outputs = response.outputs || [];
+ App.inputs = response.inputs || [];
// Cache for offline
localStorage.setItem('kundenkarte_data_' + App.anlageId, JSON.stringify({
@@ -526,7 +591,8 @@
carriers: App.carriers,
equipment: App.equipment,
types: App.equipmentTypes,
- outputs: App.outputs
+ outputs: App.outputs,
+ inputs: App.inputs
}));
renderEditor();
@@ -541,6 +607,7 @@
App.equipment = data.equipment || [];
App.equipmentTypes = data.types || [];
App.outputs = data.outputs || [];
+ App.inputs = data.inputs || [];
renderEditor();
showToast('Offline - Zeige gecachte Daten', 'warning');
} else {
@@ -575,67 +642,64 @@
const totalTe = parseInt(carrier.total_te) || 12;
const usedTe = carrierEquipment.reduce((sum, eq) => sum + (parseInt(eq.width_te) || 1), 0);
const isFull = usedTe >= totalTe;
- const labelsTop = App.labelsPosition === 'top';
-
- // Abgang-Labels aus Connections (output_label + Kabeltyp) generieren
- let labelsHtml = `
+
+
`;
- // Labels oben
- if (labelsTop) html += labelsHtml;
+ // === Zeile 1: Terminals oben (Inputs + Top-Outputs) ===
+ carrierEquipment.forEach(eq => {
+ const widthTe = parseInt(eq.width_te) || 1;
+ const posTe = parseInt(eq.position_te) || 0;
+ const eqInputs = App.inputs ? App.inputs.filter(i => i.fk_target == eq.id) : [];
+ const eqTopOutputs = App.outputs ? App.outputs.filter(o => o.fk_source == eq.id && o.is_top) : [];
- html += `
-
-
- `;
+ for (let t = 0; t < widthTe; t++) {
+ const colPos = posTe > 0 ? posTe + t : 0;
+ const style = `grid-row:1;${colPos > 0 ? ' grid-column:' + colPos : ''}`;
+ const inp = eqInputs[t] || null;
+ const topOut = eqTopOutputs[t] || null;
+ if (topOut) {
+ // Top-Output: Pfeil nach oben ▲
+ const phaseColor = topOut.color || getPhaseColor(topOut.connection_type);
+ html += `
`;
+ html += renderOutputLabel(topOut, phaseColor, 'up');
+ html += ``;
+ } else if (inp) {
+ const phaseColor = inp.color || getPhaseColor(inp.connection_type);
+ html += `
`;
+ html += ``;
+ html += `${escapeHtml(inp.connection_type || '')}`;
+ html += ``;
+ } else {
+ html += `
`;
+ html += ``;
+ html += ``;
+ }
+ }
+ });
+
+ // === Zeile 2: Equipment-Blöcke ===
carrierEquipment.forEach(eq => {
const type = App.equipmentTypes.find(t => t.id == eq.fk_equipment_type);
const widthTe = parseInt(eq.width_te) || 1;
const posTe = parseInt(eq.position_te) || 0;
- // Wie Website: Zeile 1 = Typ-Kurzname, Zeile 2 = Feldwerte, Zeile 3 = Bezeichnung
const typeLabel = type?.label_short || type?.ref || '';
const blockColor = eq.block_color || type?.color || '#3498db';
const eqLabel = eq.label || '';
-
- // block_label kann = type_label_short sein wenn keine Feldwerte vorhanden
- // Nur anzeigen wenn es echte Feldwerte sind (nicht gleich dem Typ-Kurznamen)
const blockFields = eq.block_label || '';
const showBlockFields = blockFields && blockFields !== typeLabel && blockFields !== (type?.ref || '');
const gridCol = posTe > 0
- ? `grid-column: ${posTe} / span ${widthTe}`
- : `grid-column: span ${widthTe}`;
+ ? `grid-row:2; grid-column: ${posTe} / span ${widthTe}`
+ : `grid-row:2; grid-column: span ${widthTe}`;
html += `
@@ -646,20 +710,38 @@
`;
});
- html += `
`;
-
+ // +-Button in letzter Spalte (auto), Zeile 2
html += `
-
+
`;
- html += `
`;
+ // === Zeile 3: Output-Terminals unten (Standard-Abgänge) ===
+ carrierEquipment.forEach(eq => {
+ const widthTe = parseInt(eq.width_te) || 1;
+ const posTe = parseInt(eq.position_te) || 0;
+ const eqBottomOutputs = App.outputs ? App.outputs.filter(o => o.fk_source == eq.id && !o.is_top) : [];
- // Labels unten
- if (!labelsTop) html += labelsHtml;
+ for (let t = 0; t < widthTe; t++) {
+ const colPos = posTe > 0 ? posTe + t : 0;
+ const style = `grid-row:3;${colPos > 0 ? ' grid-column:' + colPos : ''}`;
+ const out = eqBottomOutputs[t] || null;
- html += `
`;
+ if (out) {
+ const phaseColor = out.color || getPhaseColor(out.connection_type);
+ html += `
`;
+ html += renderOutputLabel(out, phaseColor, 'down');
+ html += ``;
+ } else {
+ html += `
`;
+ html += ``;
+ html += ``;
+ }
+ }
+ });
+
+ html += `
`;
});
html += `
@@ -714,8 +796,11 @@
App.panels.push({ id: response.panel_id, label: label });
renderEditor();
showToast('Feld angelegt');
+ } else {
+ showToast(response.error || 'Fehler beim Anlegen', 'error');
}
} catch (err) {
+ showToast('Netzwerkfehler - wird offline gespeichert', 'warning');
queueOfflineAction(data);
}
} else {
@@ -734,8 +819,30 @@
function handleAddCarrier() {
const panelId = $(this).data('panel-id');
App.currentPanelId = panelId;
+ App.editCarrierId = null;
$('.te-btn').removeClass('selected');
$('#carrier-label').val('');
+ $('#carrier-modal-title').text('Hutschiene hinzufügen');
+ $('#btn-save-carrier').text('Hinzufügen');
+ $('#btn-delete-carrier').addClass('hidden');
+ openModal('add-carrier');
+ }
+
+ function handleCarrierClick() {
+ const carrierId = $(this).closest('.carrier-item').data('carrier-id');
+ const carrier = App.carriers.find(c => c.id == carrierId);
+ if (!carrier) return;
+
+ App.editCarrierId = carrierId;
+ App.currentPanelId = carrier.fk_panel;
+
+ // TE-Button vorselektieren
+ $('.te-btn').removeClass('selected');
+ $(`.te-btn[data-te="${carrier.total_te}"]`).addClass('selected');
+ $('#carrier-label').val(carrier.label || '');
+ $('#carrier-modal-title').text('Hutschiene bearbeiten');
+ $('#btn-save-carrier').text('Speichern');
+ $('#btn-delete-carrier').removeClass('hidden');
openModal('add-carrier');
}
@@ -749,131 +856,341 @@
const totalTe = parseInt(teBtn.data('te'));
const label = $('#carrier-label').val().trim() || 'Hutschiene';
- const data = {
- action: 'create_carrier',
- panel_id: App.currentPanelId,
- total_te: totalTe,
- label: label
- };
+ closeModal('add-carrier');
+
+ if (App.editCarrierId) {
+ // Update
+ const data = {
+ action: 'update_carrier',
+ carrier_id: App.editCarrierId,
+ total_te: totalTe,
+ label: label
+ };
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ const carrier = App.carriers.find(c => c.id == App.editCarrierId);
+ if (carrier) {
+ carrier.total_te = totalTe;
+ carrier.label = label;
+ }
+ renderEditor();
+ showToast('Hutschiene aktualisiert', 'success');
+ } else {
+ showToast(response.error || 'Fehler', 'error');
+ }
+ } catch (err) {
+ showToast('Netzwerkfehler - wird offline gespeichert', 'warning');
+ queueOfflineAction(data);
+ }
+ } else {
+ queueOfflineAction(data);
+ const carrier = App.carriers.find(c => c.id == App.editCarrierId);
+ if (carrier) {
+ carrier.total_te = totalTe;
+ carrier.label = label;
+ }
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+ } else {
+ // Neu anlegen
+ const data = {
+ action: 'create_carrier',
+ panel_id: App.currentPanelId,
+ total_te: totalTe,
+ label: label
+ };
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ App.carriers.push({
+ id: response.carrier_id,
+ fk_panel: App.currentPanelId,
+ total_te: totalTe,
+ label: label
+ });
+ renderEditor();
+ showToast('Hutschiene angelegt');
+ } else {
+ showToast(response.error || 'Fehler beim Anlegen', 'error');
+ }
+ } catch (err) {
+ showToast('Netzwerkfehler - wird offline gespeichert', 'warning');
+ queueOfflineAction(data);
+ }
+ } else {
+ queueOfflineAction(data);
+ App.carriers.push({
+ id: 'temp_' + Date.now(),
+ fk_panel: App.currentPanelId,
+ total_te: totalTe,
+ label: label
+ });
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+ }
+
+ App.editCarrierId = null;
+ }
+
+ function handleDeleteCarrierConfirm() {
+ const carrierId = App.editCarrierId;
+ if (!carrierId) return;
+
+ const carrier = App.carriers.find(c => c.id == carrierId);
+ const eqCount = App.equipment.filter(e => e.fk_carrier == carrierId).length;
+ const msg = eqCount > 0
+ ? `"${carrier?.label || 'Hutschiene'}" mit ${eqCount} Automat${eqCount > 1 ? 'en' : ''} wirklich löschen?`
+ : `"${carrier?.label || 'Hutschiene'}" wirklich löschen?`;
+
+ $('#confirm-title').text('Hutschiene löschen?');
+ $('#confirm-message').text(msg);
+ App.confirmCallback = () => deleteCarrier(carrierId);
closeModal('add-carrier');
+ openModal('confirm');
+ }
+
+ async function deleteCarrier(carrierId) {
+ const data = {
+ action: 'delete_carrier',
+ carrier_id: carrierId
+ };
if (App.isOnline) {
try {
const response = await apiCall('ajax/pwa_api.php', data);
if (response.success) {
- App.carriers.push({
- id: response.carrier_id,
- fk_panel: App.currentPanelId,
- total_te: totalTe,
- label: label
- });
+ App.equipment = App.equipment.filter(e => e.fk_carrier != carrierId);
+ App.carriers = App.carriers.filter(c => c.id != carrierId);
renderEditor();
- showToast('Hutschiene angelegt');
+ showToast('Hutschiene gelöscht', 'success');
+ } else {
+ showToast(response.error || 'Fehler', 'error');
}
} catch (err) {
+ showToast('Netzwerkfehler - wird offline gespeichert', 'warning');
queueOfflineAction(data);
+ App.equipment = App.equipment.filter(e => e.fk_carrier != carrierId);
+ App.carriers = App.carriers.filter(c => c.id != carrierId);
+ renderEditor();
}
} else {
queueOfflineAction(data);
- App.carriers.push({
- id: 'temp_' + Date.now(),
- fk_panel: App.currentPanelId,
- total_te: totalTe,
- label: label
- });
+ App.equipment = App.equipment.filter(e => e.fk_carrier != carrierId);
+ App.carriers = App.carriers.filter(c => c.id != carrierId);
renderEditor();
showToast('Wird synchronisiert...', 'warning');
}
+
+ App.editCarrierId = null;
}
// ============================================
// EQUIPMENT (AUTOMAT) ACTIONS
// ============================================
+ /**
+ * Maximale zusammenhängende Lücke auf einem Carrier berechnen
+ */
+ function getMaxGap(carrierId) {
+ const carrier = App.carriers.find(c => c.id == carrierId);
+ if (!carrier) return 0;
+ const totalTe = parseInt(carrier.total_te) || 12;
+ const carrierEquipment = App.equipment.filter(e => e.fk_carrier == carrierId);
+
+ // Belegte Slots ermitteln (1-basiert)
+ const occupied = {};
+ carrierEquipment.forEach(eq => {
+ const pos = parseInt(eq.position_te) || 1;
+ const w = parseInt(eq.width_te) || 1;
+ for (let s = pos; s < pos + w; s++) {
+ occupied[s] = true;
+ }
+ });
+
+ // Maximale zusammenhängende Lücke
+ let maxGap = 0, currentGap = 0;
+ for (let s = 1; s <= totalTe; s++) {
+ if (!occupied[s]) {
+ currentGap++;
+ if (currentGap > maxGap) maxGap = currentGap;
+ } else {
+ currentGap = 0;
+ }
+ }
+ return maxGap;
+ }
+
function handleAddEquipment() {
const carrierId = $(this).data('carrier-id');
App.currentCarrierId = carrierId;
App.selectedTypeId = null;
+ App.editEquipmentId = null;
- // Reset modal
- $('.type-btn').removeClass('selected');
- $('#step-values').hide();
- $('#equipment-label').val('');
- $('#value-fields').html('');
+ // Add-Modus: Titel, Typ-Grid freigeben
+ $('#equipment-modal-title').text('Automat hinzufügen');
+ $('#btn-save-equipment').text('Speichern');
+ $('#btn-delete-equipment').addClass('hidden');
+ $('#type-grid .type-btn').removeClass('selected');
+ // Typ-Buttons nach verfügbarem Platz filtern
+ const maxGap = getMaxGap(carrierId);
+ $('#type-grid .type-btn').each(function() {
+ const w = parseInt($(this).data('width')) || 1;
+ if (w > maxGap) {
+ $(this).addClass('disabled').prop('disabled', true);
+ } else {
+ $(this).removeClass('disabled').prop('disabled', false);
+ }
+ });
+
+ // Schritt 1 zeigen
+ showEquipmentStep('type');
openModal('add-equipment');
}
- function handleTypeSelect() {
+ async function handleTypeSelect() {
$('.type-btn').removeClass('selected');
$(this).addClass('selected');
App.selectedTypeId = $(this).data('type-id');
const type = App.equipmentTypes.find(t => t.id == App.selectedTypeId);
- // Werte-Bereich einblenden
- $('#step-values').show();
+ // Titel für Schritt 2
+ $('#eq-fields-title').text(type?.label_short || type?.label || 'Werte');
- // Felder basierend auf Typ aufbauen
- let html = '';
+ // Felder vom Server laden
+ await loadTypeFields(App.selectedTypeId, App.editEquipmentId);
- // Quick-Select für LS-Schalter
- if (type && (type.ref?.includes('LS') || type.label?.includes('Leitungsschutz'))) {
- html += '
Kennlinie + Ampere:
';
- html += '
';
- ['B6', 'B10', 'B13', 'B16', 'B20', 'B25', 'B32', 'C6', 'C10', 'C13', 'C16', 'C20', 'C25', 'C32'].forEach(v => {
- html += ``;
- });
- html += '
';
- // Quick-Select für FI-Schalter
- } else if (type && (type.ref?.includes('FI') || type.label?.includes('RCD'))) {
- html += '
Ampere:
';
- html += '
';
- ['25', '40', '63', '80'].forEach(v => {
- html += ``;
- });
- html += '
';
- html += '
Empfindlichkeit:
';
- html += '
';
- ['30', '100', '300'].forEach(v => {
- html += ``;
- });
- html += '
';
- // Quick-Select für AFDD
- } else if (type && type.ref?.includes('AFDD')) {
- html += '
Ampere:
';
- html += '
';
- ['10', '13', '16', '20', '25', '32'].forEach(v => {
- html += ``;
- });
- html += '
';
- // Quick-Select für FI/LS-Kombi
- } else if (type && type.ref?.includes('FILS')) {
- html += '
Kennlinie + Ampere:
';
- html += '
';
- ['B10', 'B13', 'B16', 'B20', 'B25', 'B32'].forEach(v => {
- html += ``;
- });
- html += '
';
+ // Zu Schritt 2 wechseln
+ showEquipmentStep('fields');
+ }
+
+ /**
+ * Wechselt zwischen Schritt 1 (Typ) und Schritt 2 (Felder)
+ */
+ function showEquipmentStep(step) {
+ if (step === 'type') {
+ $('#eq-step-type').removeClass('hidden');
+ $('#eq-step-fields').addClass('hidden');
+ } else {
+ $('#eq-step-type').addClass('hidden');
+ $('#eq-step-fields').removeClass('hidden');
+ }
+ }
+
+ /**
+ * Lädt Felder für einen Equipment-Typ vom Server
+ */
+ async function loadTypeFields(typeId, equipmentId) {
+ $('#eq-dynamic-fields').html('
');
+
+ if (!App.isOnline) {
+ // Offline: Gecachte Felder verwenden falls vorhanden
+ const cached = App.cachedTypeFields && App.cachedTypeFields[typeId];
+ if (cached) {
+ renderDynamicFields(cached);
+ } else {
+ $('#eq-dynamic-fields').html('
Offline - Felder nicht verfügbar
');
+ }
+ return;
}
- $('#value-fields').html(html);
+ try {
+ const data = { action: 'get_type_fields', type_id: typeId };
+ if (equipmentId) data.equipment_id = equipmentId;
- // Chip-Klick-Handler
- $('#value-fields .value-chip').on('click', function() {
- if ($(this).hasClass('chip-sens')) {
- $('.chip-sens').removeClass('selected');
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ // Felder cachen für Offline
+ if (!App.cachedTypeFields) App.cachedTypeFields = {};
+ App.cachedTypeFields[typeId] = response.fields;
+
+ renderDynamicFields(response.fields);
} else {
- $('.value-chip:not(.chip-sens)').removeClass('selected');
+ $('#eq-dynamic-fields').html('');
}
- $(this).addClass('selected');
+ } catch (err) {
+ $('#eq-dynamic-fields').html('');
+ }
+ }
+
+ /**
+ * Rendert dynamische Felder basierend auf field_type aus der DB
+ */
+ function renderDynamicFields(fields) {
+ if (!fields || !fields.length) {
+ $('#eq-dynamic-fields').html('');
+ $('#equipment-label').focus();
+ return;
+ }
+
+ let html = '';
+ fields.forEach(field => {
+ const req = field.required ? '
*' : '';
+ const val = field.value || '';
+
+ html += `
`;
+ html += ``;
+
+ switch (field.type) {
+ case 'select':
+ html += ``;
+ break;
+
+ case 'number':
+ html += ``;
+ break;
+
+ case 'checkbox':
+ const checked = val === '1' || val === 'true' ? ' checked' : '';
+ html += ``;
+ break;
+
+ case 'textarea':
+ html += ``;
+ break;
+
+ default: // text
+ html += ``;
+ }
+
+ html += `
`;
});
- // Focus auf Label-Feld wenn keine Chips vorhanden
- if (!html) {
- $('#equipment-label').focus();
- }
+ $('#eq-dynamic-fields').html(html);
+ }
+
+ /**
+ * Sammelt Feldwerte aus den dynamischen Formularfeldern
+ */
+ function collectFieldValues() {
+ const fieldValues = {};
+ $('#eq-dynamic-fields [name^="eq_field_"]').each(function() {
+ const code = $(this).attr('name').replace('eq_field_', '');
+ if ($(this).is(':checkbox')) {
+ fieldValues[code] = $(this).is(':checked') ? '1' : '0';
+ } else {
+ const val = $(this).val();
+ if (val) fieldValues[code] = val;
+ }
+ });
+ return fieldValues;
}
async function handleSaveEquipment() {
@@ -882,22 +1199,38 @@
return;
}
+ // Pflichtfelder prüfen
+ let valid = true;
+ $('#eq-dynamic-fields select[name], #eq-dynamic-fields input[name]').each(function() {
+ const $field = $(this);
+ const $group = $field.closest('.form-group');
+ if ($group.find('.field-required').length && !$field.val()) {
+ $field.addClass('field-error');
+ valid = false;
+ } else {
+ $field.removeClass('field-error');
+ }
+ });
+ if (!valid) {
+ showToast('Pflichtfelder ausfüllen', 'error');
+ return;
+ }
+
const type = App.equipmentTypes.find(t => t.id == App.selectedTypeId);
const label = $('#equipment-label').val().trim();
+ const fieldValues = collectFieldValues();
- // Collect field values
- const fieldValues = {};
- const selectedChip = $('.value-chip.selected:not(.chip-sens)');
- const selectedSens = $('.chip-sens.selected');
-
- if (selectedChip.length) {
- if (selectedChip.data('char')) fieldValues.characteristic = selectedChip.data('char');
- if (selectedChip.data('amp')) fieldValues.ampere = selectedChip.data('amp');
- }
- if (selectedSens.length) {
- fieldValues.sensitivity = selectedSens.data('sens');
+ if (App.editEquipmentId) {
+ await saveEquipmentUpdate(label, fieldValues);
+ } else {
+ await saveEquipmentCreate(type, label, fieldValues);
}
+ }
+ /**
+ * Neuen Automaten anlegen
+ */
+ async function saveEquipmentCreate(type, label, fieldValues) {
// Nächste freie Position berechnen (Lücken berücksichtigen)
const carrierEquipment = App.equipment.filter(e => e.fk_carrier == App.currentCarrierId);
const carrier = App.carriers.find(c => c.id == App.currentCarrierId);
@@ -948,10 +1281,12 @@
id: response.equipment_id,
fk_carrier: App.currentCarrierId,
fk_equipment_type: App.selectedTypeId,
- label: label,
+ label: response.label || label,
position_te: nextPos,
width_te: type?.width_te || 1,
- field_values: fieldValues
+ field_values: fieldValues,
+ block_label: response.block_label || '',
+ block_color: response.block_color || type?.color || ''
});
renderEditor();
showToast('Automat angelegt', 'success');
@@ -978,10 +1313,468 @@
}
}
- function handleEquipmentClick() {
+ /**
+ * Bestehenden Automaten aktualisieren
+ */
+ async function saveEquipmentUpdate(label, fieldValues) {
+ const data = {
+ action: 'update_equipment',
+ equipment_id: App.editEquipmentId,
+ label: label,
+ field_values: JSON.stringify(fieldValues)
+ };
+
+ closeModal('add-equipment');
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ // Lokale Daten aktualisieren
+ const eq = App.equipment.find(e => e.id == App.editEquipmentId);
+ if (eq) {
+ eq.label = label;
+ eq.field_values = fieldValues;
+ eq.block_label = response.block_label || '';
+ eq.block_color = response.block_color || eq.block_color;
+ }
+ renderEditor();
+ showToast('Automat aktualisiert', 'success');
+ } else {
+ showToast(response.error || 'Fehler beim Aktualisieren', 'error');
+ }
+ } catch (err) {
+ showToast('Netzwerkfehler - wird offline gespeichert', 'warning');
+ queueOfflineAction(data);
+ // Optimistic UI
+ const eq = App.equipment.find(e => e.id == App.editEquipmentId);
+ if (eq) {
+ eq.label = label;
+ eq.field_values = fieldValues;
+ }
+ renderEditor();
+ }
+ } else {
+ queueOfflineAction(data);
+ const eq = App.equipment.find(e => e.id == App.editEquipmentId);
+ if (eq) {
+ eq.label = label;
+ eq.field_values = fieldValues;
+ }
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+
+ App.editEquipmentId = null;
+ }
+
+ async function handleEquipmentClick() {
const eqId = $(this).data('equipment-id');
- // TODO: Edit/Delete popup
- showToast('Bearbeiten kommt noch...');
+ const eq = App.equipment.find(e => e.id == eqId);
+ if (!eq) return;
+
+ const type = App.equipmentTypes.find(t => t.id == eq.fk_equipment_type);
+
+ // Edit-Modus setzen
+ App.editEquipmentId = eqId;
+ App.currentCarrierId = eq.fk_carrier;
+ App.selectedTypeId = eq.fk_equipment_type;
+
+ // Titel + Buttons anpassen
+ $('#eq-fields-title').text(type?.label_short || type?.label || 'Bearbeiten');
+ $('#btn-save-equipment').text('Aktualisieren');
+ $('#btn-delete-equipment').removeClass('hidden');
+
+ // Label befüllen
+ $('#equipment-label').val(eq.label || '');
+
+ // Felder vom Server laden (mit bestehenden Werten)
+ await loadTypeFields(eq.fk_equipment_type, eqId);
+
+ // Direkt Schritt 2 zeigen (kein Typ-Wechsel beim Edit)
+ showEquipmentStep('fields');
+ openModal('add-equipment');
+ }
+
+ /**
+ * Bestätigungsdialog vor Equipment-Löschung
+ */
+ function handleDeleteEquipmentConfirm() {
+ const eqId = App.editEquipmentId;
+ if (!eqId) return;
+
+ const eq = App.equipment.find(e => e.id == eqId);
+ const type = App.equipmentTypes.find(t => t.id == eq?.fk_equipment_type);
+ const typeName = type?.label_short || type?.ref || 'Automat';
+ const eqLabel = eq?.label ? ` "${eq.label}"` : '';
+
+ $('#confirm-title').text('Automat löschen?');
+ $('#confirm-message').text(`${typeName}${eqLabel} wirklich löschen?`);
+
+ // Callback für OK-Button
+ App.confirmCallback = () => deleteEquipment(eqId);
+
+ closeModal('add-equipment');
+ openModal('confirm');
+ }
+
+ /**
+ * Equipment löschen (nach Bestätigung)
+ */
+ async function deleteEquipment(eqId) {
+ const data = {
+ action: 'delete_equipment',
+ equipment_id: eqId
+ };
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ App.equipment = App.equipment.filter(e => e.id != eqId);
+ // Zugehörige Abgänge entfernen
+ App.outputs = App.outputs.filter(o => o.fk_source != eqId);
+ renderEditor();
+ showToast('Automat gelöscht', 'success');
+ } else {
+ showToast(response.error || 'Fehler beim Löschen', 'error');
+ }
+ } catch (err) {
+ showToast('Netzwerkfehler - wird offline gespeichert', 'warning');
+ queueOfflineAction(data);
+ App.equipment = App.equipment.filter(e => e.id != eqId);
+ App.outputs = App.outputs.filter(o => o.fk_source != eqId);
+ renderEditor();
+ }
+ } else {
+ queueOfflineAction(data);
+ App.equipment = App.equipment.filter(e => e.id != eqId);
+ App.outputs = App.outputs.filter(o => o.fk_source != eqId);
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+
+ App.editEquipmentId = null;
+ }
+
+ /**
+ * Output-Terminal HTML erzeugen (Pfeil + Labels)
+ * @param {object} out - Connection-Objekt
+ * @param {string} phaseColor - Farbe der Phase
+ * @param {string} dir - 'up' oder 'down'
+ */
+ function renderOutputLabel(out, phaseColor, dir) {
+ // Pfeil statt Punkt - Pfeil immer am Automaten (zwischen Block und Label)
+ const arrowClass = dir === 'up' ? 'terminal-arrow-up' : 'terminal-arrow-down';
+ const arrowHtml = `
`;
+
+ let labelHtml = '';
+ if (out.output_label) {
+ let cableInfo = '';
+ if (out.medium_type) cableInfo = out.medium_type;
+ if (out.medium_spec) cableInfo += ' ' + out.medium_spec;
+ if (out.medium_length) cableInfo += ' (' + out.medium_length + ')';
+ labelHtml = `
${escapeHtml(out.output_label)}`;
+ if (cableInfo) labelHtml += `
${escapeHtml(cableInfo.trim())}`;
+ labelHtml += ``;
+ } else {
+ labelHtml = `
${escapeHtml(out.connection_type || '')}`;
+ }
+
+ // Oben: Label zuerst, dann Pfeil (Pfeil zeigt zum Automaten darunter)
+ // Unten: Pfeil zuerst, dann Label (Pfeil zeigt zum Automaten darüber)
+ if (dir === 'up') {
+ return labelHtml + arrowHtml;
+ }
+ return arrowHtml + labelHtml;
+ }
+
+ // ============================================
+ // CONNECTION (TERMINAL) ACTIONS
+ // ============================================
+
+ // Phasen-Optionen wie auf der Website
+ const INPUT_PHASES = ['L1', 'L2', 'L3', '3P', '3P+N', 'PE'];
+ const OUTPUT_PHASES = ['L1N', 'L2N', 'L3N', 'N', '3P+N', 'PE', 'DATA'];
+
+ /**
+ * Phasenfarbe ermitteln (DIN VDE Farben)
+ */
+ function getPhaseColor(type) {
+ const colors = {
+ 'L1': '#8B4513', 'L2': '#1a1a1a', 'L3': '#666',
+ 'N': '#0066cc', 'PE': '#27ae60',
+ 'L1N': '#8B4513', 'L2N': '#1a1a1a', 'L3N': '#666',
+ '3P': '#e74c3c', '3P+N': '#e74c3c', 'DATA': '#9b59b6'
+ };
+ return colors[type] || '#888';
+ }
+
+ /**
+ * Abgangsseite-Button setzen
+ */
+ function setSideButton(side) {
+ $('.side-btn').removeClass('selected');
+ $(`.side-btn[data-side="${side}"]`).addClass('selected');
+ }
+
+ /**
+ * Gewählte Abgangsseite auslesen
+ */
+ function getSelectedSide() {
+ return $('.side-btn.selected').data('side') || 'bottom';
+ }
+
+ /**
+ * Typ-Select je nach Richtung befüllen (wie Website)
+ */
+ function renderTypeSelect(direction, selectedType) {
+ const phases = direction === 'input' ? INPUT_PHASES : OUTPUT_PHASES;
+ let html = '
';
+ phases.forEach(p => {
+ const sel = (p === selectedType) ? ' selected' : '';
+ html += `
`;
+ });
+ $('#conn-type').html(html);
+ }
+
+ /**
+ * Klick auf Terminal-Zelle (Input oder Output)
+ */
+ function handleTerminalClick(e) {
+ e.stopPropagation();
+ const $point = $(this);
+ const eqId = $point.data('equipment-id');
+ const direction = $point.data('direction');
+ const connId = $point.data('connection-id');
+
+ App.connectionEquipmentId = eqId;
+ App.connectionDirection = direction;
+
+ // Typ-Select befüllen
+ renderTypeSelect(direction, '');
+
+ if (connId) {
+ // Bearbeiten
+ App.editConnectionId = connId;
+ $('#connection-modal-title').text('Verbindung bearbeiten');
+ $('#btn-delete-connection').removeClass('hidden');
+
+ const conn = direction === 'input'
+ ? App.inputs.find(i => i.id == connId)
+ : App.outputs.find(o => o.id == connId);
+
+ if (conn) {
+ renderTypeSelect(direction, conn.connection_type);
+ $('#conn-color').val(conn.color || '#3498db');
+ $('#conn-label').val(conn.output_label || '');
+ $('#conn-medium-type').val(conn.medium_type || '');
+ $('#conn-medium-spec').val(conn.medium_spec || '');
+ $('#conn-medium-length').val(conn.medium_length || '');
+ setSideButton(conn.is_top ? 'top' : 'bottom');
+ }
+ } else {
+ // Neu anlegen
+ App.editConnectionId = null;
+ $('#connection-modal-title').text(direction === 'input' ? 'Einspeisung' : 'Abgang');
+ $('#btn-delete-connection').addClass('hidden');
+ $('#conn-color').val('#3498db');
+ $('#conn-label').val('');
+ $('#conn-medium-type').val('');
+ $('#conn-medium-spec').val('');
+ $('#conn-medium-length').val('');
+ setSideButton('bottom');
+ }
+
+ // Medium-Felder nur bei Abgang zeigen
+ $('#conn-output-fields').toggle(direction === 'output');
+
+ openModal('connection');
+ }
+
+ /**
+ * Connection speichern (Neu oder Update)
+ */
+ async function handleSaveConnection() {
+ const connectionType = $('#conn-type').val() || '';
+ const color = $('#conn-color').val() || '#3498db';
+ const outputLabel = $('#conn-label').val().trim();
+ const isOutput = App.connectionDirection === 'output';
+ const mediumType = isOutput ? ($('#conn-medium-type').val().trim() || '') : '';
+ const mediumSpec = isOutput ? ($('#conn-medium-spec').val().trim() || '') : '';
+ const mediumLength = isOutput ? ($('#conn-medium-length').val().trim() || '') : '';
+ const isTop = isOutput && getSelectedSide() === 'top';
+ // source_terminal_id wie Website: t1=oben, t2=unten
+ const sourceTerminalId = isOutput ? (isTop ? 't1' : 't2') : '';
+ const sourceTerminal = isOutput ? (isTop ? 'top' : 'output') : '';
+
+ closeModal('connection');
+
+ if (App.editConnectionId) {
+ // Update
+ const data = {
+ action: 'update_connection',
+ connection_id: App.editConnectionId,
+ connection_type: connectionType,
+ color: color,
+ output_label: outputLabel,
+ medium_type: mediumType,
+ medium_spec: mediumSpec,
+ medium_length: mediumLength,
+ source_terminal: sourceTerminal,
+ source_terminal_id: sourceTerminalId
+ };
+
+ const updateLocal = (conn) => {
+ if (!conn) return;
+ conn.connection_type = connectionType;
+ conn.color = color;
+ conn.output_label = outputLabel;
+ conn.medium_type = mediumType;
+ conn.medium_spec = mediumSpec;
+ conn.medium_length = mediumLength;
+ if (isOutput) {
+ conn.is_top = isTop;
+ conn.source_terminal_id = sourceTerminalId;
+ }
+ };
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ const list = App.connectionDirection === 'input' ? App.inputs : App.outputs;
+ updateLocal(list.find(c => c.id == App.editConnectionId));
+ renderEditor();
+ showToast('Verbindung aktualisiert', 'success');
+ } else {
+ showToast(response.error || 'Fehler', 'error');
+ }
+ } catch (err) {
+ queueOfflineAction(data);
+ showToast('Wird synchronisiert...', 'warning');
+ }
+ } else {
+ queueOfflineAction(data);
+ const list = App.connectionDirection === 'input' ? App.inputs : App.outputs;
+ updateLocal(list.find(c => c.id == App.editConnectionId));
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+ } else {
+ // Neu anlegen
+ const data = {
+ action: 'create_connection',
+ equipment_id: App.connectionEquipmentId,
+ direction: App.connectionDirection,
+ connection_type: connectionType,
+ color: color,
+ output_label: outputLabel,
+ medium_type: mediumType,
+ medium_spec: mediumSpec,
+ medium_length: mediumLength,
+ source_terminal: sourceTerminal,
+ source_terminal_id: sourceTerminalId
+ };
+
+ const newConnBase = {
+ connection_type: connectionType,
+ color: color,
+ output_label: outputLabel,
+ medium_type: mediumType,
+ medium_spec: mediumSpec,
+ medium_length: mediumLength,
+ is_top: isTop,
+ source_terminal_id: sourceTerminalId
+ };
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ const newConn = Object.assign({ id: response.connection_id }, newConnBase);
+ if (App.connectionDirection === 'input') {
+ newConn.fk_target = App.connectionEquipmentId;
+ App.inputs.push(newConn);
+ } else {
+ newConn.fk_source = App.connectionEquipmentId;
+ App.outputs.push(newConn);
+ }
+ renderEditor();
+ showToast('Verbindung angelegt', 'success');
+ } else {
+ showToast(response.error || 'Fehler', 'error');
+ }
+ } catch (err) {
+ queueOfflineAction(data);
+ showToast('Wird synchronisiert...', 'warning');
+ }
+ } else {
+ queueOfflineAction(data);
+ const newConn = Object.assign({ id: 'temp_' + Date.now() }, newConnBase);
+ if (App.connectionDirection === 'input') {
+ newConn.fk_target = App.connectionEquipmentId;
+ App.inputs.push(newConn);
+ } else {
+ newConn.fk_source = App.connectionEquipmentId;
+ App.outputs.push(newConn);
+ }
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+ }
+
+ App.editConnectionId = null;
+ }
+
+ /**
+ * Connection löschen (mit Bestätigung)
+ */
+ function handleDeleteConnectionConfirm() {
+ const connId = App.editConnectionId;
+ if (!connId) return;
+
+ $('#confirm-title').text('Verbindung löschen?');
+ $('#confirm-message').text('Diese Verbindung wirklich löschen?');
+
+ App.confirmCallback = () => deleteConnection(connId);
+
+ closeModal('connection');
+ openModal('confirm');
+ }
+
+ async function deleteConnection(connId) {
+ const data = {
+ action: 'delete_connection',
+ connection_id: connId
+ };
+
+ if (App.isOnline) {
+ try {
+ const response = await apiCall('ajax/pwa_api.php', data);
+ if (response.success) {
+ App.outputs = App.outputs.filter(o => o.id != connId);
+ App.inputs = App.inputs.filter(i => i.id != connId);
+ renderEditor();
+ showToast('Verbindung gelöscht', 'success');
+ } else {
+ showToast(response.error || 'Fehler', 'error');
+ }
+ } catch (err) {
+ queueOfflineAction(data);
+ App.outputs = App.outputs.filter(o => o.id != connId);
+ App.inputs = App.inputs.filter(i => i.id != connId);
+ renderEditor();
+ }
+ } else {
+ queueOfflineAction(data);
+ App.outputs = App.outputs.filter(o => o.id != connId);
+ App.inputs = App.inputs.filter(i => i.id != connId);
+ renderEditor();
+ showToast('Wird synchronisiert...', 'warning');
+ }
+
+ App.editConnectionId = null;
}
// ============================================
diff --git a/pwa.php b/pwa.php
index ea67405..d5aa843 100644
--- a/pwa.php
+++ b/pwa.php
@@ -44,7 +44,7 @@ $themeColor = getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#3498db');
-
+
@@ -125,9 +125,6 @@ $themeColor = getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#3498db');
Anlage
-