From 03d8166f2b119d41b8a5fba9e0925d30cea9fd2e Mon Sep 17 00:00:00 2001
From: Marcel Diegelmann <marcel.diegelmann@gmail.com>
Date: Mon, 28 Jul 2025 10:33:30 +0200
Subject: [PATCH] =?UTF-8?q?BOMImporter=20und=20AssemblyBomEntriesDataTable?=
 =?UTF-8?q?:=20Mountnames=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Die Verarbeitung der Designators im BOMImporter wurde ergänzt, um Mountnames zu setzen. Zudem wurden neue Spalten wie Kategorie, Footprint, Hersteller und Mountnames in der AssemblyBomEntriesDataTable hinzugefügt. Dies verbessert die Darstellung und Handhabung von Bauteildaten in der Stücklisten-Ansicht.
---
 .../AssemblyBomEntriesDataTable.php           | 49 +++++++++++++++++++
 .../ImportExportSystem/BOMImporter.php        |  9 ++++
 2 files changed, 58 insertions(+)

diff --git a/src/DataTables/AssemblyBomEntriesDataTable.php b/src/DataTables/AssemblyBomEntriesDataTable.php
index b2c3e118..e506dccd 100644
--- a/src/DataTables/AssemblyBomEntriesDataTable.php
+++ b/src/DataTables/AssemblyBomEntriesDataTable.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
  */
 namespace App\DataTables;
 
+use App\DataTables\Column\EntityColumn;
 use App\DataTables\Column\LocaleDateTimeColumn;
 use App\DataTables\Column\MarkdownColumn;
 use App\DataTables\Helpers\AssemblyDataTableHelper;
@@ -146,6 +147,54 @@ class AssemblyBomEntriesDataTable implements DataTableTypeInterface
                     return $context->getComment();
                 },
             ])
+            ->add('category', EntityColumn::class, [
+                'label' => $this->translator->trans('part.table.category'),
+                'property' => 'part.category',
+                'orderField' => 'NATSORT(category.name)',
+            ])
+            ->add('footprint', EntityColumn::class, [
+                'property' => 'part.footprint',
+                'label' => $this->translator->trans('part.table.footprint'),
+                'orderField' => 'NATSORT(footprint.name)',
+            ])
+            ->add('manufacturer', EntityColumn::class, [
+                'property' => 'part.manufacturer',
+                'label' => $this->translator->trans('part.table.manufacturer'),
+                'orderField' => 'NATSORT(manufacturer.name)',
+            ])
+            ->add('mountnames', TextColumn::class, [
+                'label' => 'assembly.bom.mountnames',
+                'render' => function ($value, AssemblyBOMEntry $context) {
+                    $html = '';
+
+                    foreach (explode(',', $context->getMountnames()) as $mountname) {
+                        $html .= sprintf('<span class="badge badge-secondary bg-secondary">%s</span> ', htmlspecialchars($mountname));
+                    }
+                    return $html;
+                },
+            ])
+            ->add('instockAmount', TextColumn::class, [
+                'label' => 'assembly.bom.instockAmount',
+                'visible' => false,
+                'render' => function ($value, AssemblyBOMEntry $context) {
+                    if ($context->getPart() !== null) {
+                        return $this->partDataTableHelper->renderAmount($context->getPart());
+                    }
+
+                    return '';
+                }
+            ])
+            ->add('storageLocations', TextColumn::class, [
+                'label' => 'part.table.storeLocations',
+                'visible' => false,
+                'render' => function ($value, AssemblyBOMEntry $context) {
+                    if ($context->getPart() !== null) {
+                        return $this->partDataTableHelper->renderStorageLocations($context->getPart());
+                    }
+
+                    return '';
+                }
+            ])
             ->add('addedDate', LocaleDateTimeColumn::class, [
                 'label' => $this->translator->trans('part.table.addedDate'),
             ])
diff --git a/src/Services/ImportExportSystem/BOMImporter.php b/src/Services/ImportExportSystem/BOMImporter.php
index 034bebaa..1a57e1f9 100644
--- a/src/Services/ImportExportSystem/BOMImporter.php
+++ b/src/Services/ImportExportSystem/BOMImporter.php
@@ -563,6 +563,11 @@ class BOMImporter
                 $this->processPart($importObject, $entry, $result, $key, self::IMPORT_TYPE_CSV);
             } else {
                 $bomEntry = $this->getOrCreateBomEntry($importObject, $entry['name'] ?? null);
+
+                if (isset($entry['designator'])) {
+                    $bomEntry->setMountnames(trim($entry['designator']) === '' ? '' : trim($entry['designator']));
+                }
+
                 $bomEntry->setQuantity((float) $entry['quantity'] ?? 0);
 
                 $result->addBomEntry($bomEntry);
@@ -851,6 +856,10 @@ class BOMImporter
             $bomEntry->setName(null);
         }
 
+        if (isset($entry['designator'])) {
+            $bomEntry->setMountnames(trim($entry['designator']) === '' ? '' : trim($entry['designator']));
+        }
+
         $bomEntry->setPart($part);
 
         $result->addBomEntry($bomEntry);