From 9f42e751f5e4ae54471050a17a87397f93bf6a66 Mon Sep 17 00:00:00 2001
From: Marcel Diegelmann <marcel.diegelmann@gmail.com>
Date: Wed, 1 Oct 2025 13:17:53 +0200
Subject: [PATCH] =?UTF-8?q?=C3=9Cberarbeitung=20Mountnames-=20sowie=20Desi?=
 =?UTF-8?q?gnator=20Angabe=20f=C3=BCr=20Freitext.=20Export-Angleichung.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssemblySystem/AssemblyBOMEntry.php       |  3 ++-
 .../AssemblySystem/AssemblyBOMEntryType.php   |  6 ++++--
 .../ImportExportSystem/EntityExporter.php     | 20 +++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Entity/AssemblySystem/AssemblyBOMEntry.php b/src/Entity/AssemblySystem/AssemblyBOMEntry.php
index e4337446..56710aab 100644
--- a/src/Entity/AssemblySystem/AssemblyBOMEntry.php
+++ b/src/Entity/AssemblySystem/AssemblyBOMEntry.php
@@ -202,9 +202,10 @@ class AssemblyBOMEntry extends AbstractDBElement implements UniqueValidatableInt
         return $this->designator;
     }
 
-    public function setDesignator(string $designator): void
+    public function setDesignator(string $designator): AssemblyBOMEntry
     {
         $this->designator = $designator;
+        return $this;
     }
 
     /**
diff --git a/src/Form/AssemblySystem/AssemblyBOMEntryType.php b/src/Form/AssemblySystem/AssemblyBOMEntryType.php
index f8a7a86d..4ef0adec 100644
--- a/src/Form/AssemblySystem/AssemblyBOMEntryType.php
+++ b/src/Form/AssemblySystem/AssemblyBOMEntryType.php
@@ -51,15 +51,17 @@ class AssemblyBOMEntryType extends AbstractType
             ->add('designator', TextType::class, [
                 'label' => 'assembly.bom.designator',
                 'help' => 'assembly.bom.designator.help',
-                'required' => false
+                'empty_data' => '',
+                'required' => false,
             ])
             ->add('mountnames', TextType::class, [
                 'required' => false,
                 'label' => 'assembly.bom.mountnames',
+                'empty_data' => '',
                 'attr' => [
                     'class' => 'tagsinput',
                     'data-controller' => 'elements--tagsinput',
-                ]
+                ],
             ])
             ->add('comment', RichTextEditorType::class, [
                 'required' => false,
diff --git a/src/Services/ImportExportSystem/EntityExporter.php b/src/Services/ImportExportSystem/EntityExporter.php
index 7b48623e..dea43a6e 100644
--- a/src/Services/ImportExportSystem/EntityExporter.php
+++ b/src/Services/ImportExportSystem/EntityExporter.php
@@ -383,8 +383,8 @@ class EntityExporter
                     'Id', 'ParentId', 'Type', 'ProjectNameHierarchical', 'ProjectName', 'ProjectFullName',
 
                     //BOM relevant attributes
-                    'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator',
-                    'Description', 'MountNames'
+                    'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Mountnames',
+                    'Description',
                 ],
                 'processEntity' => fn($entity, $depth) => [
                     'Id' => $entity->getId(),
@@ -402,9 +402,8 @@ class EntityExporter
                     'Manufacturer' => '-',
                     'Mpn' => '-',
                     'Name' => '-',
-                    'Designator' => '-',
+                    'Mountnames' => '-',
                     'Description' => '-',
-                    'MountNames' => '-',
                 ],
                 'processBomEntries' => fn($entity, $depth) => array_map(fn(ProjectBOMEntry $bomEntry) => [
                     'Id' => $entity->getId(),
@@ -422,9 +421,8 @@ class EntityExporter
                     'Manufacturer' => $bomEntry->getPart()?->getManufacturer()?->getName() ?? '',
                     'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '',
                     'Name' => $bomEntry->getPart()?->getName() ?? '',
-                    'Designator' => $bomEntry->getMountnames() ?? '',
+                    'Mountnames' => $bomEntry->getMountnames(),
                     'Description' => $bomEntry->getPart()?->getDescription() ?? '',
-                    'MountNames' => $bomEntry->getMountNames(),
                 ], $entity->getBomEntries()->toArray()),
             ],
             Assembly::class => [
@@ -434,8 +432,8 @@ class EntityExporter
 
                     //BOM relevant attributes
                     'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator',
-                    'Description', 'MountNames', 'ReferencedAssemblyId', 'ReferencedAssemblyIpn',
-                    'ReferencedAssemblyFullName'
+                    'Mountnames', 'Description', 'ReferencedAssemblyId', 'ReferencedAssemblyIpn',
+                    'ReferencedAssemblyFullName',
                 ],
                 'processEntity' => fn($entity, $depth) => [
                     'Id' => $entity->getId(),
@@ -455,8 +453,8 @@ class EntityExporter
                     'Mpn' => '-',
                     'Name' => '-',
                     'Designator' => '-',
+                    'Mountnames' => '-',
                     'Description' => '-',
-                    'MountNames' => '-',
                     'ReferencedAssemblyId' => '-',
                     'ReferencedAssemblyIpn' => '-',
                     'ReferencedAssemblyFullName' => '-',
@@ -593,7 +591,7 @@ class EntityExporter
                 'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '-',
                 'Name' => $bomEntry->getName() ?? '-',
                 'Designator' => $bomEntry->getDesignator(),
-                'MountNames' => $bomEntry->getMountNames(),
+                'Mountnames' => $bomEntry->getMountnames(),
                 'Description' => $bomEntry->getPart()?->getDescription() ?? '-',
                 'ReferencedAssemblyId' => $bomEntry->getReferencedAssembly()?->getId() ?? '-',
                 'ReferencedAssemblyIpn' => $bomEntry->getReferencedAssembly()?->getIpn() ?? '-',
@@ -628,8 +626,8 @@ class EntityExporter
                         'Mpn' => $partData['part']?->getManufacturerProductNumber(),
                         'Name' => $partData['name'] ?? '',
                         'Designator' => $partData['designator'],
+                        'Mountnames' => '-',
                         'Description' => $partData['part']?->getDescription(),
-                        'MountNames' => '-',
                         'ReferencedAssemblyId' => '-',
                         'ReferencedAssemblyIpn' => '-',
                         'ReferencedAssemblyFullName' => '-',