';
diff --git a/ajax/equipment.php b/ajax/equipment.php
index d58ec97..4860023 100644
--- a/ajax/equipment.php
+++ b/ajax/equipment.php
@@ -123,6 +123,10 @@ switch ($action) {
'type_color' => $eq->type_color,
'type_icon_file' => $eq->type_icon_file,
'type_icon_url' => $iconUrl,
+ 'type_block_image' => $eq->type_block_image,
+ 'type_block_image_url' => !empty($eq->type_block_image) ? DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=block_images/'.urlencode($eq->type_block_image) : '',
+ 'type_flow_direction' => $eq->type_flow_direction,
+ 'type_terminal_position' => $eq->type_terminal_position ?: 'both',
'terminals_config' => $eq->terminals_config,
'label' => $eq->label,
'position_te' => $eq->position_te,
@@ -277,6 +281,44 @@ switch ($action) {
}
break;
+ case 'move_to_carrier':
+ // Move equipment to different carrier (drag-drop between carriers)
+ if (!$user->hasRight('kundenkarte', 'write')) {
+ $response['error'] = 'Permission denied';
+ break;
+ }
+ if ($equipment->fetch($equipmentId) > 0) {
+ $newCarrierId = GETPOSTINT('carrier_id');
+ $newPosition = GETPOSTINT('position_te') ?: 1;
+
+ // Check if target carrier exists
+ $targetCarrier = new EquipmentCarrier($db);
+ if ($targetCarrier->fetch($newCarrierId) <= 0) {
+ $response['error'] = 'Target carrier not found';
+ break;
+ }
+
+ // Check if position is available on target carrier
+ if (!$targetCarrier->isPositionAvailable($newPosition, $equipment->width_te, 0)) {
+ $response['error'] = 'Position auf Ziel-Hutschiene nicht verfügbar';
+ break;
+ }
+
+ // Update equipment
+ $equipment->fk_carrier = $newCarrierId;
+ $equipment->position_te = $newPosition;
+ $result = $equipment->update($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ $response['message'] = 'Equipment verschoben';
+ } else {
+ $response['error'] = $equipment->error;
+ }
+ } else {
+ $response['error'] = 'Equipment not found';
+ }
+ break;
+
case 'delete':
if (!$user->hasRight('kundenkarte', 'delete')) {
$response['error'] = 'Permission denied';
diff --git a/ajax/equipment_connection.php b/ajax/equipment_connection.php
index 7617900..4b4332f 100644
--- a/ajax/equipment_connection.php
+++ b/ajax/equipment_connection.php
@@ -243,6 +243,39 @@ switch ($action) {
}
break;
+ case 'update_rail_position':
+ // Update rail/busbar start and end position (for drag & drop)
+ // Also supports moving to a different carrier (different panel/hutschiene)
+ if (!$user->hasRight('kundenkarte', 'write')) {
+ $response['error'] = 'Permission denied';
+ break;
+ }
+ if ($connection->fetch($connectionId) > 0) {
+ // Only allow updating rail connections
+ if (!$connection->is_rail) {
+ $response['error'] = 'Not a rail connection';
+ break;
+ }
+
+ $connection->rail_start_te = GETPOSTINT('rail_start_te');
+ $connection->rail_end_te = GETPOSTINT('rail_end_te');
+
+ // Update carrier if provided (for moving between panels)
+ if (GETPOSTISSET('carrier_id') && GETPOSTINT('carrier_id') > 0) {
+ $connection->fk_carrier = GETPOSTINT('carrier_id');
+ }
+
+ $result = $connection->update($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ } else {
+ $response['error'] = $connection->error ?: 'Update failed';
+ }
+ } else {
+ $response['error'] = 'Connection not found';
+ }
+ break;
+
case 'create_output':
// Create an output connection
if (!$user->hasRight('kundenkarte', 'write')) {
@@ -372,6 +405,149 @@ switch ($action) {
}
break;
+ // ============================================
+ // Bridge Actions (Brücken zwischen Klemmen)
+ // ============================================
+
+ case 'list_bridges':
+ // List all bridges for an anlage
+ $anlageId = GETPOSTINT('anlage_id');
+ if ($anlageId > 0) {
+ require_once DOL_DOCUMENT_ROOT.'/custom/kundenkarte/class/terminalbridge.class.php';
+ $bridgeObj = new TerminalBridge($db);
+ $bridges = $bridgeObj->fetchAllByAnlage($anlageId);
+
+ $bridgeList = array();
+ foreach ($bridges as $bridge) {
+ $bridgeList[] = array(
+ 'id' => $bridge->id,
+ 'fk_carrier' => $bridge->fk_carrier,
+ 'start_te' => $bridge->start_te,
+ 'end_te' => $bridge->end_te,
+ 'terminal_side' => $bridge->terminal_side,
+ 'terminal_row' => $bridge->terminal_row,
+ 'color' => $bridge->color,
+ 'bridge_type' => $bridge->bridge_type,
+ 'label' => $bridge->label
+ );
+ }
+
+ $response['success'] = true;
+ $response['bridges'] = $bridgeList;
+ } else {
+ $response['error'] = 'Missing anlage_id';
+ }
+ break;
+
+ case 'create_bridge':
+ // Create a new terminal bridge
+ if (!$user->hasRight('kundenkarte', 'write')) {
+ $response['error'] = 'Permission denied';
+ break;
+ }
+
+ $anlageId = GETPOSTINT('anlage_id');
+ $carrierId = GETPOSTINT('carrier_id');
+ $startTE = GETPOSTINT('start_te');
+ $endTE = GETPOSTINT('end_te');
+
+ if (empty($anlageId) || empty($carrierId) || empty($startTE) || empty($endTE)) {
+ $response['error'] = 'Missing required parameters';
+ break;
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/custom/kundenkarte/class/terminalbridge.class.php';
+ $bridge = new TerminalBridge($db);
+ $bridge->fk_anlage = $anlageId;
+ $bridge->fk_carrier = $carrierId;
+ $bridge->start_te = min($startTE, $endTE);
+ $bridge->end_te = max($startTE, $endTE);
+ $bridge->terminal_side = GETPOST('terminal_side', 'alpha') ?: 'top';
+ $bridge->terminal_row = GETPOSTINT('terminal_row');
+ $bridge->color = GETPOST('color', 'alphanohtml') ?: '#e74c3c';
+ $bridge->bridge_type = GETPOST('bridge_type', 'alpha') ?: 'standard';
+ $bridge->label = GETPOST('label', 'alphanohtml');
+
+ $result = $bridge->create($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ $response['bridge_id'] = $result;
+ $response['bridge'] = array(
+ 'id' => $bridge->id,
+ 'fk_carrier' => $bridge->fk_carrier,
+ 'start_te' => $bridge->start_te,
+ 'end_te' => $bridge->end_te,
+ 'terminal_side' => $bridge->terminal_side,
+ 'terminal_row' => $bridge->terminal_row,
+ 'color' => $bridge->color,
+ 'bridge_type' => $bridge->bridge_type,
+ 'label' => $bridge->label
+ );
+ } else {
+ $response['error'] = $bridge->error ?: 'Create failed';
+ }
+ break;
+
+ case 'update_bridge':
+ // Update an existing bridge
+ if (!$user->hasRight('kundenkarte', 'write')) {
+ $response['error'] = 'Permission denied';
+ break;
+ }
+
+ $bridgeId = GETPOSTINT('bridge_id');
+ if ($bridgeId > 0) {
+ require_once DOL_DOCUMENT_ROOT.'/custom/kundenkarte/class/terminalbridge.class.php';
+ $bridge = new TerminalBridge($db);
+ if ($bridge->fetch($bridgeId) > 0) {
+ if (GETPOSTISSET('start_te')) $bridge->start_te = GETPOSTINT('start_te');
+ if (GETPOSTISSET('end_te')) $bridge->end_te = GETPOSTINT('end_te');
+ if (GETPOSTISSET('terminal_side')) $bridge->terminal_side = GETPOST('terminal_side', 'alpha');
+ if (GETPOSTISSET('terminal_row')) $bridge->terminal_row = GETPOSTINT('terminal_row');
+ if (GETPOSTISSET('color')) $bridge->color = GETPOST('color', 'alphanohtml');
+ if (GETPOSTISSET('bridge_type')) $bridge->bridge_type = GETPOST('bridge_type', 'alpha');
+ if (GETPOSTISSET('label')) $bridge->label = GETPOST('label', 'alphanohtml');
+
+ $result = $bridge->update($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ } else {
+ $response['error'] = $bridge->error ?: 'Update failed';
+ }
+ } else {
+ $response['error'] = 'Bridge not found';
+ }
+ } else {
+ $response['error'] = 'Missing bridge_id';
+ }
+ break;
+
+ case 'delete_bridge':
+ // Delete a bridge
+ if (!$user->hasRight('kundenkarte', 'write')) {
+ $response['error'] = 'Permission denied';
+ break;
+ }
+
+ $bridgeId = GETPOSTINT('bridge_id');
+ if ($bridgeId > 0) {
+ require_once DOL_DOCUMENT_ROOT.'/custom/kundenkarte/class/terminalbridge.class.php';
+ $bridge = new TerminalBridge($db);
+ if ($bridge->fetch($bridgeId) > 0) {
+ $result = $bridge->delete($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ } else {
+ $response['error'] = $bridge->error ?: 'Delete failed';
+ }
+ } else {
+ $response['error'] = 'Bridge not found';
+ }
+ } else {
+ $response['error'] = 'Missing bridge_id';
+ }
+ break;
+
default:
$response['error'] = 'Unknown action';
}
diff --git a/ajax/equipment_type_block_image.php b/ajax/equipment_type_block_image.php
new file mode 100644
index 0000000..24db1a6
--- /dev/null
+++ b/ajax/equipment_type_block_image.php
@@ -0,0 +1,187 @@
+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 block images
+$uploadDir = DOL_DATA_ROOT.'/kundenkarte/block_images/';
+
+// Create directory if not exists
+if (!is_dir($uploadDir)) {
+ dol_mkdir($uploadDir);
+}
+
+switch ($action) {
+ case 'upload':
+ if (empty($_FILES['block_image']) || $_FILES['block_image']['error'] !== UPLOAD_ERR_OK) {
+ $response['error'] = 'No file uploaded or upload error';
+ break;
+ }
+
+ $file = $_FILES['block_image'];
+ $fileName = dol_sanitizeFileName($file['name']);
+ $fileExt = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
+
+ // Validate file type
+ $allowedExtensions = array('svg', 'png', 'jpg', 'jpeg', 'gif', 'webp');
+ if (!in_array($fileExt, $allowedExtensions)) {
+ $response['error'] = 'Invalid file type. Only SVG, PNG, JPG, GIF, WEBP are allowed.';
+ break;
+ }
+
+ // Validate MIME type
+ $mimeType = mime_content_type($file['tmp_name']);
+ $allowedMimes = array('image/svg+xml', 'image/png', 'image/jpeg', 'image/gif', 'image/webp', '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 block image file if exists
+ if ($equipmentType->block_image && file_exists($uploadDir.$equipmentType->block_image)) {
+ unlink($uploadDir.$equipmentType->block_image);
+ }
+
+ $equipmentType->block_image = $newFileName;
+ $result = $equipmentType->update($user);
+
+ if ($result > 0) {
+ $response['success'] = true;
+ $response['block_image'] = $newFileName;
+ $response['block_image_url'] = DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=block_images/'.$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->block_image && file_exists($uploadDir.$equipmentType->block_image)) {
+ unlink($uploadDir.$equipmentType->block_image);
+ }
+ $equipmentType->block_image = '';
+ $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['block_image'] = $equipmentType->block_image;
+ if ($equipmentType->block_image) {
+ $response['block_image_url'] = DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=block_images/'.$equipmentType->block_image;
+ }
+ } else {
+ $response['error'] = 'Equipment type not found';
+ }
+ break;
+
+ case 'select':
+ // Select an existing image from the block_images folder
+ $selectedImage = GETPOST('image', 'alphanohtml');
+ if (empty($selectedImage)) {
+ $response['error'] = 'No image selected';
+ break;
+ }
+
+ // Validate that the image exists
+ $imagePath = $uploadDir . $selectedImage;
+ if (!file_exists($imagePath)) {
+ $response['error'] = 'Image file not found';
+ break;
+ }
+
+ // Validate file extension
+ $fileExt = strtolower(pathinfo($selectedImage, PATHINFO_EXTENSION));
+ $allowedExtensions = array('svg', 'png', 'jpg', 'jpeg', 'gif', 'webp');
+ if (!in_array($fileExt, $allowedExtensions)) {
+ $response['error'] = 'Invalid file type';
+ break;
+ }
+
+ $equipmentType = new EquipmentType($db);
+ if ($equipmentType->fetch($typeId) > 0) {
+ $equipmentType->block_image = $selectedImage;
+ $result = $equipmentType->update($user);
+ if ($result > 0) {
+ $response['success'] = true;
+ $response['block_image'] = $selectedImage;
+ $response['block_image_url'] = DOL_URL_ROOT.'/document.php?modulepart=kundenkarte&file=block_images/'.urlencode($selectedImage);
+ } else {
+ $response['error'] = 'Database update failed';
+ }
+ } else {
+ $response['error'] = 'Equipment type not found';
+ }
+ break;
+
+ default:
+ $response['error'] = 'Unknown action';
+}
+
+echo json_encode($response);
+$db->close();
diff --git a/class/busbartype.class.php b/class/busbartype.class.php
new file mode 100644
index 0000000..cd97430
--- /dev/null
+++ b/class/busbartype.class.php
@@ -0,0 +1,390 @@
+db = $db;
+ }
+
+ /**
+ * Create object in database
+ *
+ * @param User $user User that creates
+ * @return int Return integer <0 if KO, Id of created object if OK
+ */
+ public function create($user)
+ {
+ global $conf;
+
+ $error = 0;
+ $now = dol_now();
+
+ if (empty($this->ref) || empty($this->label) || empty($this->fk_system) || empty($this->phases)) {
+ $this->error = 'ErrorMissingParameters';
+ return -1;
+ }
+
+ $this->db->begin();
+
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+ $sql .= "entity, ref, label, label_short, description, fk_system,";
+ $sql .= " phases, num_lines, color, default_color, line_height, line_spacing, position_default,";
+ $sql .= " fk_product, picto, icon_file, is_system, position, active,";
+ $sql .= " date_creation, fk_user_creat";
+ $sql .= ") VALUES (";
+ $sql .= "0"; // entity 0 = global
+ $sql .= ", '".$this->db->escape($this->ref)."'";
+ $sql .= ", '".$this->db->escape($this->label)."'";
+ $sql .= ", ".($this->label_short ? "'".$this->db->escape($this->label_short)."'" : "NULL");
+ $sql .= ", ".($this->description ? "'".$this->db->escape($this->description)."'" : "NULL");
+ $sql .= ", ".((int) $this->fk_system);
+ $sql .= ", '".$this->db->escape($this->phases)."'";
+ $sql .= ", ".((int) ($this->num_lines > 0 ? $this->num_lines : 1));
+ $sql .= ", ".($this->color ? "'".$this->db->escape($this->color)."'" : "NULL");
+ $sql .= ", ".($this->default_color ? "'".$this->db->escape($this->default_color)."'" : "NULL");
+ $sql .= ", ".((int) ($this->line_height > 0 ? $this->line_height : 3));
+ $sql .= ", ".((int) ($this->line_spacing > 0 ? $this->line_spacing : 4));
+ $sql .= ", '".$this->db->escape($this->position_default ?: 'below')."'";
+ $sql .= ", ".($this->fk_product > 0 ? ((int) $this->fk_product) : "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));
+ $sql .= ", '".$this->db->idate($now)."'";
+ $sql .= ", ".((int) $user->id);
+ $sql .= ")";
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if (!$error) {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return $this->id;
+ }
+ }
+
+ /**
+ * Load object from database
+ *
+ * @param int $id ID of record
+ * @return int Return integer <0 if KO, 0 if not found, >0 if OK
+ */
+ public function fetch($id)
+ {
+ $sql = "SELECT t.*, s.label as system_label, s.code as system_code,";
+ $sql .= " p.ref as product_ref, p.label as product_label";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_kundenkarte_anlage_system as s ON t.fk_system = s.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON t.fk_product = p.rowid";
+ $sql .= " WHERE t.rowid = ".((int) $id);
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ if ($this->db->num_rows($resql)) {
+ $obj = $this->db->fetch_object($resql);
+
+ $this->id = $obj->rowid;
+ $this->entity = $obj->entity;
+ $this->ref = $obj->ref;
+ $this->label = $obj->label;
+ $this->label_short = $obj->label_short;
+ $this->description = $obj->description;
+ $this->fk_system = $obj->fk_system;
+ $this->phases = $obj->phases;
+ $this->num_lines = $obj->num_lines;
+ $this->color = $obj->color;
+ $this->default_color = $obj->default_color;
+ $this->line_height = $obj->line_height;
+ $this->line_spacing = $obj->line_spacing;
+ $this->position_default = $obj->position_default ?: 'below';
+ $this->fk_product = $obj->fk_product;
+ $this->picto = $obj->picto;
+ $this->icon_file = $obj->icon_file;
+ $this->is_system = $obj->is_system;
+ $this->position = $obj->position;
+ $this->active = $obj->active;
+ $this->date_creation = $this->db->jdate($obj->date_creation);
+ $this->fk_user_creat = $obj->fk_user_creat;
+ $this->fk_user_modif = $obj->fk_user_modif;
+
+ $this->system_label = $obj->system_label;
+ $this->system_code = $obj->system_code;
+ $this->product_ref = $obj->product_ref;
+ $this->product_label = $obj->product_label;
+
+ $this->db->free($resql);
+ return 1;
+ } else {
+ $this->db->free($resql);
+ return 0;
+ }
+ } else {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ }
+
+ /**
+ * Update object in database
+ *
+ * @param User $user User that modifies
+ * @return int Return integer <0 if KO, >0 if OK
+ */
+ public function update($user)
+ {
+ $error = 0;
+
+ $this->db->begin();
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+ $sql .= " ref = '".$this->db->escape($this->ref)."'";
+ $sql .= ", label = '".$this->db->escape($this->label)."'";
+ $sql .= ", label_short = ".($this->label_short ? "'".$this->db->escape($this->label_short)."'" : "NULL");
+ $sql .= ", description = ".($this->description ? "'".$this->db->escape($this->description)."'" : "NULL");
+ $sql .= ", fk_system = ".((int) $this->fk_system);
+ $sql .= ", phases = '".$this->db->escape($this->phases)."'";
+ $sql .= ", num_lines = ".((int) ($this->num_lines > 0 ? $this->num_lines : 1));
+ $sql .= ", color = ".($this->color ? "'".$this->db->escape($this->color)."'" : "NULL");
+ $sql .= ", default_color = ".($this->default_color ? "'".$this->db->escape($this->default_color)."'" : "NULL");
+ $sql .= ", line_height = ".((int) ($this->line_height > 0 ? $this->line_height : 3));
+ $sql .= ", line_spacing = ".((int) ($this->line_spacing > 0 ? $this->line_spacing : 4));
+ $sql .= ", position_default = '".$this->db->escape($this->position_default ?: 'below')."'";
+ $sql .= ", fk_product = ".($this->fk_product > 0 ? ((int) $this->fk_product) : "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);
+ $sql .= " WHERE rowid = ".((int) $this->id);
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @return int Return integer <0 if KO, >0 if OK
+ */
+ public function delete($user)
+ {
+ global $conf;
+
+ // Check if type is in use (connections referencing this type)
+ $sql = "SELECT COUNT(*) as cnt FROM ".MAIN_DB_PREFIX."kundenkarte_equipment_connection";
+ $sql .= " WHERE fk_busbar_type = ".((int) $this->id);
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj->cnt > 0) {
+ $this->error = 'ErrorTypeInUse';
+ return -1;
+ }
+ }
+
+ // Cannot delete system types
+ if ($this->is_system) {
+ $this->error = 'ErrorCannotDeleteSystemType';
+ return -2;
+ }
+
+ $error = 0;
+ $this->db->begin();
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".((int) $this->id);
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+ /**
+ * Fetch all busbar types for a system
+ *
+ * @param int $systemId System ID (0 = all)
+ * @param int $activeOnly Only active types
+ * @return array Array of BusbarType objects
+ */
+ public function fetchAllBySystem($systemId = 0, $activeOnly = 1)
+ {
+ $results = array();
+
+ $sql = "SELECT t.*, s.label as system_label, s.code as system_code";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_kundenkarte_anlage_system as s ON t.fk_system = s.rowid";
+ $sql .= " WHERE 1 = 1";
+ if ($systemId > 0) {
+ $sql .= " AND t.fk_system = ".((int) $systemId);
+ }
+ if ($activeOnly) {
+ $sql .= " AND t.active = 1";
+ }
+ $sql .= " ORDER BY t.fk_system ASC, t.position ASC, t.label ASC";
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ while ($obj = $this->db->fetch_object($resql)) {
+ $type = new BusbarType($this->db);
+ $type->id = $obj->rowid;
+ $type->ref = $obj->ref;
+ $type->label = $obj->label;
+ $type->label_short = $obj->label_short;
+ $type->fk_system = $obj->fk_system;
+ $type->phases = $obj->phases;
+ $type->num_lines = $obj->num_lines;
+ $type->color = $obj->color;
+ $type->default_color = $obj->default_color;
+ $type->line_height = $obj->line_height;
+ $type->line_spacing = $obj->line_spacing;
+ $type->position_default = $obj->position_default;
+ $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;
+ $type->system_label = $obj->system_label;
+ $type->system_code = $obj->system_code;
+
+ $results[] = $type;
+ }
+ $this->db->free($resql);
+ }
+
+ return $results;
+ }
+
+ /**
+ * Get color array from comma-separated string
+ *
+ * @return array Array of color codes
+ */
+ public function getColors()
+ {
+ if (empty($this->color)) {
+ return array($this->default_color ?: '#e74c3c');
+ }
+ return explode(',', $this->color);
+ }
+
+ /**
+ * Get phase labels array from phases string
+ *
+ * @return array Array of phase labels
+ */
+ public function getPhaseLabels()
+ {
+ $phases = $this->phases;
+
+ // Parse common phase configurations
+ switch (strtoupper($phases)) {
+ case 'L1':
+ return array('L1');
+ case 'L2':
+ return array('L2');
+ case 'L3':
+ return array('L3');
+ case 'N':
+ return array('N');
+ case 'PE':
+ return array('PE');
+ case 'L1N':
+ return array('L1', 'N');
+ case '3P':
+ return array('L1', 'L2', 'L3');
+ case '3P+N':
+ case '3PN':
+ return array('L1', 'L2', 'L3', 'N');
+ case '3P+N+PE':
+ case '3PNPE':
+ return array('L1', 'L2', 'L3', 'N', 'PE');
+ default:
+ // Try to split by comma or +
+ return preg_split('/[,+]/', $phases);
+ }
+ }
+}
diff --git a/class/equipment.class.php b/class/equipment.class.php
index 55b9866..7427c8d 100644
--- a/class/equipment.class.php
+++ b/class/equipment.class.php
@@ -40,7 +40,10 @@ class Equipment extends CommonObject
public $type_label_short;
public $type_color;
public $type_picto;
- public $type_icon_file; // SVG/PNG schematic symbol
+ public $type_icon_file; // SVG/PNG schematic symbol (PDF)
+ public $type_block_image; // Image for block display in SchematicEditor
+ public $type_flow_direction; // Richtung: NULL, top_to_bottom, bottom_to_top
+ public $type_terminal_position; // Terminal-Position: both, top_only, bottom_only
public $product_ref;
public $product_label;
public $protection_device_label; // Label of the protection device
@@ -137,6 +140,8 @@ class Equipment extends CommonObject
{
$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, t.icon_file as type_icon_file,";
+ $sql .= " t.block_image as type_block_image,";
+ $sql .= " t.flow_direction as type_flow_direction, t.terminal_position as type_terminal_position,";
$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";
@@ -174,6 +179,9 @@ class Equipment extends CommonObject
$this->type_color = $obj->type_color;
$this->type_picto = $obj->type_picto;
$this->type_icon_file = $obj->type_icon_file;
+ $this->type_block_image = $obj->type_block_image;
+ $this->type_flow_direction = $obj->type_flow_direction;
+ $this->type_terminal_position = $obj->type_terminal_position ?: 'both';
$this->terminals_config = $obj->terminals_config;
$this->product_ref = $obj->product_ref;
$this->product_label = $obj->product_label;
@@ -204,7 +212,8 @@ class Equipment extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
- $sql .= " fk_equipment_type = ".((int) $this->fk_equipment_type);
+ $sql .= " fk_carrier = ".((int) $this->fk_carrier);
+ $sql .= ", fk_equipment_type = ".((int) $this->fk_equipment_type);
$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "NULL");
$sql .= ", position_te = ".((int) $this->position_te);
$sql .= ", width_te = ".((int) $this->width_te);
@@ -272,6 +281,8 @@ class Equipment extends CommonObject
$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, t.icon_file as type_icon_file,";
+ $sql .= " t.block_image as type_block_image,";
+ $sql .= " t.flow_direction as type_flow_direction, t.terminal_position as type_terminal_position,";
$sql .= " t.terminals_config as terminals_config,";
$sql .= " prot.label as protection_device_label";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as e";
@@ -307,6 +318,9 @@ class Equipment extends CommonObject
$eq->type_color = $obj->type_color;
$eq->type_picto = $obj->type_picto;
$eq->type_icon_file = $obj->type_icon_file;
+ $eq->type_block_image = $obj->type_block_image;
+ $eq->type_flow_direction = $obj->type_flow_direction;
+ $eq->type_terminal_position = $obj->type_terminal_position ?: 'both';
$eq->terminals_config = $obj->terminals_config;
$eq->protection_device_label = $obj->protection_device_label;
diff --git a/class/equipmenttype.class.php b/class/equipmenttype.class.php
index 2ca16d1..0c491cb 100644
--- a/class/equipmenttype.class.php
+++ b/class/equipmenttype.class.php
@@ -27,9 +27,12 @@ class EquipmentType extends CommonObject
public $color;
public $fk_product;
public $terminals_config; // JSON config for terminals
+ public $flow_direction; // Flussrichtung: NULL=keine, top_to_bottom, bottom_to_top
+ public $terminal_position = 'both'; // Terminal-Position: both, top_only, bottom_only
public $picto;
- public $icon_file; // Uploaded SVG/PNG file for schematic symbol
+ public $icon_file; // Uploaded SVG/PNG file for schematic symbol (PDF)
+ public $block_image; // Uploaded image for block display in SchematicEditor
public $is_system;
public $position;
public $active;
@@ -76,8 +79,8 @@ 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, icon_file, is_system, position, active,";
+ $sql .= " width_te, color, fk_product, terminals_config, flow_direction, terminal_position,";
+ $sql .= " picto, icon_file, block_image, is_system, position, active,";
$sql .= " date_creation, fk_user_creat";
$sql .= ") VALUES (";
$sql .= "0"; // entity 0 = global
@@ -90,8 +93,11 @@ class EquipmentType extends CommonObject
$sql .= ", ".($this->color ? "'".$this->db->escape($this->color)."'" : "NULL");
$sql .= ", ".($this->fk_product > 0 ? ((int) $this->fk_product) : "NULL");
$sql .= ", ".($this->terminals_config ? "'".$this->db->escape($this->terminals_config)."'" : "NULL");
+ $sql .= ", ".($this->flow_direction ? "'".$this->db->escape($this->flow_direction)."'" : "NULL");
+ $sql .= ", '".$this->db->escape($this->terminal_position ?: 'both')."'";
$sql .= ", ".($this->picto ? "'".$this->db->escape($this->picto)."'" : "NULL");
$sql .= ", ".($this->icon_file ? "'".$this->db->escape($this->icon_file)."'" : "NULL");
+ $sql .= ", ".($this->block_image ? "'".$this->db->escape($this->block_image)."'" : "NULL");
$sql .= ", 0"; // is_system = 0 for user-created
$sql .= ", ".((int) $this->position);
$sql .= ", ".((int) ($this->active !== null ? $this->active : 1));
@@ -149,8 +155,11 @@ class EquipmentType extends CommonObject
$this->color = $obj->color;
$this->fk_product = $obj->fk_product;
$this->terminals_config = $obj->terminals_config;
+ $this->flow_direction = $obj->flow_direction;
+ $this->terminal_position = $obj->terminal_position ?: 'both';
$this->picto = $obj->picto;
$this->icon_file = $obj->icon_file;
+ $this->block_image = $obj->block_image;
$this->is_system = $obj->is_system;
$this->position = $obj->position;
$this->active = $obj->active;
@@ -197,8 +206,11 @@ class EquipmentType extends CommonObject
$sql .= ", color = ".($this->color ? "'".$this->db->escape($this->color)."'" : "NULL");
$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 .= ", flow_direction = ".($this->flow_direction ? "'".$this->db->escape($this->flow_direction)."'" : "NULL");
+ $sql .= ", terminal_position = '".$this->db->escape($this->terminal_position ?: 'both')."'";
$sql .= ", picto = ".($this->picto ? "'".$this->db->escape($this->picto)."'" : "NULL");
$sql .= ", icon_file = ".($this->icon_file ? "'".$this->db->escape($this->icon_file)."'" : "NULL");
+ $sql .= ", block_image = ".($this->block_image ? "'".$this->db->escape($this->block_image)."'" : "NULL");
$sql .= ", position = ".((int) $this->position);
$sql .= ", active = ".((int) $this->active);
$sql .= ", fk_user_modif = ".((int) $user->id);
@@ -306,8 +318,11 @@ class EquipmentType extends CommonObject
$type->width_te = $obj->width_te;
$type->color = $obj->color;
$type->fk_product = $obj->fk_product;
+ $type->flow_direction = $obj->flow_direction;
+ $type->terminal_position = $obj->terminal_position ?: 'both';
$type->picto = $obj->picto;
$type->icon_file = $obj->icon_file;
+ $type->block_image = $obj->block_image;
$type->is_system = $obj->is_system;
$type->position = $obj->position;
$type->active = $obj->active;
diff --git a/class/terminalbridge.class.php b/class/terminalbridge.class.php
new file mode 100644
index 0000000..125f1d7
--- /dev/null
+++ b/class/terminalbridge.class.php
@@ -0,0 +1,255 @@
+db = $db;
+ }
+
+ /**
+ * Create object in database
+ *
+ * @param User $user User that creates
+ * @return int Return integer <0 if KO, Id of created object if OK
+ */
+ public function create($user)
+ {
+ $error = 0;
+ $now = dol_now();
+
+ if (empty($this->fk_anlage) || empty($this->fk_carrier) || empty($this->start_te) || empty($this->end_te)) {
+ $this->error = 'ErrorMissingParameters';
+ return -1;
+ }
+
+ $this->db->begin();
+
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+ $sql .= "entity, fk_anlage, fk_carrier, start_te, end_te,";
+ $sql .= " terminal_side, terminal_row, color, bridge_type, label,";
+ $sql .= " status, date_creation, fk_user_creat";
+ $sql .= ") VALUES (";
+ $sql .= ((int) $this->entity ?: 1);
+ $sql .= ", ".((int) $this->fk_anlage);
+ $sql .= ", ".((int) $this->fk_carrier);
+ $sql .= ", ".((int) $this->start_te);
+ $sql .= ", ".((int) $this->end_te);
+ $sql .= ", '".$this->db->escape($this->terminal_side ?: 'top')."'";
+ $sql .= ", ".((int) $this->terminal_row);
+ $sql .= ", '".$this->db->escape($this->color ?: '#e74c3c')."'";
+ $sql .= ", '".$this->db->escape($this->bridge_type ?: 'standard')."'";
+ $sql .= ", ".($this->label ? "'".$this->db->escape($this->label)."'" : "NULL");
+ $sql .= ", ".((int) ($this->status !== null ? $this->status : 1));
+ $sql .= ", '".$this->db->idate($now)."'";
+ $sql .= ", ".((int) $user->id);
+ $sql .= ")";
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if (!$error) {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return $this->id;
+ }
+ }
+
+ /**
+ * Load object from database
+ *
+ * @param int $id ID of record
+ * @return int Return integer <0 if KO, 0 if not found, >0 if OK
+ */
+ public function fetch($id)
+ {
+ $sql = "SELECT * FROM ".MAIN_DB_PREFIX.$this->table_element;
+ $sql .= " WHERE rowid = ".((int) $id);
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ if ($this->db->num_rows($resql)) {
+ $obj = $this->db->fetch_object($resql);
+
+ $this->id = $obj->rowid;
+ $this->entity = $obj->entity;
+ $this->fk_anlage = $obj->fk_anlage;
+ $this->fk_carrier = $obj->fk_carrier;
+ $this->start_te = $obj->start_te;
+ $this->end_te = $obj->end_te;
+ $this->terminal_side = $obj->terminal_side;
+ $this->terminal_row = $obj->terminal_row;
+ $this->color = $obj->color;
+ $this->bridge_type = $obj->bridge_type;
+ $this->label = $obj->label;
+ $this->status = $obj->status;
+ $this->date_creation = $this->db->jdate($obj->date_creation);
+ $this->fk_user_creat = $obj->fk_user_creat;
+ $this->fk_user_modif = $obj->fk_user_modif;
+
+ $this->db->free($resql);
+ return 1;
+ } else {
+ $this->db->free($resql);
+ return 0;
+ }
+ } else {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ }
+
+ /**
+ * Update object in database
+ *
+ * @param User $user User that modifies
+ * @return int Return integer <0 if KO, >0 if OK
+ */
+ public function update($user)
+ {
+ $error = 0;
+
+ $this->db->begin();
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+ $sql .= " fk_anlage = ".((int) $this->fk_anlage);
+ $sql .= ", fk_carrier = ".((int) $this->fk_carrier);
+ $sql .= ", start_te = ".((int) $this->start_te);
+ $sql .= ", end_te = ".((int) $this->end_te);
+ $sql .= ", terminal_side = '".$this->db->escape($this->terminal_side ?: 'top')."'";
+ $sql .= ", terminal_row = ".((int) $this->terminal_row);
+ $sql .= ", color = '".$this->db->escape($this->color ?: '#e74c3c')."'";
+ $sql .= ", bridge_type = '".$this->db->escape($this->bridge_type ?: 'standard')."'";
+ $sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "NULL");
+ $sql .= ", status = ".((int) $this->status);
+ $sql .= ", fk_user_modif = ".((int) $user->id);
+ $sql .= " WHERE rowid = ".((int) $this->id);
+
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @return int Return integer <0 if KO, >0 if OK
+ */
+ public function delete($user)
+ {
+ $error = 0;
+ $this->db->begin();
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".((int) $this->id);
+ $resql = $this->db->query($sql);
+ if (!$resql) {
+ $error++;
+ $this->errors[] = "Error ".$this->db->lasterror();
+ }
+
+ if ($error) {
+ $this->db->rollback();
+ return -1 * $error;
+ } else {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+ /**
+ * Fetch all bridges for an installation
+ *
+ * @param int $anlageId Installation ID
+ * @param int $carrierId Optional carrier ID filter
+ * @return array Array of TerminalBridge objects
+ */
+ public function fetchAllByAnlage($anlageId, $carrierId = 0)
+ {
+ $results = array();
+
+ $sql = "SELECT * FROM ".MAIN_DB_PREFIX.$this->table_element;
+ $sql .= " WHERE fk_anlage = ".((int) $anlageId);
+ $sql .= " AND status = 1";
+ if ($carrierId > 0) {
+ $sql .= " AND fk_carrier = ".((int) $carrierId);
+ }
+ $sql .= " ORDER BY fk_carrier ASC, terminal_side ASC, start_te ASC";
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ while ($obj = $this->db->fetch_object($resql)) {
+ $bridge = new TerminalBridge($this->db);
+ $bridge->id = $obj->rowid;
+ $bridge->entity = $obj->entity;
+ $bridge->fk_anlage = $obj->fk_anlage;
+ $bridge->fk_carrier = $obj->fk_carrier;
+ $bridge->start_te = $obj->start_te;
+ $bridge->end_te = $obj->end_te;
+ $bridge->terminal_side = $obj->terminal_side;
+ $bridge->terminal_row = $obj->terminal_row;
+ $bridge->color = $obj->color;
+ $bridge->bridge_type = $obj->bridge_type;
+ $bridge->label = $obj->label;
+ $bridge->status = $obj->status;
+
+ $results[] = $bridge;
+ }
+ $this->db->free($resql);
+ }
+
+ return $results;
+ }
+}
diff --git a/css/kundenkarte.css b/css/kundenkarte.css
index d8a170a..3a66628 100755
--- a/css/kundenkarte.css
+++ b/css/kundenkarte.css
@@ -821,8 +821,10 @@
border: 1px solid #444 !important;
border-radius: 6px !important;
overflow: visible !important;
- display: inline-block !important;
- min-width: 100% !important;
+ display: block !important;
+ width: 100% !important;
+ max-width: 100% !important;
+ box-sizing: border-box !important;
}
.kundenkarte-carrier-header {
@@ -876,10 +878,13 @@
position: relative !important;
padding: 15px !important;
background: #1e1e1e !important;
- overflow: visible !important;
+ overflow-x: auto !important;
+ overflow-y: visible !important;
border-radius: 0 0 6px 6px !important;
- display: inline-block !important;
- min-width: calc(100% - 30px) !important;
+ display: block !important;
+ width: 100% !important;
+ max-width: 100% !important;
+ box-sizing: border-box !important;
}
.kundenkarte-carrier-svg {
@@ -1414,7 +1419,7 @@
.kundenkarte-connection-svg {
display: block !important;
- min-width: 100% !important;
+ max-width: 100% !important;
border-radius: 4px !important;
}
@@ -1602,6 +1607,14 @@
.schematic-editor-wrapper {
margin-top: 20px !important;
+ max-width: 100% !important;
+ overflow-x: auto !important;
+}
+
+/* Prevent Schematic Editor from breaking Dolibarr layout */
+.kundenkarte-equipment-container {
+ max-width: 100% !important;
+ overflow-x: auto !important;
}
.schematic-editor-header {
@@ -1638,6 +1651,8 @@
padding: 15px !important;
overflow: auto !important;
min-height: 300px !important;
+ max-width: 100% !important;
+ box-sizing: border-box !important;
}
.schematic-editor-canvas.expanded {
@@ -1660,6 +1675,12 @@
filter: brightness(1.3) !important;
}
+.schematic-rail.drop-target {
+ filter: brightness(1.5) !important;
+ stroke: #27ae60 !important;
+ stroke-width: 3px !important;
+}
+
.schematic-rail-bg {
opacity: 0.8 !important;
}
diff --git a/js/kundenkarte.js b/js/kundenkarte.js
index 95c686b..43a6ed9 100755
--- a/js/kundenkarte.js
+++ b/js/kundenkarte.js
@@ -4439,6 +4439,7 @@
carriers: [],
equipment: [],
connections: [],
+ bridges: [], // Terminal bridges (Brücken zwischen Klemmen)
selectedTerminal: null,
dragState: null,
isInitialized: false,
@@ -4580,14 +4581,159 @@
self.zoomToFit();
});
- // Busbar click - show edit/delete popup
+ // Bridge click - show delete popup
+ $(document).off('click.bridge').on('click.bridge', '.schematic-bridge', function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ var bridgeId = $(this).data('bridge-id');
+ self.showBridgePopup(bridgeId, e.clientX, e.clientY);
+ });
+
+ // Busbar click - show edit/delete popup (only if not dragging)
$(document).off('click.busbar').on('click.busbar', '.schematic-busbar', function(e) {
+ if (self.busbarDragging) return; // Don't show popup if we just finished dragging
e.preventDefault();
e.stopPropagation();
var connectionId = $(this).data('connection-id');
self.showBusbarPopup(connectionId, e.clientX, e.clientY);
});
+ // Busbar drag - allow repositioning by dragging (keeps width, can move to other carriers)
+ $(document).off('mousedown.busbarDrag').on('mousedown.busbarDrag', '.schematic-busbar', function(e) {
+ if (e.button !== 0) return; // Only left mouse button
+ e.preventDefault();
+ e.stopPropagation();
+
+ var $busbar = $(this);
+ var connectionId = $busbar.data('connection-id');
+ var conn = self.connections.find(function(c) { return String(c.id) === String(connectionId); });
+ if (!conn) return;
+
+ // Get carrier for this busbar
+ var carrier = self.carriers.find(function(c) { return String(c.id) === String(conn.fk_carrier); });
+ if (!carrier) return;
+
+ // Calculate busbar width in TE (this should stay constant)
+ var originalStartTE = parseInt(conn.rail_start_te) || 1;
+ var originalEndTE = parseInt(conn.rail_end_te) || 1;
+ var busbarWidthTE = originalEndTE - originalStartTE + 1;
+
+ self.busbarDragData = {
+ connectionId: connectionId,
+ conn: conn,
+ originalCarrier: carrier,
+ currentCarrier: carrier,
+ startX: e.clientX,
+ startY: e.clientY,
+ originalStartTE: originalStartTE,
+ originalEndTE: originalEndTE,
+ busbarWidthTE: busbarWidthTE, // Keep width constant
+ moved: false
+ };
+
+ $busbar.css('cursor', 'grabbing');
+ });
+
+ $(document).off('mousemove.busbarDrag').on('mousemove.busbarDrag', function(e) {
+ if (!self.busbarDragData) return;
+
+ var data = self.busbarDragData;
+ var dx = e.clientX - data.startX;
+ var dy = e.clientY - data.startY;
+
+ // Only start dragging after 5px movement
+ if (!data.moved && Math.abs(dx) < 5 && Math.abs(dy) < 5) return;
+ data.moved = true;
+ self.busbarDragging = true;
+
+ // Find which carrier the mouse is over (based on Y position)
+ var svgRect = $(self.svgElement)[0].getBoundingClientRect();
+ var mouseY = e.clientY - svgRect.top;
+ var targetCarrier = data.originalCarrier;
+
+ // Check all carriers to find which one we're over
+ self.carriers.forEach(function(carrier) {
+ if (typeof carrier._y !== 'undefined') {
+ var carrierTop = carrier._y - self.BLOCK_HEIGHT / 2 - 50;
+ var carrierBottom = carrier._y + self.BLOCK_HEIGHT / 2 + 50;
+ if (mouseY >= carrierTop && mouseY <= carrierBottom) {
+ targetCarrier = carrier;
+ }
+ }
+ });
+
+ data.currentCarrier = targetCarrier;
+
+ // Calculate new start TE based on horizontal movement relative to target carrier
+ var mouseX = e.clientX - svgRect.left;
+ var relativeX = mouseX - targetCarrier._x;
+ var newStartTE = Math.round(relativeX / self.TE_WIDTH) + 1;
+
+ // Keep width constant - calculate new end based on fixed width
+ var newEndTE = newStartTE + data.busbarWidthTE - 1;
+
+ // Clamp to carrier bounds (shift if needed to fit)
+ var totalTE = parseInt(targetCarrier.total_te) || 12;
+ if (newStartTE < 1) {
+ newStartTE = 1;
+ newEndTE = newStartTE + data.busbarWidthTE - 1;
+ }
+ if (newEndTE > totalTE) {
+ newEndTE = totalTE;
+ newStartTE = Math.max(1, newEndTE - data.busbarWidthTE + 1);
+ }
+
+ // Update visual preview
+ var $busbar = $('.schematic-busbar[data-connection-id="' + data.connectionId + '"]');
+ var startX = targetCarrier._x + (newStartTE - 1) * self.TE_WIDTH;
+ var width = data.busbarWidthTE * self.TE_WIDTH;
+
+ // Calculate new Y position based on target carrier
+ var posY = parseInt(data.conn.position_y) || 0;
+ var railCenterY = targetCarrier._y + self.RAIL_HEIGHT / 2;
+ var blockTop = railCenterY - self.BLOCK_HEIGHT / 2;
+ var blockBottom = railCenterY + self.BLOCK_HEIGHT / 2;
+ var busbarHeight = 24;
+ var newBusbarY;
+ if (posY === 0) {
+ newBusbarY = blockTop - busbarHeight - 25;
+ } else {
+ newBusbarY = blockBottom + 25;
+ }
+
+ $busbar.find('rect').each(function(idx) {
+ $(this).attr('x', startX);
+ $(this).attr('width', width);
+ // Update Y position (with shadow offset for second rect)
+ var yOffset = idx === 0 ? 2 : 0; // Shadow has +2 offset
+ $(this).attr('y', newBusbarY + yOffset);
+ });
+
+ // Store new positions for drop
+ data.newStartTE = newStartTE;
+ data.newEndTE = newEndTE;
+ data.newCarrierId = targetCarrier.id;
+ });
+
+ $(document).off('mouseup.busbarDrag').on('mouseup.busbarDrag', function(e) {
+ if (!self.busbarDragData) return;
+
+ var data = self.busbarDragData;
+ self.busbarDragData = null;
+
+ $('.schematic-busbar').css('cursor', 'pointer');
+
+ if (data.moved && data.newStartTE && data.newEndTE) {
+ // Save new position (and possibly new carrier)
+ self.updateBusbarPosition(data.connectionId, data.newStartTE, data.newEndTE, data.newCarrierId);
+ }
+
+ // Clear drag flag after a short delay (to prevent click popup)
+ setTimeout(function() {
+ self.busbarDragging = false;
+ }, 100);
+ });
+
// Rail (Hutschiene) click - show popup for editing
$(document).off('click.rail').on('click.rail', '.schematic-rail', function(e) {
e.preventDefault();
@@ -4718,6 +4864,160 @@
$('.schematic-busbar-popup').remove();
},
+ showBridgePopup: function(bridgeId, x, y) {
+ var self = this;
+ this.hideBridgePopup();
+
+ var bridge = this.bridges.find(function(b) { return String(b.id) === String(bridgeId); });
+ if (!bridge) return;
+
+ var html = '';
+
+ $('body').append(html);
+
+ $('.bridge-delete-btn').on('click', function() {
+ var id = $(this).data('id');
+ self.hideBridgePopup();
+ self.deleteBridge(id);
+ });
+
+ // Close on click outside
+ setTimeout(function() {
+ $(document).one('click', function() {
+ self.hideBridgePopup();
+ });
+ }, 100);
+ },
+
+ hideBridgePopup: function() {
+ $('.schematic-bridge-popup').remove();
+ },
+
+ deleteBridge: function(bridgeId) {
+ var self = this;
+
+ $.ajax({
+ url: baseUrl + '/custom/kundenkarte/ajax/equipment_connection.php',
+ method: 'POST',
+ data: {
+ action: 'delete_bridge',
+ bridge_id: bridgeId,
+ token: $('input[name="token"]').val()
+ },
+ dataType: 'json',
+ success: function(response) {
+ if (response.success) {
+ self.showMessage('Brücke gelöscht', 'success');
+ // Remove from local data
+ self.bridges = self.bridges.filter(function(b) { return String(b.id) !== String(bridgeId); });
+ self.render();
+ } else {
+ self.showMessage(response.error || 'Fehler beim Löschen', 'error');
+ }
+ }
+ });
+ },
+
+ createBridge: function(carrierId, startTE, endTE, terminalSide, terminalRow, color) {
+ var self = this;
+
+ $.ajax({
+ url: baseUrl + '/custom/kundenkarte/ajax/equipment_connection.php',
+ method: 'POST',
+ data: {
+ action: 'create_bridge',
+ anlage_id: this.anlageId,
+ carrier_id: carrierId,
+ start_te: startTE,
+ end_te: endTE,
+ terminal_side: terminalSide || 'top',
+ terminal_row: terminalRow || 0,
+ color: color || '#e74c3c',
+ token: $('input[name="token"]').val()
+ },
+ dataType: 'json',
+ success: function(response) {
+ if (response.success) {
+ self.showMessage('Brücke erstellt', 'success');
+ // Add to local data
+ self.bridges.push(response.bridge);
+ self.render();
+ } else {
+ self.showMessage(response.error || 'Fehler beim Erstellen', 'error');
+ }
+ }
+ });
+ },
+
+ showCreateBridgeDialog: function(carrierId, defaultStartTE, defaultEndTE) {
+ var self = this;
+ var carrier = this.carriers.find(function(c) { return String(c.id) === String(carrierId); });
+ if (!carrier) return;
+
+ var html = '';
+ html += '';
+ html += '
Brücke erstellen
';
+
+ // Start TE
+ html += '
';
+ html += '
';
+
+ // End TE
+ html += '
';
+ html += '
';
+
+ // Terminal Side
+ html += '
';
+ html += '
';
+
+ // Terminal Row
+ html += '
';
+ html += '
';
+
+ // Color
+ html += '
';
+ html += '
';
+
+ // Buttons
+ html += '
';
+ html += '';
+ html += '';
+ html += '
';
+ } else {
+ print 'Kein