';
diff --git a/ajax/equipment.php b/ajax/equipment.php
index e93860b..d58ec97 100644
--- a/ajax/equipment.php
+++ b/ajax/equipment.php
@@ -66,6 +66,9 @@ switch ($action) {
'fk_carrier' => $equipment->fk_carrier,
'type_id' => $equipment->fk_equipment_type,
'type_label' => $equipment->type_label,
+ 'type_label_short' => $equipment->type_label_short,
+ 'type_color' => $equipment->type_color,
+ 'type_icon_file' => $equipment->type_icon_file,
'label' => $equipment->label,
'position_te' => $equipment->position_te,
'width_te' => $equipment->width_te,
@@ -107,6 +110,10 @@ switch ($action) {
$items = $equipment->fetchByCarrier($carrierId);
$result = array();
foreach ($items as $eq) {
+ $iconUrl = '';
+ if (!empty($eq->type_icon_file)) {
+ $iconUrl = DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=equipment_icons/'.urlencode($eq->type_icon_file);
+ }
$result[] = array(
'id' => $eq->id,
'type_id' => $eq->fk_equipment_type,
@@ -114,6 +121,8 @@ switch ($action) {
'type_label_short' => $eq->type_label_short,
'type_ref' => $eq->type_ref,
'type_color' => $eq->type_color,
+ 'type_icon_file' => $eq->type_icon_file,
+ 'type_icon_url' => $iconUrl,
'terminals_config' => $eq->terminals_config,
'label' => $eq->label,
'position_te' => $eq->position_te,
@@ -301,14 +310,21 @@ switch ($action) {
if ($newEquipment->fetch($newId) > 0) {
$response['equipment'] = array(
'id' => $newEquipment->id,
+ 'fk_carrier' => $newEquipment->fk_carrier,
'type_id' => $newEquipment->fk_equipment_type,
'type_label' => $newEquipment->type_label,
+ 'type_label_short' => $newEquipment->type_label_short,
'type_color' => $newEquipment->type_color,
+ 'type_ref' => $newEquipment->type_ref,
+ 'type_icon_file' => $newEquipment->type_icon_file,
+ 'terminals_config' => $newEquipment->terminals_config,
'label' => $newEquipment->label,
'position_te' => $newEquipment->position_te,
'width_te' => $newEquipment->width_te,
'block_label' => $newEquipment->getBlockLabel(),
- 'block_color' => $newEquipment->getBlockColor()
+ 'block_color' => $newEquipment->getBlockColor(),
+ 'field_values' => $newEquipment->getFieldValues(),
+ 'fk_product' => $newEquipment->fk_product
);
}
} else {
diff --git a/ajax/equipment_connection.php b/ajax/equipment_connection.php
index 2d0173e..7617900 100644
--- a/ajax/equipment_connection.php
+++ b/ajax/equipment_connection.php
@@ -153,6 +153,7 @@ switch ($action) {
$connection->rail_end_te = GETPOSTINT('rail_end_te');
$connection->fk_carrier = $carrierId;
$connection->position_y = GETPOSTINT('position_y');
+ $connection->path_data = GETPOST('path_data', 'nohtml');
$result = $connection->create($user);
if ($result > 0) {
@@ -169,22 +170,24 @@ switch ($action) {
break;
}
if ($connection->fetch($connectionId) > 0) {
- $connection->fk_source = GETPOSTINT('fk_source');
- $connection->source_terminal = GETPOST('source_terminal', 'alphanohtml') ?: 'output';
- $connection->fk_target = GETPOSTINT('fk_target');
- $connection->target_terminal = GETPOST('target_terminal', 'alphanohtml') ?: 'input';
- $connection->connection_type = GETPOST('connection_type', 'alphanohtml');
- $connection->color = GETPOST('color', 'alphanohtml');
- $connection->output_label = GETPOST('output_label', 'alphanohtml');
- $connection->medium_type = GETPOST('medium_type', 'alphanohtml');
- $connection->medium_spec = GETPOST('medium_spec', 'alphanohtml');
- $connection->medium_length = GETPOST('medium_length', 'alphanohtml');
- $connection->is_rail = GETPOSTINT('is_rail');
- $connection->rail_start_te = GETPOSTINT('rail_start_te');
- $connection->rail_end_te = GETPOSTINT('rail_end_te');
- $connection->rail_phases = GETPOST('rail_phases', 'alphanohtml');
- $connection->excluded_te = GETPOST('excluded_te', 'alphanohtml');
- $connection->position_y = GETPOSTINT('position_y');
+ // Only update fields that are actually sent (preserve existing values)
+ if (GETPOSTISSET('fk_source')) $connection->fk_source = GETPOSTINT('fk_source');
+ if (GETPOSTISSET('source_terminal')) $connection->source_terminal = GETPOST('source_terminal', 'alphanohtml') ?: $connection->source_terminal;
+ if (GETPOSTISSET('fk_target')) $connection->fk_target = GETPOSTINT('fk_target');
+ if (GETPOSTISSET('target_terminal')) $connection->target_terminal = GETPOST('target_terminal', 'alphanohtml') ?: $connection->target_terminal;
+ if (GETPOSTISSET('connection_type')) $connection->connection_type = GETPOST('connection_type', 'alphanohtml');
+ if (GETPOSTISSET('color')) $connection->color = GETPOST('color', 'alphanohtml');
+ if (GETPOSTISSET('output_label')) $connection->output_label = GETPOST('output_label', 'alphanohtml');
+ if (GETPOSTISSET('medium_type')) $connection->medium_type = GETPOST('medium_type', 'alphanohtml');
+ if (GETPOSTISSET('medium_spec')) $connection->medium_spec = GETPOST('medium_spec', 'alphanohtml');
+ if (GETPOSTISSET('medium_length')) $connection->medium_length = GETPOST('medium_length', 'alphanohtml');
+ if (GETPOSTISSET('is_rail')) $connection->is_rail = GETPOSTINT('is_rail');
+ if (GETPOSTISSET('rail_start_te')) $connection->rail_start_te = GETPOSTINT('rail_start_te');
+ if (GETPOSTISSET('rail_end_te')) $connection->rail_end_te = GETPOSTINT('rail_end_te');
+ if (GETPOSTISSET('rail_phases')) $connection->rail_phases = GETPOST('rail_phases', 'alphanohtml');
+ if (GETPOSTISSET('excluded_te')) $connection->excluded_te = GETPOST('excluded_te', 'alphanohtml');
+ if (GETPOSTISSET('position_y')) $connection->position_y = GETPOSTINT('position_y');
+ if (GETPOSTISSET('path_data')) $connection->path_data = GETPOST('path_data', 'nohtml');
$result = $connection->update($user);
if ($result > 0) {
@@ -276,30 +279,59 @@ switch ($action) {
require_once DOL_DOCUMENT_ROOT.'/custom/kundenkarte/class/equipmentcarrier.class.php';
$carrierObj = new EquipmentCarrier($db);
$carriers = $carrierObj->fetchByAnlage($anlageId);
+ $carrierIds = array();
+ foreach ($carriers as $carrier) {
+ $carrierIds[] = (int)$carrier->id;
+ }
$allConnections = array();
- foreach ($carriers as $carrier) {
- $connections = $connection->fetchByCarrier($carrier->id);
- foreach ($connections as $c) {
- $allConnections[] = array(
- 'id' => $c->id,
- 'fk_source' => $c->fk_source,
- 'source_terminal' => $c->source_terminal,
- 'source_terminal_id' => $c->source_terminal_id,
- 'source_label' => $c->source_label,
- 'fk_target' => $c->fk_target,
- 'target_terminal' => $c->target_terminal,
- 'target_terminal_id' => $c->target_terminal_id,
- 'target_label' => $c->target_label,
- 'connection_type' => $c->connection_type,
- 'color' => $c->getColor(),
- 'output_label' => $c->output_label,
- 'medium_type' => $c->medium_type,
- 'medium_spec' => $c->medium_spec,
- 'medium_length' => $c->medium_length,
- 'is_rail' => $c->is_rail,
- 'fk_carrier' => $c->fk_carrier
- );
+
+ if (!empty($carrierIds)) {
+ // Find all connections where source OR target equipment belongs to this anlage's carriers
+ // This includes connections with fk_carrier=NULL
+ $sql = "SELECT DISTINCT c.*,
+ se.label as source_label, se.position_te as source_pos, se.width_te as source_width,
+ te.label as target_label, te.position_te as target_pos
+ FROM ".MAIN_DB_PREFIX."kundenkarte_equipment_connection c
+ LEFT JOIN ".MAIN_DB_PREFIX."kundenkarte_equipment se ON c.fk_source = se.rowid
+ LEFT JOIN ".MAIN_DB_PREFIX."kundenkarte_equipment te ON c.fk_target = te.rowid
+ WHERE (c.fk_carrier IN (".implode(',', $carrierIds).")
+ OR se.fk_carrier IN (".implode(',', $carrierIds).")
+ OR te.fk_carrier IN (".implode(',', $carrierIds)."))
+ AND c.status = 1";
+
+ $resql = $db->query($sql);
+ if ($resql) {
+ while ($obj = $db->fetch_object($resql)) {
+ $allConnections[] = array(
+ 'id' => $obj->rowid,
+ 'fk_source' => $obj->fk_source,
+ 'source_terminal' => $obj->source_terminal,
+ 'source_terminal_id' => $obj->source_terminal_id,
+ 'source_label' => $obj->source_label,
+ 'source_pos' => $obj->source_pos,
+ 'source_width' => $obj->source_width,
+ 'fk_target' => $obj->fk_target,
+ 'target_terminal' => $obj->target_terminal,
+ 'target_terminal_id' => $obj->target_terminal_id,
+ 'target_label' => $obj->target_label,
+ 'target_pos' => $obj->target_pos,
+ 'connection_type' => $obj->connection_type,
+ 'color' => $obj->color ?: '#3498db',
+ 'output_label' => $obj->output_label,
+ 'medium_type' => $obj->medium_type,
+ 'medium_spec' => $obj->medium_spec,
+ 'medium_length' => $obj->medium_length,
+ 'is_rail' => $obj->is_rail,
+ 'rail_start_te' => $obj->rail_start_te,
+ 'rail_end_te' => $obj->rail_end_te,
+ 'rail_phases' => $obj->rail_phases,
+ 'position_y' => $obj->position_y,
+ 'fk_carrier' => $obj->fk_carrier,
+ 'path_data' => isset($obj->path_data) ? $obj->path_data : null
+ );
+ }
+ $db->free($resql);
}
}
diff --git a/ajax/equipment_type_icon.php b/ajax/equipment_type_icon.php
new file mode 100644
index 0000000..bb49998
--- /dev/null
+++ b/ajax/equipment_type_icon.php
@@ -0,0 +1,148 @@
+admin && !$user->hasRight('kundenkarte', 'admin')) {
+ echo json_encode(array('success' => false, 'error' => 'Access denied'));
+ exit;
+}
+
+$action = GETPOST('action', 'aZ09');
+$typeId = GETPOSTINT('type_id');
+
+$response = array('success' => false);
+
+// Directory for equipment type icons
+$uploadDir = DOL_DATA_ROOT.'/kundenkarte/equipment_icons/';
+
+// Create directory if not exists
+if (!is_dir($uploadDir)) {
+ dol_mkdir($uploadDir);
+}
+
+switch ($action) {
+ case 'upload':
+ if (empty($_FILES['icon_file']) || $_FILES['icon_file']['error'] !== UPLOAD_ERR_OK) {
+ $response['error'] = 'No file uploaded or upload error';
+ break;
+ }
+
+ $file = $_FILES['icon_file'];
+ $fileName = dol_sanitizeFileName($file['name']);
+ $fileExt = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
+
+ // Validate file type
+ $allowedExtensions = array('svg', 'png');
+ if (!in_array($fileExt, $allowedExtensions)) {
+ $response['error'] = 'Invalid file type. Only SVG and PNG are allowed.';
+ break;
+ }
+
+ // Validate MIME type
+ $mimeType = mime_content_type($file['tmp_name']);
+ $allowedMimes = array('image/svg+xml', 'image/png', 'text/plain', 'text/xml', 'application/xml');
+ if (!in_array($mimeType, $allowedMimes)) {
+ $response['error'] = 'Invalid MIME type: '.$mimeType;
+ break;
+ }
+
+ // For SVG files, do basic security check
+ if ($fileExt === 'svg') {
+ $content = file_get_contents($file['tmp_name']);
+ // Check for potentially dangerous content
+ $dangerous = array('
fetch($typeId) > 0) {
+ // Delete old icon file if exists
+ if ($equipmentType->icon_file && file_exists($uploadDir.$equipmentType->icon_file)) {
+ unlink($uploadDir.$equipmentType->icon_file);
+ }
+
+ $equipmentType->icon_file = $newFileName;
+ $result = $equipmentType->update($user);
+
+ if ($result > 0) {
+ $response['success'] = true;
+ $response['icon_file'] = $newFileName;
+ $response['icon_url'] = DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=equipment_icons/'.$newFileName;
+ } else {
+ $response['error'] = 'Database update failed';
+ // Remove uploaded file on DB error
+ unlink($destPath);
+ }
+ } else {
+ $response['error'] = 'Equipment type not found';
+ unlink($destPath);
+ }
+ } else {
+ $response['error'] = 'Failed to move uploaded file';
+ }
+ break;
+
+ case 'delete':
+ $equipmentType = new EquipmentType($db);
+ if ($equipmentType->fetch($typeId) > 0) {
+ if ($equipmentType->icon_file && file_exists($uploadDir.$equipmentType->icon_file)) {
+ unlink($uploadDir.$equipmentType->icon_file);
+ }
+ $equipmentType->icon_file = '';
+ $result = $equipmentType->update($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ } else {
+ $response['error'] = 'Database update failed';
+ }
+ } else {
+ $response['error'] = 'Equipment type not found';
+ }
+ break;
+
+ case 'get':
+ $equipmentType = new EquipmentType($db);
+ if ($equipmentType->fetch($typeId) > 0) {
+ $response['success'] = true;
+ $response['icon_file'] = $equipmentType->icon_file;
+ if ($equipmentType->icon_file) {
+ $response['icon_url'] = DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=equipment_icons/'.$equipmentType->icon_file;
+ }
+ } else {
+ $response['error'] = 'Equipment type not found';
+ }
+ break;
+
+ default:
+ $response['error'] = 'Unknown action';
+}
+
+echo json_encode($response);
+$db->close();
diff --git a/ajax/export_schematic_pdf.php b/ajax/export_schematic_pdf.php
new file mode 100644
index 0000000..077ed74
--- /dev/null
+++ b/ajax/export_schematic_pdf.php
@@ -0,0 +1,717 @@
+loadLangs(array('companies', 'kundenkarte@kundenkarte'));
+
+// Get parameters
+$anlageId = GETPOSTINT('anlage_id');
+$svgContent = GETPOST('svg_content', 'restricthtml');
+$format = GETPOST('format', 'alpha') ?: 'A4';
+$orientation = GETPOST('orientation', 'alpha') ?: 'L'; // L=Landscape, P=Portrait
+
+// Security check
+if (!$user->hasRight('kundenkarte', 'read')) {
+ accessforbidden();
+}
+
+// Load Anlage data
+$anlage = new Anlage($db);
+if ($anlage->fetch($anlageId) <= 0) {
+ die('Anlage not found');
+}
+
+// Load company
+$societe = new Societe($db);
+$societe->fetch($anlage->fk_soc);
+
+// Load carriers for this anlage
+$carrier = new EquipmentCarrier($db);
+$carriers = $carrier->fetchByAnlage($anlageId);
+
+// Load equipment
+$equipment = new Equipment($db);
+$equipmentList = array();
+foreach ($carriers as $c) {
+ $eqList = $equipment->fetchByCarrier($c->id);
+ $equipmentList = array_merge($equipmentList, $eqList);
+}
+
+// Load connections
+$connection = new EquipmentConnection($db);
+$connections = array();
+foreach ($carriers as $c) {
+ $connList = $connection->fetchByCarrier($c->id);
+ $connections = array_merge($connections, $connList);
+}
+
+// Create PDF - Landscape A3 or A4 for schematic
+$pdf = pdf_getInstance();
+$pdf->SetCreator('Dolibarr - Kundenkarte Schaltplan');
+$pdf->SetAuthor($user->getFullName($langs));
+$pdf->SetTitle('Leitungslaufplan - '.$anlage->label);
+
+// Page format
+if ($format == 'A3') {
+ $pageWidth = 420;
+ $pageHeight = 297;
+} else {
+ $pageWidth = 297;
+ $pageHeight = 210;
+}
+
+if ($orientation == 'P') {
+ $tmp = $pageWidth;
+ $pageWidth = $pageHeight;
+ $pageHeight = $tmp;
+}
+
+$pdf->SetMargins(10, 10, 10);
+$pdf->SetAutoPageBreak(false);
+$pdf->AddPage($orientation, array($pageWidth, $pageHeight));
+
+// ============================================
+// DIN EN 61082 / ISO 7200 Title Block (Schriftfeld)
+// Position: Bottom right corner
+// ============================================
+
+$titleBlockWidth = 180;
+$titleBlockHeight = 56;
+$titleBlockX = $pageWidth - $titleBlockWidth - 10;
+$titleBlockY = $pageHeight - $titleBlockHeight - 10;
+
+// Draw title block frame
+$pdf->SetDrawColor(0, 0, 0);
+$pdf->SetLineWidth(0.5);
+$pdf->Rect($titleBlockX, $titleBlockY, $titleBlockWidth, $titleBlockHeight);
+
+// Title block grid - following DIN structure
+// Row heights from bottom: 8, 8, 8, 8, 8, 8, 8 = 56mm total
+$rowHeight = 8;
+$rows = 7;
+
+// Column widths: 30 | 50 | 50 | 50 = 180mm
+$col1 = 30; // Labels
+$col2 = 50; // Company info
+$col3 = 50; // Document info
+$col4 = 50; // Revision info
+
+// Draw horizontal lines
+for ($i = 1; $i < $rows; $i++) {
+ $y = $titleBlockY + ($i * $rowHeight);
+ $pdf->Line($titleBlockX, $y, $titleBlockX + $titleBlockWidth, $y);
+}
+
+// Draw vertical lines
+$pdf->Line($titleBlockX + $col1, $titleBlockY, $titleBlockX + $col1, $titleBlockY + $titleBlockHeight);
+$pdf->Line($titleBlockX + $col1 + $col2, $titleBlockY, $titleBlockX + $col1 + $col2, $titleBlockY + $titleBlockHeight);
+$pdf->Line($titleBlockX + $col1 + $col2 + $col3, $titleBlockY, $titleBlockX + $col1 + $col2 + $col3, $titleBlockY + $titleBlockHeight);
+
+// Fill in title block content
+$pdf->SetFont('dejavusans', '', 6);
+$pdf->SetTextColor(0, 0, 0);
+
+// Row 1 (from top): Document title spanning full width
+$pdf->SetFont('dejavusans', 'B', 12);
+$pdf->SetXY($titleBlockX + 2, $titleBlockY + 1);
+$pdf->Cell($titleBlockWidth - 4, $rowHeight - 2, 'LEITUNGSLAUFPLAN', 0, 0, 'C');
+
+// Row 2: Installation name
+$pdf->SetFont('dejavusans', 'B', 10);
+$pdf->SetXY($titleBlockX + 2, $titleBlockY + $rowHeight + 1);
+$pdf->Cell($titleBlockWidth - 4, $rowHeight - 2, $anlage->label, 0, 0, 'C');
+
+// Row 3: Labels
+$pdf->SetFont('dejavusans', '', 6);
+$y = $titleBlockY + (2 * $rowHeight);
+$pdf->SetXY($titleBlockX + 1, $y + 1);
+$pdf->Cell($col1 - 2, 3, 'Erstellt', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + 1, $y + 1);
+$pdf->Cell($col2 - 2, 3, 'Kunde', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + 1, $y + 1);
+$pdf->Cell($col3 - 2, 3, 'Projekt-Nr.', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + $col3 + 1, $y + 1);
+$pdf->Cell($col4 - 2, 3, 'Blatt', 0, 0, 'L');
+
+// Row 3: Values
+$pdf->SetFont('dejavusans', '', 8);
+$pdf->SetXY($titleBlockX + 1, $y + 4);
+$pdf->Cell($col1 - 2, 4, dol_print_date(dol_now(), 'day'), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + 1, $y + 4);
+$pdf->Cell($col2 - 2, 4, dol_trunc($societe->name, 25), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + 1, $y + 4);
+$pdf->Cell($col3 - 2, 4, $anlage->ref ?: '-', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + $col3 + 1, $y + 4);
+$pdf->Cell($col4 - 2, 4, '1 / 1', 0, 0, 'L');
+
+// Row 4: More labels
+$y = $titleBlockY + (3 * $rowHeight);
+$pdf->SetFont('dejavusans', '', 6);
+$pdf->SetXY($titleBlockX + 1, $y + 1);
+$pdf->Cell($col1 - 2, 3, 'Bearbeiter', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + 1, $y + 1);
+$pdf->Cell($col2 - 2, 3, 'Adresse', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + 1, $y + 1);
+$pdf->Cell($col3 - 2, 3, 'Anlage', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + $col3 + 1, $y + 1);
+$pdf->Cell($col4 - 2, 3, 'Revision', 0, 0, 'L');
+
+// Row 4: Values
+$pdf->SetFont('dejavusans', '', 8);
+$pdf->SetXY($titleBlockX + 1, $y + 4);
+$pdf->Cell($col1 - 2, 4, dol_trunc($user->getFullName($langs), 15), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + 1, $y + 4);
+$address = trim($societe->address.' '.$societe->zip.' '.$societe->town);
+$pdf->Cell($col2 - 2, 4, dol_trunc($address, 25), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + 1, $y + 4);
+$pdf->Cell($col3 - 2, 4, $anlage->type_label ?: '-', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + $col3 + 1, $y + 4);
+$pdf->Cell($col4 - 2, 4, 'A', 0, 0, 'L');
+
+// Row 5: Equipment count
+$y = $titleBlockY + (4 * $rowHeight);
+$pdf->SetFont('dejavusans', '', 6);
+$pdf->SetXY($titleBlockX + 1, $y + 1);
+$pdf->Cell($col1 - 2, 3, 'Komponenten', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + 1, $y + 1);
+$pdf->Cell($col2 - 2, 3, 'Verbindungen', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + 1, $y + 1);
+$pdf->Cell($col3 - 2, 3, 'Hutschienen', 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + $col3 + 1, $y + 1);
+$pdf->Cell($col4 - 2, 3, 'Format', 0, 0, 'L');
+
+$pdf->SetFont('dejavusans', '', 8);
+$pdf->SetXY($titleBlockX + 1, $y + 4);
+$pdf->Cell($col1 - 2, 4, count($equipmentList), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + 1, $y + 4);
+$pdf->Cell($col2 - 2, 4, count($connections), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + 1, $y + 4);
+$pdf->Cell($col3 - 2, 4, count($carriers), 0, 0, 'L');
+$pdf->SetXY($titleBlockX + $col1 + $col2 + $col3 + 1, $y + 4);
+$pdf->Cell($col4 - 2, 4, $format.' '.$orientation, 0, 0, 'L');
+
+// Row 6: Norm reference
+$y = $titleBlockY + (5 * $rowHeight);
+$pdf->SetFont('dejavusans', '', 6);
+$pdf->SetXY($titleBlockX + 1, $y + 2);
+$pdf->Cell($titleBlockWidth - 2, 4, 'Erstellt nach DIN EN 61082 / DIN EN 81346', 0, 0, 'C');
+
+// Row 7: Company info
+$y = $titleBlockY + (6 * $rowHeight);
+$pdf->SetFont('dejavusans', 'B', 7);
+$pdf->SetXY($titleBlockX + 1, $y + 2);
+$pdf->Cell($titleBlockWidth - 2, 4, $mysoc->name, 0, 0, 'C');
+
+// ============================================
+// Draw the Schematic Content Area
+// ============================================
+
+$schematicX = 10;
+$schematicY = 10;
+$schematicWidth = $pageWidth - 20;
+$schematicHeight = $titleBlockY - 15;
+
+// Draw frame around schematic area
+$pdf->SetDrawColor(0, 0, 0);
+$pdf->SetLineWidth(0.3);
+$pdf->Rect($schematicX, $schematicY, $schematicWidth, $schematicHeight);
+
+// If SVG content provided, embed it
+if (!empty($svgContent)) {
+ // Clean SVG for TCPDF
+ $svgContent = preg_replace('/<\?xml[^>]*\?>/', '', $svgContent);
+ $svgContent = preg_replace('/]*>/', '', $svgContent);
+
+ // Try to embed SVG
+ try {
+ // Scale SVG to fit in schematic area
+ $pdf->ImageSVG('@'.$svgContent, $schematicX + 2, $schematicY + 2, $schematicWidth - 4, $schematicHeight - 4, '', '', '', 0, false);
+ } catch (Exception $e) {
+ // SVG embedding failed - draw placeholder
+ $pdf->SetFont('dejavusans', 'I', 10);
+ $pdf->SetXY($schematicX + 10, $schematicY + 10);
+ $pdf->Cell(0, 10, 'SVG konnte nicht eingebettet werden: '.$e->getMessage(), 0, 1);
+ }
+} else {
+ // Draw schematic manually if no SVG provided
+ drawSchematicContent($pdf, $carriers, $equipmentList, $connections, $schematicX, $schematicY, $schematicWidth, $schematicHeight);
+}
+
+// ============================================
+// Add Wiring List on second page (Verdrahtungsliste)
+// ============================================
+
+if (count($connections) > 0) {
+ $pdf->AddPage($orientation, array($pageWidth, $pageHeight));
+
+ // Title
+ $pdf->SetFont('dejavusans', 'B', 14);
+ $pdf->SetXY(10, 10);
+ $pdf->Cell(0, 8, 'VERDRAHTUNGSLISTE / KLEMMENPLAN', 0, 1, 'L');
+
+ $pdf->SetFont('dejavusans', '', 9);
+ $pdf->SetXY(10, 18);
+ $pdf->Cell(0, 5, $anlage->label.' - '.$societe->name, 0, 1, 'L');
+
+ // Table header
+ $pdf->SetY(28);
+ $pdf->SetFont('dejavusans', 'B', 8);
+ $pdf->SetFillColor(220, 220, 220);
+
+ $colWidths = array(15, 35, 25, 35, 25, 25, 30, 30);
+ $headers = array('Nr.', 'Von (Quelle)', 'Klemme', 'Nach (Ziel)', 'Klemme', 'Typ', 'Leitung', 'Bemerkung');
+
+ $x = 10;
+ for ($i = 0; $i < count($headers); $i++) {
+ $pdf->SetXY($x, 28);
+ $pdf->Cell($colWidths[$i], 6, $headers[$i], 1, 0, 'C', true);
+ $x += $colWidths[$i];
+ }
+
+ // Table content
+ $pdf->SetFont('dejavusans', '', 7);
+ $y = 34;
+ $lineNum = 1;
+
+ // Build equipment lookup
+ $eqLookup = array();
+ foreach ($equipmentList as $eq) {
+ $eqLookup[$eq->id] = $eq;
+ }
+
+ foreach ($connections as $conn) {
+ // Skip rails/busbars in wiring list (they're separate)
+ if ($conn->is_rail) continue;
+
+ $sourceName = '-';
+ $sourceTerminal = $conn->source_terminal ?: '-';
+ $targetName = '-';
+ $targetTerminal = $conn->target_terminal ?: '-';
+
+ if ($conn->fk_source && isset($eqLookup[$conn->fk_source])) {
+ $sourceName = $eqLookup[$conn->fk_source]->label ?: $eqLookup[$conn->fk_source]->type_label_short;
+ }
+ if ($conn->fk_target && isset($eqLookup[$conn->fk_target])) {
+ $targetName = $eqLookup[$conn->fk_target]->label ?: $eqLookup[$conn->fk_target]->type_label_short;
+ }
+
+ // Connection type / medium
+ $connType = $conn->connection_type ?: '-';
+ $medium = trim($conn->medium_type.' '.$conn->medium_spec);
+ if (empty($medium)) $medium = '-';
+
+ $remark = $conn->output_label ?: '';
+
+ if ($y > $pageHeight - 25) {
+ // New page
+ $pdf->AddPage($orientation, array($pageWidth, $pageHeight));
+ $y = 10;
+
+ // Repeat header
+ $pdf->SetFont('dejavusans', 'B', 8);
+ $x = 10;
+ for ($i = 0; $i < count($headers); $i++) {
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[$i], 6, $headers[$i], 1, 0, 'C', true);
+ $x += $colWidths[$i];
+ }
+ $y += 6;
+ $pdf->SetFont('dejavusans', '', 7);
+ }
+
+ $x = 10;
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[0], 5, $lineNum, 1, 0, 'C');
+ $x += $colWidths[0];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[1], 5, dol_trunc($sourceName, 18), 1, 0, 'L');
+ $x += $colWidths[1];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[2], 5, $sourceTerminal, 1, 0, 'C');
+ $x += $colWidths[2];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[3], 5, dol_trunc($targetName, 18), 1, 0, 'L');
+ $x += $colWidths[3];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[4], 5, $targetTerminal, 1, 0, 'C');
+ $x += $colWidths[4];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[5], 5, $connType, 1, 0, 'C');
+ $x += $colWidths[5];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[6], 5, dol_trunc($medium, 15), 1, 0, 'L');
+ $x += $colWidths[6];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($colWidths[7], 5, dol_trunc($remark, 15), 1, 0, 'L');
+
+ $y += 5;
+ $lineNum++;
+ }
+
+ // Add busbars section if any
+ $busbars = array_filter($connections, function($c) { return $c->is_rail; });
+ if (count($busbars) > 0) {
+ $y += 10;
+ if ($y > $pageHeight - 40) {
+ $pdf->AddPage($orientation, array($pageWidth, $pageHeight));
+ $y = 10;
+ }
+
+ $pdf->SetFont('dejavusans', 'B', 10);
+ $pdf->SetXY(10, $y);
+ $pdf->Cell(0, 6, 'SAMMELSCHIENEN / PHASENSCHIENEN', 0, 1, 'L');
+ $y += 8;
+
+ $pdf->SetFont('dejavusans', 'B', 8);
+ $bbHeaders = array('Nr.', 'Bezeichnung', 'Typ', 'Von TE', 'Bis TE', 'Phasen', 'Ausnahmen');
+ $bbWidths = array(15, 50, 30, 20, 20, 30, 50);
+
+ $x = 10;
+ for ($i = 0; $i < count($bbHeaders); $i++) {
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[$i], 6, $bbHeaders[$i], 1, 0, 'C', true);
+ $x += $bbWidths[$i];
+ }
+ $y += 6;
+
+ $pdf->SetFont('dejavusans', '', 7);
+ $bbNum = 1;
+ foreach ($busbars as $bb) {
+ $x = 10;
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[0], 5, $bbNum, 1, 0, 'C');
+ $x += $bbWidths[0];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[1], 5, $bb->output_label ?: 'Sammelschiene '.$bbNum, 1, 0, 'L');
+ $x += $bbWidths[1];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[2], 5, $bb->connection_type ?: '-', 1, 0, 'C');
+ $x += $bbWidths[2];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[3], 5, $bb->rail_start_te ?: '-', 1, 0, 'C');
+ $x += $bbWidths[3];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[4], 5, $bb->rail_end_te ?: '-', 1, 0, 'C');
+ $x += $bbWidths[4];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[5], 5, $bb->rail_phases ?: '-', 1, 0, 'C');
+ $x += $bbWidths[5];
+
+ $pdf->SetXY($x, $y);
+ $pdf->Cell($bbWidths[6], 5, $bb->excluded_te ?: '-', 1, 0, 'L');
+
+ $y += 5;
+ $bbNum++;
+ }
+ }
+}
+
+// Output PDF
+$filename = 'Leitungslaufplan_'.dol_sanitizeFileName($anlage->label).'_'.date('Y-m-d').'.pdf';
+$pdf->Output($filename, 'D');
+
+/**
+ * Draw schematic content directly in PDF
+ * Shows only the actual equipment and connections from the database (what was drawn in the editor)
+ */
+function drawSchematicContent(&$pdf, $carriers, $equipment, $connections, $startX, $startY, $width, $height) {
+ // Phase colors (DIN VDE compliant)
+ $phaseColors = array(
+ 'L1' => array(139, 69, 19), // Brown
+ 'L2' => array(0, 0, 0), // Black
+ 'L3' => array(128, 128, 128), // Gray
+ 'N' => array(0, 102, 204), // Blue
+ 'PE' => array(0, 128, 0) // Green (simplified from green-yellow)
+ );
+
+ // Layout constants
+ $teWidth = 10; // mm per TE
+ $equipmentStartY = $startY + 20;
+ $blockWidth = 8;
+ $blockHeight = 20;
+
+ // Calculate total width needed
+ $maxTE = 0;
+ foreach ($carriers as $carrier) {
+ $maxTE = max($maxTE, $carrier->total_te ?: 12);
+ }
+ $contentWidth = min($width - 40, $maxTE * $teWidth + 40);
+ $contentStartX = $startX + 20;
+
+ // ========================================
+ // Draw equipment and connections
+ // ========================================
+ $carrierIndex = 0;
+ foreach ($carriers as $carrier) {
+ $carrierY = $equipmentStartY + $carrierIndex * 50;
+ $carrierX = $contentStartX;
+ $totalTE = $carrier->total_te ?: 12;
+
+ // Carrier label
+ $pdf->SetFont('dejavusans', '', 6);
+ $pdf->SetTextColor(100, 100, 100);
+ $pdf->SetXY($carrierX - 15, $carrierY + $blockHeight / 2 - 2);
+ $pdf->Cell(12, 4, $carrier->label ?: 'H'.($carrierIndex+1), 0, 0, 'R');
+
+ // Get equipment on this carrier
+ $carrierEquipment = array_filter($equipment, function($eq) use ($carrier) {
+ return $eq->fk_carrier == $carrier->id;
+ });
+
+ // Get busbars for this carrier
+ $carrierBusbars = array_filter($connections, function($c) use ($carrier) {
+ return $c->is_rail && $c->fk_carrier == $carrier->id;
+ });
+
+ // Sort equipment by position
+ usort($carrierEquipment, function($a, $b) {
+ return ($a->position_te ?: 1) - ($b->position_te ?: 1);
+ });
+
+ // Draw each equipment
+ foreach ($carrierEquipment as $eq) {
+ $eqPosTE = $eq->position_te ?: 1;
+ $eqWidthTE = $eq->width_te ?: 1;
+ $eqX = $carrierX + ($eqPosTE - 1) * $teWidth;
+ $eqWidth = $eqWidthTE * $teWidth - 2;
+
+ // Equipment block
+ $color = $eq->type_color ?: '#3498db';
+ list($r, $g, $b) = sscanf($color, "#%02x%02x%02x");
+ $pdf->SetFillColor($r ?: 52, $g ?: 152, $b ?: 219);
+ $pdf->Rect($eqX, $carrierY, $eqWidth, $blockHeight, 'F');
+
+ // Equipment label
+ $pdf->SetFont('dejavusans', 'B', 5);
+ $pdf->SetTextColor(255, 255, 255);
+ $label = $eq->type_label_short ?: $eq->label;
+ $pdf->SetXY($eqX, $carrierY + 3);
+ $pdf->Cell($eqWidth, 4, dol_trunc($label, 8), 0, 0, 'C');
+
+ // Second line label
+ if ($eq->label && $eq->type_label_short) {
+ $pdf->SetFont('dejavusans', '', 4);
+ $pdf->SetXY($eqX, $carrierY + 8);
+ $pdf->Cell($eqWidth, 3, dol_trunc($eq->label, 10), 0, 0, 'C');
+ }
+
+ $pdf->SetTextColor(0, 0, 0);
+
+ // Consumer label below equipment
+ $pdf->SetFont('dejavusans', '', 5);
+ $pdf->SetTextColor(80, 80, 80);
+ $pdf->SetXY($eqX - 2, $carrierY + $blockHeight + 1);
+ $consumerLabel = $eq->label ?: '';
+ $pdf->Cell($eqWidth + 4, 4, dol_trunc($consumerLabel, 12), 0, 0, 'C');
+ }
+
+ // Draw busbars (Phasenschienen) for this carrier
+ foreach ($carrierBusbars as $busbar) {
+ $busbarStartTE = $busbar->rail_start_te ?: 1;
+ $busbarEndTE = $busbar->rail_end_te ?: $busbarStartTE;
+ $busbarX = $carrierX + ($busbarStartTE - 1) * $teWidth;
+ $busbarWidth = ($busbarEndTE - $busbarStartTE + 1) * $teWidth;
+ $busbarY = $carrierY - 5;
+
+ // Busbar color
+ $phase = $busbar->rail_phases ?: $busbar->connection_type ?: 'L1';
+ $color = $phaseColors[$phase] ?? array(200, 100, 50);
+ $pdf->SetFillColor($color[0], $color[1], $color[2]);
+ $pdf->Rect($busbarX, $busbarY, $busbarWidth, 3, 'F');
+
+ // Draw vertical taps from busbar to equipment
+ $pdf->SetDrawColor($color[0], $color[1], $color[2]);
+ for ($te = $busbarStartTE; $te <= $busbarEndTE; $te++) {
+ // Check if there's equipment at this TE
+ $hasEquipment = false;
+ foreach ($carrierEquipment as $eq) {
+ $eqStart = $eq->position_te ?: 1;
+ $eqEnd = $eqStart + ($eq->width_te ?: 1) - 1;
+ if ($te >= $eqStart && $te <= $eqEnd) {
+ $hasEquipment = true;
+ break;
+ }
+ }
+
+ if ($hasEquipment) {
+ $tapX = $carrierX + ($te - 1) * $teWidth + $teWidth / 2;
+ $pdf->Line($tapX, $busbarY + 3, $tapX, $carrierY);
+ }
+ }
+
+ // Busbar label
+ $pdf->SetFont('dejavusans', 'B', 5);
+ $pdf->SetTextColor(255, 255, 255);
+ $pdf->SetXY($busbarX, $busbarY - 0.5);
+ $pdf->Cell($busbarWidth, 4, $phase, 0, 0, 'C');
+ }
+
+ // ========================================
+ // Draw Inputs (Anschlusspunkte) and Outputs (Abgänge)
+ // ========================================
+
+ // Get non-rail connections for this carrier's equipment
+ $carrierEqIds = array_map(function($eq) { return $eq->id; }, $carrierEquipment);
+
+ foreach ($connections as $conn) {
+ if ($conn->is_rail) continue;
+
+ // ANSCHLUSSPUNKT (Input) - fk_source is NULL, fk_target exists
+ if (empty($conn->fk_source) && !empty($conn->fk_target)) {
+ // Find target equipment
+ $targetEq = null;
+ foreach ($carrierEquipment as $eq) {
+ if ($eq->id == $conn->fk_target) {
+ $targetEq = $eq;
+ break;
+ }
+ }
+ if (!$targetEq) continue;
+
+ $eqPosTE = $targetEq->position_te ?: 1;
+ $eqWidthTE = $targetEq->width_te ?: 1;
+ $eqCenterX = $carrierX + ($eqPosTE - 1) * $teWidth + ($eqWidthTE * $teWidth) / 2;
+ $lineStartY = $carrierY - 18;
+ $lineEndY = $carrierY;
+
+ // Phase color
+ $phase = $conn->connection_type ?: 'L1';
+ $color = $phaseColors[$phase] ?? array(100, 100, 100);
+ $pdf->SetDrawColor($color[0], $color[1], $color[2]);
+ $pdf->SetFillColor($color[0], $color[1], $color[2]);
+
+ // Vertical line from top
+ $pdf->Line($eqCenterX, $lineStartY, $eqCenterX, $lineEndY);
+
+ // Circle at top (source indicator)
+ $pdf->Circle($eqCenterX, $lineStartY, 1.5, 0, 360, 'F');
+
+ // Phase label
+ $pdf->SetFont('dejavusans', 'B', 7);
+ $pdf->SetTextColor($color[0], $color[1], $color[2]);
+ $pdf->SetXY($eqCenterX - 5, $lineStartY - 5);
+ $pdf->Cell(10, 4, $phase, 0, 0, 'C');
+
+ // Optional label
+ if (!empty($conn->output_label)) {
+ $pdf->SetFont('dejavusans', '', 5);
+ $pdf->SetTextColor(100, 100, 100);
+ $pdf->SetXY($eqCenterX + 3, $lineStartY - 4);
+ $pdf->Cell(20, 3, dol_trunc($conn->output_label, 12), 0, 0, 'L');
+ }
+ }
+
+ // ABGANG (Output) - fk_source exists, fk_target is NULL
+ if (!empty($conn->fk_source) && empty($conn->fk_target)) {
+ // Find source equipment
+ $sourceEq = null;
+ foreach ($carrierEquipment as $eq) {
+ if ($eq->id == $conn->fk_source) {
+ $sourceEq = $eq;
+ break;
+ }
+ }
+ if (!$sourceEq) continue;
+
+ $eqPosTE = $sourceEq->position_te ?: 1;
+ $eqWidthTE = $sourceEq->width_te ?: 1;
+ $eqCenterX = $carrierX + ($eqPosTE - 1) * $teWidth + ($eqWidthTE * $teWidth) / 2;
+ $lineStartY = $carrierY + $blockHeight;
+ $lineLength = 18;
+ $lineEndY = $lineStartY + $lineLength;
+
+ // Phase color
+ $phase = $conn->connection_type ?: 'L1N';
+ $color = $phaseColors[$phase] ?? $phaseColors['L1'] ?? array(139, 69, 19);
+ $pdf->SetDrawColor($color[0], $color[1], $color[2]);
+ $pdf->SetFillColor($color[0], $color[1], $color[2]);
+
+ // Vertical line going down
+ $pdf->Line($eqCenterX, $lineStartY, $eqCenterX, $lineEndY);
+
+ // Arrow at end
+ $pdf->Polygon(array(
+ $eqCenterX - 1.5, $lineEndY - 2,
+ $eqCenterX, $lineEndY,
+ $eqCenterX + 1.5, $lineEndY - 2
+ ), 'F');
+
+ // Left label: Bezeichnung (rotated text not easy in TCPDF, use horizontal)
+ if (!empty($conn->output_label)) {
+ $pdf->SetFont('dejavusans', 'B', 5);
+ $pdf->SetTextColor(0, 0, 0);
+ $pdf->SetXY($eqCenterX - 15, $lineEndY + 1);
+ $pdf->Cell(30, 3, dol_trunc($conn->output_label, 15), 0, 0, 'C');
+ }
+
+ // Right label: Kabeltyp + Größe
+ $cableInfo = trim(($conn->medium_type ?: '') . ' ' . ($conn->medium_spec ?: ''));
+ if (!empty($cableInfo)) {
+ $pdf->SetFont('dejavusans', '', 4);
+ $pdf->SetTextColor(100, 100, 100);
+ $pdf->SetXY($eqCenterX - 15, $lineEndY + 4);
+ $pdf->Cell(30, 3, dol_trunc($cableInfo, 18), 0, 0, 'C');
+ }
+
+ // Phase type
+ $pdf->SetFont('dejavusans', 'B', 5);
+ $pdf->SetTextColor($color[0], $color[1], $color[2]);
+ $pdf->SetXY($eqCenterX - 5, $lineEndY + 7);
+ $pdf->Cell(10, 3, $phase, 0, 0, 'C');
+ }
+ }
+
+ $carrierIndex++;
+ }
+
+ $pdf->SetTextColor(0, 0, 0);
+
+ // ========================================
+ // Legend - show phase colors used in busbars
+ // ========================================
+ $legendY = $startY + $height - 20;
+ $pdf->SetFont('dejavusans', '', 6);
+ $pdf->SetXY($startX + 5, $legendY);
+ $pdf->Cell(0, 4, 'Phasenfarben nach DIN VDE:', 0, 1, 'L');
+
+ $legendX = $startX + 5;
+ $phases = array('L1', 'L2', 'L3', 'N', 'PE');
+ foreach ($phases as $idx => $phase) {
+ $color = $phaseColors[$phase];
+ $pdf->SetFillColor($color[0], $color[1], $color[2]);
+ $pdf->Rect($legendX + $idx * 25, $legendY + 5, 8, 3, 'F');
+ $pdf->SetTextColor($color[0], $color[1], $color[2]);
+ $pdf->SetXY($legendX + $idx * 25 + 10, $legendY + 4);
+ $pdf->Cell(12, 4, $phase, 0, 0, 'L');
+ }
+
+ $pdf->SetTextColor(0, 0, 0);
+}
diff --git a/class/equipment.class.php b/class/equipment.class.php
index f03bf0f..55b9866 100644
--- a/class/equipment.class.php
+++ b/class/equipment.class.php
@@ -40,6 +40,7 @@ class Equipment extends CommonObject
public $type_label_short;
public $type_color;
public $type_picto;
+ public $type_icon_file; // SVG/PNG schematic symbol
public $product_ref;
public $product_label;
public $protection_device_label; // Label of the protection device
@@ -135,7 +136,8 @@ class Equipment extends CommonObject
public function fetch($id)
{
$sql = "SELECT e.*, t.label as type_label, t.label_short as type_label_short,";
- $sql .= " t.color as type_color, t.picto as type_picto,";
+ $sql .= " t.ref as type_ref, t.color as type_color, t.picto as type_picto, t.icon_file as type_icon_file,";
+ $sql .= " t.terminals_config as terminals_config,";
$sql .= " p.ref as product_ref, p.label as product_label,";
$sql .= " prot.label as protection_device_label";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as e";
@@ -168,8 +170,11 @@ class Equipment extends CommonObject
$this->type_label = $obj->type_label;
$this->type_label_short = $obj->type_label_short;
+ $this->type_ref = $obj->type_ref;
$this->type_color = $obj->type_color;
$this->type_picto = $obj->type_picto;
+ $this->type_icon_file = $obj->type_icon_file;
+ $this->terminals_config = $obj->terminals_config;
$this->product_ref = $obj->product_ref;
$this->product_label = $obj->product_label;
$this->protection_device_label = $obj->protection_device_label;
@@ -266,7 +271,7 @@ class Equipment extends CommonObject
$results = array();
$sql = "SELECT e.*, t.label as type_label, t.label_short as type_label_short,";
- $sql .= " t.ref as type_ref, t.color as type_color, t.picto as type_picto,";
+ $sql .= " t.ref as type_ref, t.color as type_color, t.picto as type_picto, t.icon_file as type_icon_file,";
$sql .= " t.terminals_config as terminals_config,";
$sql .= " prot.label as protection_device_label";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as e";
@@ -301,6 +306,7 @@ class Equipment extends CommonObject
$eq->type_ref = $obj->type_ref;
$eq->type_color = $obj->type_color;
$eq->type_picto = $obj->type_picto;
+ $eq->type_icon_file = $obj->type_icon_file;
$eq->terminals_config = $obj->terminals_config;
$eq->protection_device_label = $obj->protection_device_label;
diff --git a/class/equipmentconnection.class.php b/class/equipmentconnection.class.php
index d2e7eea..c355b30 100644
--- a/class/equipmentconnection.class.php
+++ b/class/equipmentconnection.class.php
@@ -44,6 +44,7 @@ class EquipmentConnection extends CommonObject
public $fk_carrier;
public $position_y = 0;
+ public $path_data; // SVG path for manually drawn connections
public $note_private;
public $status = 1;
@@ -88,7 +89,7 @@ class EquipmentConnection extends CommonObject
$sql .= "entity, fk_source, source_terminal, source_terminal_id, fk_target, target_terminal, target_terminal_id,";
$sql .= " connection_type, color, output_label,";
$sql .= " medium_type, medium_spec, medium_length,";
- $sql .= " is_rail, rail_start_te, rail_end_te, rail_phases, excluded_te, fk_carrier, position_y,";
+ $sql .= " is_rail, rail_start_te, rail_end_te, rail_phases, excluded_te, fk_carrier, position_y, path_data,";
$sql .= " note_private, status, date_creation, fk_user_creat";
$sql .= ") VALUES (";
$sql .= ((int) $conf->entity);
@@ -111,6 +112,7 @@ class EquipmentConnection extends CommonObject
$sql .= ", ".($this->excluded_te ? "'".$this->db->escape($this->excluded_te)."'" : "NULL");
$sql .= ", ".($this->fk_carrier > 0 ? ((int) $this->fk_carrier) : "NULL");
$sql .= ", ".((int) $this->position_y);
+ $sql .= ", ".($this->path_data ? "'".$this->db->escape($this->path_data)."'" : "NULL");
$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "NULL");
$sql .= ", ".((int) $this->status);
$sql .= ", '".$this->db->idate($now)."'";
@@ -178,6 +180,7 @@ class EquipmentConnection extends CommonObject
$this->excluded_te = $obj->excluded_te;
$this->fk_carrier = $obj->fk_carrier;
$this->position_y = $obj->position_y;
+ $this->path_data = isset($obj->path_data) ? $obj->path_data : null;
$this->note_private = $obj->note_private;
$this->status = $obj->status;
$this->date_creation = $this->db->jdate($obj->date_creation);
@@ -230,6 +233,7 @@ class EquipmentConnection extends CommonObject
$sql .= ", excluded_te = ".($this->excluded_te ? "'".$this->db->escape($this->excluded_te)."'" : "NULL");
$sql .= ", fk_carrier = ".($this->fk_carrier > 0 ? ((int) $this->fk_carrier) : "NULL");
$sql .= ", position_y = ".((int) $this->position_y);
+ $sql .= ", path_data = ".($this->path_data ? "'".$this->db->escape($this->path_data)."'" : "NULL");
$sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "NULL");
$sql .= ", status = ".((int) $this->status);
$sql .= ", fk_user_modif = ".((int) $user->id);
@@ -325,6 +329,7 @@ class EquipmentConnection extends CommonObject
$conn->excluded_te = $obj->excluded_te;
$conn->fk_carrier = $obj->fk_carrier;
$conn->position_y = $obj->position_y;
+ $conn->path_data = isset($obj->path_data) ? $obj->path_data : null;
$conn->status = $obj->status;
$conn->source_label = $obj->source_label;
diff --git a/class/equipmenttype.class.php b/class/equipmenttype.class.php
index 52e0257..2ca16d1 100644
--- a/class/equipmenttype.class.php
+++ b/class/equipmenttype.class.php
@@ -29,6 +29,7 @@ class EquipmentType extends CommonObject
public $terminals_config; // JSON config for terminals
public $picto;
+ public $icon_file; // Uploaded SVG/PNG file for schematic symbol
public $is_system;
public $position;
public $active;
@@ -76,7 +77,7 @@ class EquipmentType extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
$sql .= "entity, ref, label, label_short, description, fk_system,";
$sql .= " width_te, color, fk_product, terminals_config,";
- $sql .= " picto, is_system, position, active,";
+ $sql .= " picto, icon_file, is_system, position, active,";
$sql .= " date_creation, fk_user_creat";
$sql .= ") VALUES (";
$sql .= "0"; // entity 0 = global
@@ -90,6 +91,7 @@ class EquipmentType extends CommonObject
$sql .= ", ".($this->fk_product > 0 ? ((int) $this->fk_product) : "NULL");
$sql .= ", ".($this->terminals_config ? "'".$this->db->escape($this->terminals_config)."'" : "NULL");
$sql .= ", ".($this->picto ? "'".$this->db->escape($this->picto)."'" : "NULL");
+ $sql .= ", ".($this->icon_file ? "'".$this->db->escape($this->icon_file)."'" : "NULL");
$sql .= ", 0"; // is_system = 0 for user-created
$sql .= ", ".((int) $this->position);
$sql .= ", ".((int) ($this->active !== null ? $this->active : 1));
@@ -148,6 +150,7 @@ class EquipmentType extends CommonObject
$this->fk_product = $obj->fk_product;
$this->terminals_config = $obj->terminals_config;
$this->picto = $obj->picto;
+ $this->icon_file = $obj->icon_file;
$this->is_system = $obj->is_system;
$this->position = $obj->position;
$this->active = $obj->active;
@@ -195,6 +198,7 @@ class EquipmentType extends CommonObject
$sql .= ", fk_product = ".($this->fk_product > 0 ? ((int) $this->fk_product) : "NULL");
$sql .= ", terminals_config = ".($this->terminals_config ? "'".$this->db->escape($this->terminals_config)."'" : "NULL");
$sql .= ", picto = ".($this->picto ? "'".$this->db->escape($this->picto)."'" : "NULL");
+ $sql .= ", icon_file = ".($this->icon_file ? "'".$this->db->escape($this->icon_file)."'" : "NULL");
$sql .= ", position = ".((int) $this->position);
$sql .= ", active = ".((int) $this->active);
$sql .= ", fk_user_modif = ".((int) $user->id);
@@ -303,6 +307,7 @@ class EquipmentType extends CommonObject
$type->color = $obj->color;
$type->fk_product = $obj->fk_product;
$type->picto = $obj->picto;
+ $type->icon_file = $obj->icon_file;
$type->is_system = $obj->is_system;
$type->position = $obj->position;
$type->active = $obj->active;
diff --git a/js/kundenkarte.js b/js/kundenkarte.js
index 1f8a41f..d8abef3 100755
--- a/js/kundenkarte.js
+++ b/js/kundenkarte.js
@@ -9,6 +9,96 @@
// Namespace
window.KundenKarte = window.KundenKarte || {};
+ // ===========================================
+ // Global Dialog Functions (replacing browser dialogs)
+ // ===========================================
+
+ // Escape HTML helper
+ function escapeHtml(text) {
+ if (!text) return '';
+ var div = document.createElement('div');
+ div.textContent = text;
+ return div.innerHTML;
+ }
+
+ // Global alert dialog
+ KundenKarte.showAlert = function(title, message, onClose) {
+ $('#kundenkarte-alert-dialog').remove();
+
+ var html = '';
+ html += '
';
+ html += '';
+ html += '
';
+ html += '
' + escapeHtml(message) + '
';
+ html += '
';
+ html += '';
+ html += '
';
+ html += '
';
+ html += '';
+ html += '
';
+ html += '
' + escapeHtml(message) + '
';
+ html += '
';
+ html += '';
+ html += '
';
+ } else {
+ print 'Kein