Noch keine Felder angelegt.
Tippe auf "+ Feld" um zu beginnen.
');
@@ -725,40 +842,126 @@
`;
- // === Zeile 1: Terminals oben (Inputs + Top-Outputs) ===
+ // === Zeile 1: Abgang-Labels OBEN (nur wenn Abgang oben ist) ===
carrierEquipment.forEach(eq => {
const widthTe = parseFloat(eq.width_te) || 1;
const posTe = parseFloat(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) : [];
- 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;
+ // Terminal-Anzahl aus terminals_config ermitteln (Fallback auf widthTe)
+ const type = App.equipmentTypes.find(t => t.id == eq.fk_equipment_type);
+ const topTerminalCount = getTerminalCount(type, 'top', widthTe);
- 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 += ``;
+ // Gebündelter Abgang? (alle Terminals eines breiten Equipment belegt)
+ const bundledTop = eqTopOutputs.find(o => o.bundled_terminals === 'all');
+
+ if (bundledTop && widthTe > 1) {
+ // Gebündeltes Label mit Pfeil: Über alle Spalten des Equipment spannen
+ const gridColStyle = posTe > 0
+ ? `grid-row:1; grid-column: ${posTe} / span ${widthTe}`
+ : `grid-row:1; grid-column: span ${widthTe}`;
+ const cableInfo = buildCableInfo(bundledTop);
+ const phaseColor = bundledTop.color || getPhaseColor(bundledTop.connection_type);
+ html += ``;
+ // Container für vertikale Anordnung: Label oben, Pfeil unten
+ html += ``;
+ if (bundledTop.output_label) {
+ html += `${escapeHtml(bundledTop.output_label)}`;
+ if (cableInfo) html += `${escapeHtml(cableInfo)}`;
html += ``;
}
+ html += ``;
+ html += ``;
+ if (bundledTop.connection_type) html += `${escapeHtml(bundledTop.connection_type)}`;
+ html += ``;
+ html += ``;
+ html += ``;
+ } else {
+ // Normale einzelne Labels pro Terminal - nur für tatsächliche Terminals
+ for (let t = 0; t < topTerminalCount; t++) {
+ const colPos = posTe > 0 ? posTe + t : 0;
+ const style = `grid-row:1;${colPos > 0 ? ' grid-column:' + colPos : ''}`;
+ const topOut = eqTopOutputs[t] || null;
+
+ if (topOut && topOut.output_label && (!topOut.bundled_terminals || widthTe <= 1)) {
+ const cableInfo = buildCableInfo(topOut);
+ html += ``;
+ html += `${escapeHtml(topOut.output_label)}`;
+ if (cableInfo) html += `${escapeHtml(cableInfo)}`;
+ html += ``;
+ html += ``;
+ } else {
+ html += ``;
+ }
+ }
+ // Leere Zellen für restliche TE-Breite
+ for (let t = topTerminalCount; t < widthTe; t++) {
+ const colPos = posTe > 0 ? posTe + t : 0;
+ const style = `grid-row:1;${colPos > 0 ? ' grid-column:' + colPos : ''}`;
+ html += ``;
+ }
}
});
- // === Zeile 2: Equipment-Blöcke ===
+ // === Zeile 2: Terminal-Punkte OBEN (direkt am Equipment) ===
+ carrierEquipment.forEach(eq => {
+ const widthTe = parseFloat(eq.width_te) || 1;
+ const posTe = parseFloat(eq.position_te) || 0;
+ const eqInputs = App.inputs ? App.inputs.filter(i => i.fk_target == eq.id && i.target_terminal_id === 't1') : [];
+ const eqTopOutputs = App.outputs ? App.outputs.filter(o => o.fk_source == eq.id && o.is_top) : [];
+
+ // Terminal-Anzahl aus terminals_config ermitteln
+ const type = App.equipmentTypes.find(t => t.id == eq.fk_equipment_type);
+ const topTerminalCount = getTerminalCount(type, 'top', widthTe);
+
+ // Gebündelter Abgang?
+ const bundledTop = eqTopOutputs.find(o => o.bundled_terminals === 'all');
+
+ // Nur so viele Terminal-Punkte wie tatsächlich konfiguriert
+ for (let t = 0; t < topTerminalCount; t++) {
+ const colPos = posTe > 0 ? posTe + t : 0;
+ const style = `grid-row:2;${colPos > 0 ? ' grid-column:' + colPos : ''}`;
+ const inp = eqInputs[t] || null;
+ const topOut = bundledTop || eqTopOutputs[t] || null;
+
+ if (bundledTop && widthTe > 1) {
+ // Gebündelter Abgang: Pfeil ist bereits im Label (Zeile 1) - hier nur leere Zelle
+ html += ``;
+ } else if (topOut && (!topOut.bundled_terminals || widthTe <= 1)) {
+ // Normaler Top-Output ODER bundled bei 1 TE (Bundle macht bei 1 TE keinen Unterschied)
+ const phaseColor = topOut.color || getPhaseColor(topOut.connection_type);
+ html += ``;
+ html += ``;
+ html += `${escapeHtml(topOut.connection_type || '')}`;
+ html += ``;
+ } else if (inp) {
+ const phaseColor = inp.color || getPhaseColor(inp.connection_type);
+ html += ``;
+ html += ``;
+ html += `${escapeHtml(inp.connection_type || '')}`;
+ html += ``;
+ } else {
+ // Leerer Terminal - neutral, Position "top"
+ html += ``;
+ html += ``;
+ html += ``;
+ }
+ }
+ // Leere Zellen für restliche TE-Breite (ohne Terminal-Punkte)
+ for (let t = topTerminalCount; t < widthTe; t++) {
+ const colPos = posTe > 0 ? posTe + t : 0;
+ const style = `grid-row:2;${colPos > 0 ? ' grid-column:' + colPos : ''}`;
+ html += ``;
+ }
+ });
+
+ // === Zeile 3: Equipment-Blöcke ===
+ // Ermittle welche Equipment als Schutzgeräte dienen (werden von anderen referenziert)
+ const protectionDeviceIds = new Set();
+ carrierEquipment.forEach(eq => {
+ if (eq.fk_protection) protectionDeviceIds.add(eq.fk_protection);
+ });
+
carrierEquipment.forEach(eq => {
const type = App.equipmentTypes.find(t => t.id == eq.fk_equipment_type);
const widthTe = parseFloat(eq.width_te) || 1;
@@ -771,11 +974,30 @@
const showBlockFields = blockFields && blockFields !== typeLabel && blockFields !== (type?.ref || '');
const gridCol = posTe > 0
- ? `grid-row:2; grid-column: ${posTe} / span ${widthTe}`
- : `grid-row:2; grid-column: span ${widthTe}`;
+ ? `grid-row:3; grid-column: ${posTe} / span ${widthTe}`
+ : `grid-row:3; grid-column: span ${widthTe}`;
+
+ // Schutzgruppen-Darstellung
+ let protectionStyle = '';
+ let protectionClass = '';
+
+ // 1. Ist dieses Equipment ein Schutzgerät? (wird von anderen referenziert)
+ const isProtectionDevice = protectionDeviceIds.has(eq.id);
+ if (isProtectionDevice) {
+ const deviceColor = getProtectionColor(eq.id);
+ protectionStyle = `border-left: 4px solid ${deviceColor};`;
+ protectionClass = ' is-protection-device';
+ }
+
+ // 2. Ist dieses Equipment einem Schutzgerät zugeordnet?
+ if (eq.fk_protection) {
+ const protectionColor = getProtectionColor(eq.fk_protection);
+ protectionStyle += `border-bottom: 3px solid ${protectionColor};`;
+ protectionClass += ' has-protection';
+ }
html += `
-
+
${escapeHtml(typeLabel)}
${showBlockFields ? `
${escapeHtml(blockFields)}` : ''}
${escapeHtml(eqLabel)}
@@ -783,34 +1005,123 @@
`;
});
- // +-Button in letzter Spalte (auto), Zeile 2
+ // +-Button in letzter Spalte (auto), Zeile 3
html += `
-
';
+ html += '
Verbindungen
';
+ html += '
';
+
+ // Verbindungen VON diesem Equipment
+ connectionsFrom.forEach(c => {
+ const targetEq = App.equipment.find(e => e.id == c.fk_target);
+ const targetLabel = targetEq?.label || targetEq?.block_label || 'Equipment ' + c.fk_target;
+ const color = c.color || getPhaseColor(c.connection_type);
+ html += `
+
+
+
→ ${escapeHtml(targetLabel)}
+
${escapeHtml(c.connection_type || '')}
+
+
`;
+ });
+
+ // Verbindungen ZU diesem Equipment
+ connectionsTo.forEach(c => {
+ const sourceEq = App.equipment.find(e => e.id == c.fk_source);
+ const sourceLabel = sourceEq?.label || sourceEq?.block_label || 'Equipment ' + c.fk_source;
+ const color = c.color || getPhaseColor(c.connection_type);
+ html += `
+
+
+
← ${escapeHtml(sourceLabel)}
+
${escapeHtml(c.connection_type || '')}
+
+
`;
+ });
+
+ html += '
';
+ html += '
Schutzeinrichtung
';
+ html += '
';
+ html += `
+
+
+
${escapeHtml(protLabel)}
+
${escapeHtml(protTypeLabel)} ${escapeHtml(protectionEq.block_label || '')}
+
+
`;
+ html += '
';
+ html += '
Schützt
';
+ html += '
';
+ protectedEquipment.forEach(pe => {
+ const peLabel = pe.label || pe.block_label || 'Equipment';
+ html += `
+
+
+
${escapeHtml(peLabel)}
+
+
`;
+ });
+ html += '
';
@@ -1610,6 +2074,9 @@
await loadTypeFields(eq.fk_equipment_type, eqId);
+ // Protection-Dropdown befüllen mit aktuellem Wert
+ populateProtectionDropdown(eq.fk_protection);
+
showEquipmentStep('fields');
openModal('add-equipment');
}
@@ -1711,9 +2178,122 @@
// CONNECTION (TERMINAL) ACTIONS
// ============================================
+ /**
+ * Kabel-Info aus Connection zusammenbauen
+ */
+ function buildCableInfo(conn) {
+ const parts = [];
+ if (conn.medium_type) parts.push(conn.medium_type);
+ if (conn.medium_spec) parts.push(conn.medium_spec);
+ if (conn.medium_length) parts.push('(' + conn.medium_length + ')');
+ return parts.join(' ');
+ }
+
+ /**
+ * Click-Handler für Terminal-Labels (zum Bearbeiten)
+ */
+ function handleTerminalLabelClick(e) {
+ e.stopPropagation();
+ const $cell = $(this);
+ const connId = $cell.data('connection-id');
+ const eqId = $cell.data('equipment-id');
+ const direction = $cell.data('direction') || 'output';
+
+ if (!connId) return;
+
+ // Connection aus App-State finden
+ const conn = direction === 'input'
+ ? App.inputs.find(i => i.id == connId)
+ : App.outputs.find(o => o.id == connId);
+
+ if (!conn) return;
+
+ // Terminal-Position ermitteln
+ const terminalPosition = conn.is_top ? 'top' : 'bottom';
+
+ // Connection-Bearbeitungsmodus mit vorhandenen Daten
+ openEditConnectionDialog(eqId, direction, terminalPosition, conn);
+ }
+
+ /**
+ * Connection-Dialog im Bearbeitungsmodus öffnen
+ */
+ async function openEditConnectionDialog(eqId, direction, terminalPosition, conn) {
+ App.connectionEquipmentId = eqId;
+ App.connectionDirection = direction;
+ App.connectionTerminalPosition = terminalPosition;
+ App.editConnectionId = conn.id;
+
+ renderTypeSelect(direction, conn.connection_type || '');
+ $('#connection-modal-title').text(direction === 'input' ? 'Anschlusspunkt bearbeiten' : 'Abgang bearbeiten');
+ $('#btn-delete-connection').removeClass('hidden');
+ $('#conn-color').val(conn.color || '#3498db');
+ $('#conn-label').val(conn.output_label || '');
+ $('#conn-medium-length').val(conn.medium_length || '');
+
+ // Medium-Typen laden und Select befüllen
+ await loadMediumTypes();
+ renderMediumTypeSelect(conn.medium_type || '');
+
+ // Medium-Spec laden falls Typ gewählt
+ if (conn.medium_type) {
+ // Trigger change um Specs zu laden, dann Wert setzen
+ handleMediumTypeChange();
+ if (conn.medium_spec) {
+ $('#conn-medium-spec').val(conn.medium_spec);
+ }
+ } else {
+ $('#conn-medium-spec').html('');
+ }
+
+ // Side-Button auf aktuelle Terminal-Position setzen
+ setSideButton(terminalPosition);
+
+ // Side-Buttons immer zeigen
+ $('#conn-side-fields').show();
+ // Medium-Felder nur bei Abgang zeigen
+ $('#conn-output-fields').toggle(direction === 'output');
+
+ // Bundle-Option: Nur bei Abgang + Equipment mit mehr als 1 Terminal
+ const eq = App.equipment ? App.equipment.find(e => e.id == eqId) : null;
+ const type = eq ? App.equipmentTypes.find(t => t.id == eq.fk_equipment_type) : null;
+ // terminalPosition kommt bereits als Parameter
+ const terminalCount = getTerminalCount(type, terminalPosition, parseFloat(eq?.width_te) || 1);
+ if (direction === 'output' && terminalCount > 1) {
+ $('#conn-bundle-fields').removeClass('hidden');
+ $('#conn-bundle-all').prop('checked', conn.bundled_terminals === 'all');
+ } else {
+ $('#conn-bundle-fields').addClass('hidden');
+ }
+
+ openModal('connection');
+ }
+
// 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'];
+ const OUTPUT_PHASES = ['LN', 'N', '3P+N', 'PE', 'DATA'];
+
+ /**
+ * Terminal-Anzahl aus Equipment-Typ ermitteln
+ * @param {object} type - Equipment-Typ mit terminals_config
+ * @param {string} position - 'top' oder 'bottom'
+ * @param {number} fallback - Fallback-Wert (normalerweise width_te)
+ * @returns {number} Anzahl der Terminals
+ */
+ function getTerminalCount(type, position, fallback) {
+ if (!type || !type.terminals_config) return fallback;
+ try {
+ const config = typeof type.terminals_config === 'string'
+ ? JSON.parse(type.terminals_config)
+ : type.terminals_config;
+ if (config.terminals && Array.isArray(config.terminals)) {
+ return config.terminals.filter(t => t.pos === position).length;
+ }
+ } catch (e) {
+ // JSON-Parse-Fehler ignorieren
+ }
+ return fallback;
+ }
/**
* Phasenfarbe ermitteln (DIN VDE Farben)
@@ -1722,12 +2302,37 @@
const colors = {
'L1': '#8B4513', 'L2': '#1a1a1a', 'L3': '#666',
'N': '#0066cc', 'PE': '#27ae60',
- 'L1N': '#8B4513', 'L2N': '#1a1a1a', 'L3N': '#666',
+ 'LN': '#8B4513', // Phase+Neutral - braun wie L1
+ 'L1N': '#8B4513', 'L2N': '#1a1a1a', 'L3N': '#666', // Legacy
'3P': '#e74c3c', '3P+N': '#e74c3c', 'DATA': '#9b59b6'
};
return colors[type] || '#888';
}
+ /**
+ * Schutzgruppen-Farbe ermitteln (eindeutig pro protection_id)
+ */
+ const protectionColorCache = {};
+ function getProtectionColor(protectionId) {
+ if (!protectionId) return null;
+ if (protectionColorCache[protectionId]) return protectionColorCache[protectionId];
+
+ // Helle, gut sichtbare Farben für Schutzgruppen
+ const colors = [
+ '#e74c3c', // Rot
+ '#3498db', // Blau
+ '#f39c12', // Orange
+ '#9b59b6', // Lila
+ '#1abc9c', // Türkis
+ '#e91e63', // Pink
+ '#00bcd4', // Cyan
+ '#ff5722', // Deep Orange
+ ];
+ const idx = Object.keys(protectionColorCache).length % colors.length;
+ protectionColorCache[protectionId] = colors[idx];
+ return colors[idx];
+ }
+
/**
* Abgangsseite-Button setzen
*/
@@ -1757,24 +2362,25 @@
}
/**
- * Klick auf Terminal-Zelle (Input oder Output)
+ * Klick auf Terminal-Zelle
+ * Bei vorhandener Verbindung: direkt bearbeiten
+ * Bei leerem Terminal: Kontextmenü mit Wahl Input/Output
*/
function handleTerminalClick(e) {
e.stopPropagation();
const $point = $(this);
const eqId = $point.data('equipment-id');
- const direction = $point.data('direction');
+ const terminalPosition = $point.data('terminal-position'); // 'top' oder 'bottom'
const connId = $point.data('connection-id');
- App.connectionEquipmentId = eqId;
- App.connectionDirection = direction;
-
- // Typ-Select befüllen
- renderTypeSelect(direction, '');
-
+ // Bestehende Verbindung? -> Direkt bearbeiten
if (connId) {
- // Bearbeiten
+ const direction = $point.data('direction');
+ App.connectionEquipmentId = eqId;
+ App.connectionDirection = direction;
+ App.connectionTerminalPosition = terminalPosition;
App.editConnectionId = connId;
+
$('#connection-modal-title').text('Verbindung bearbeiten');
$('#btn-delete-connection').removeClass('hidden');
@@ -1786,27 +2392,212 @@
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');
+
+ // Medium-Typen laden und Select befüllen
+ loadMediumTypes().then(() => {
+ renderMediumTypeSelect(conn.medium_type || '');
+ // Spezifikation Select befüllen basierend auf gewähltem Typ
+ handleMediumTypeChange();
+ // Gespeicherte Spezifikation setzen
+ if (conn.medium_spec) {
+ $('#conn-medium-spec').val(conn.medium_spec);
+ }
+ });
+
+ // Terminal-Position aus gespeicherter Verbindung
+ const connIsTop = conn.is_top || (conn.target_terminal_id === 't1');
+ setSideButton(connIsTop ? 'top' : 'bottom');
}
+
+ // Side-Buttons immer zeigen (Automaten haben keine feste Richtung)
+ $('#conn-side-fields').show();
+ // Medium-Felder nur bei Abgang zeigen
+ $('#conn-output-fields').toggle(direction === 'output');
+
+ // Bundle-Option: Nur bei Abgang + Equipment mit mehr als 1 Terminal
+ const eq = App.equipment ? App.equipment.find(e => e.id == eqId) : null;
+ const type = eq ? App.equipmentTypes.find(t => t.id == eq.fk_equipment_type) : null;
+ const connIsTop = conn && (conn.is_top || conn.target_terminal_id === 't1');
+ const termCount = getTerminalCount(type, connIsTop ? 'top' : 'bottom', parseFloat(eq?.width_te) || 1);
+ if (direction === 'output' && termCount > 1) {
+ $('#conn-bundle-fields').removeClass('hidden');
+ $('#conn-bundle-all').prop('checked', conn && conn.bundled_terminals === 'all');
+ } else {
+ $('#conn-bundle-fields').addClass('hidden');
+ }
+
+ openModal('connection');
} 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');
+ // Leerer Terminal -> Kontextmenü anzeigen
+ showTerminalContextMenu(e, eqId, terminalPosition);
+ }
+ }
+
+ /**
+ * Kontextmenü für leere Terminals: Wahl zwischen Anschlusspunkt und Abgang
+ */
+ function showTerminalContextMenu(e, eqId, terminalPosition) {
+ // Altes Menü entfernen
+ $('.terminal-context-menu').remove();
+
+ const x = e.touches ? e.touches[0].clientX : e.clientX;
+ const y = e.touches ? e.touches[0].clientY : e.clientY;
+
+ const html = `
+
+ `;
+
+ $('body').append(html);
+
+ // Click Handler
+ $('.tcm-item').on('click', function() {
+ const direction = $(this).data('type');
+ $('.terminal-context-menu').remove();
+ openConnectionDialog(eqId, direction, terminalPosition);
+ });
+
+ // Schließen bei Klick außerhalb
+ setTimeout(() => {
+ $(document).one('click', () => $('.terminal-context-menu').remove());
+ }, 10);
+ }
+
+ /**
+ * Medium-Typen (Kabeltypen) aus DB laden und cachen
+ */
+ async function loadMediumTypes() {
+ if (App.mediumTypes) return App.mediumTypes;
+
+ try {
+ // Nutze pwa_api.php für Token-basierte Authentifizierung
+ const response = await apiCall('ajax/pwa_api.php', {
+ action: 'get_medium_types'
+ });
+ console.log('[PWA] loadMediumTypes response:', response);
+
+ if (response.success && response.groups) {
+ App.mediumTypes = response.groups;
+ // Cache für Offline
+ localStorage.setItem('kundenkarte_medium_types', JSON.stringify(response.groups));
+ return response.groups;
+ } else {
+ console.warn('[PWA] loadMediumTypes: no groups in response');
+ }
+ } catch (err) {
+ console.error('[PWA] loadMediumTypes error:', err);
+ // Fallback auf Cache
+ const cached = localStorage.getItem('kundenkarte_medium_types');
+ if (cached) {
+ App.mediumTypes = JSON.parse(cached);
+ return App.mediumTypes;
+ }
}
+ // Fallback auf statische Liste
+ return null;
+ }
+
+ /**
+ * Medium-Type Select befüllen
+ */
+ function renderMediumTypeSelect(selectedValue) {
+ const groups = App.mediumTypes;
+ let html = '';
+
+ if (groups && groups.length > 0) {
+ groups.forEach(group => {
+ html += `';
+ });
+ } else {
+ // Fallback auf statische Liste
+ ['NYM-J', 'NYY-J', 'H07V-K', 'CAT6', 'CAT7'].forEach(t => {
+ const selected = (selectedValue === t) ? ' selected' : '';
+ html += ``;
+ });
+ }
+
+ $('#conn-medium-type').html(html);
+ }
+
+ /**
+ * Medium-Type Change Handler - Spezifikationen laden
+ */
+ function handleMediumTypeChange() {
+ const $option = $('#conn-medium-type option:selected');
+ const specs = $option.data('specs');
+ const defaultSpec = $option.data('default');
+
+ let html = '';
+
+ if (specs && specs.length > 0) {
+ specs.forEach(spec => {
+ const selected = (spec === defaultSpec) ? ' selected' : '';
+ html += ``;
+ });
+ } else {
+ html = '';
+ }
+
+ $('#conn-medium-spec').html(html);
+ }
+
+ /**
+ * Verbindungs-Dialog öffnen (nach Auswahl Input/Output)
+ */
+ async function openConnectionDialog(eqId, direction, terminalPosition) {
+ App.connectionEquipmentId = eqId;
+ App.connectionDirection = direction;
+ App.connectionTerminalPosition = terminalPosition;
+ App.editConnectionId = null;
+
+ renderTypeSelect(direction, '');
+ $('#connection-modal-title').text(direction === 'input' ? 'Anschlusspunkt' : 'Abgang');
+ $('#btn-delete-connection').addClass('hidden');
+ $('#conn-color').val('#3498db');
+ $('#conn-label').val('');
+ $('#conn-medium-length').val('');
+
+ // Medium-Typen laden und Select befüllen
+ await loadMediumTypes();
+ renderMediumTypeSelect('');
+ $('#conn-medium-spec').html('');
+
+ // Side-Button auf aktuelle Terminal-Position setzen
+ setSideButton(terminalPosition || 'bottom');
+
+ // Side-Buttons immer zeigen (Automaten haben keine feste Richtung)
+ $('#conn-side-fields').show();
// Medium-Felder nur bei Abgang zeigen
$('#conn-output-fields').toggle(direction === 'output');
+ // Bundle-Option: Nur bei Abgang + Equipment mit mehr als 1 Terminal
+ const eq = App.equipment ? App.equipment.find(e => e.id == eqId) : null;
+ const type = eq ? App.equipmentTypes.find(t => t.id == eq.fk_equipment_type) : null;
+ const termCount = getTerminalCount(type, terminalPosition || 'bottom', parseFloat(eq?.width_te) || 1);
+ if (direction === 'output' && termCount > 1) {
+ $('#conn-bundle-fields').removeClass('hidden');
+ $('#conn-bundle-all').prop('checked', false);
+ } else {
+ $('#conn-bundle-fields').addClass('hidden');
+ }
+
openModal('connection');
}
@@ -1821,10 +2612,19 @@
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 bundledTerminals = isOutput && $('#conn-bundle-all').is(':checked') ? 'all' : '';
+
+ // Terminal-Position: t1=oben, t2=unten (gilt für Input UND Output)
+ // Bei Bearbeitung: Side-Button-Auswahl verwenden, sonst die ursprüngliche Position
+ const terminalPosition = App.editConnectionId ? getSelectedSide() : (App.connectionTerminalPosition || 'bottom');
+ const isTop = terminalPosition === 'top';
+ const terminalId = isTop ? 't1' : 't2';
+
+ // Für Output: source_terminal
+ const sourceTerminalId = isOutput ? terminalId : '';
const sourceTerminal = isOutput ? (isTop ? 'top' : 'output') : '';
+ // Für Input: target_terminal
+ const targetTerminalId = !isOutput ? terminalId : '';
closeModal('connection');
@@ -1840,7 +2640,8 @@
medium_spec: mediumSpec,
medium_length: mediumLength,
source_terminal: sourceTerminal,
- source_terminal_id: sourceTerminalId
+ source_terminal_id: sourceTerminalId,
+ bundled_terminals: bundledTerminals
};
const updateLocal = (conn) => {
@@ -1851,6 +2652,7 @@
conn.medium_type = mediumType;
conn.medium_spec = mediumSpec;
conn.medium_length = mediumLength;
+ conn.bundled_terminals = bundledTerminals;
if (isOutput) {
conn.is_top = isTop;
conn.source_terminal_id = sourceTerminalId;
@@ -1892,7 +2694,9 @@
medium_spec: mediumSpec,
medium_length: mediumLength,
source_terminal: sourceTerminal,
- source_terminal_id: sourceTerminalId
+ source_terminal_id: sourceTerminalId,
+ target_terminal_id: targetTerminalId,
+ bundled_terminals: bundledTerminals
};
const newConnBase = {
@@ -1902,8 +2706,10 @@
medium_type: mediumType,
medium_spec: mediumSpec,
medium_length: mediumLength,
+ bundled_terminals: bundledTerminals,
is_top: isTop,
- source_terminal_id: sourceTerminalId
+ source_terminal_id: sourceTerminalId,
+ target_terminal_id: targetTerminalId
};
if (App.isOnline) {
@@ -2115,11 +2921,12 @@
}
function showOfflineBar() {
- $('#offline-indicator').removeClass('hidden');
+ // Status-Indikator entfernt - nur Toast-Nachricht
+ showToast('Offline', 'warning');
}
function hideOfflineBar() {
- $('#offline-indicator').addClass('hidden');
+ // Status-Indikator entfernt
}
function escapeHtml(text) {
diff --git a/pwa.php b/pwa.php
index 9cb6910..b9b5c15 100644
--- a/pwa.php
+++ b/pwa.php
@@ -44,7 +44,7 @@ $themeColor = getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#3498db');
-
+
@@ -98,8 +98,12 @@ $themeColor = getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#3498db');
-
- ⚡ Offline-Modus
+
+
+
Zuletzt bearbeitet
+
+
+