groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-15 14:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Überarbeitung Mountnames- sowie Designator Angabe für Freitext. Export-Angleichung.

Browse source
This commit is contained in:
Marcel Diegelmann 2025-10-01 13:17:53 +02:00
parent 596a30db74
commit 9f42e751f5
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Entity/AssemblySystem/AssemblyBOMEntry.php
View file

@ -202,9 +202,10 @@ class AssemblyBOMEntry extends AbstractDBElement implements UniqueValidatableInt
return $this->designator; return $this->designator;
} }
public function setDesignator(string $designator): void public function setDesignator(string $designator): AssemblyBOMEntry
{ {
$this->designator = $designator; $this->designator = $designator;
return $this;
} }
/** /**

6
src/Form/AssemblySystem/AssemblyBOMEntryType.php
View file

@ -51,15 +51,17 @@ class AssemblyBOMEntryType extends AbstractType
->add('designator', TextType::class, [ ->add('designator', TextType::class, [
'label' => 'assembly.bom.designator', 'label' => 'assembly.bom.designator',
'help' => 'assembly.bom.designator.help', 'help' => 'assembly.bom.designator.help',
'required' => false 'empty_data' => '',
'required' => false,
]) ])
->add('mountnames', TextType::class, [ ->add('mountnames', TextType::class, [
'required' => false, 'required' => false,
'label' => 'assembly.bom.mountnames', 'label' => 'assembly.bom.mountnames',
'empty_data' => '',
'attr' => [ 'attr' => [
'class' => 'tagsinput', 'class' => 'tagsinput',
'data-controller' => 'elements--tagsinput', 'data-controller' => 'elements--tagsinput',
] ],
]) ])
->add('comment', RichTextEditorType::class, [ ->add('comment', RichTextEditorType::class, [
'required' => false, 'required' => false,

20
src/Services/ImportExportSystem/EntityExporter.php
View file

@ -383,8 +383,8 @@ class EntityExporter
'Id', 'ParentId', 'Type', 'ProjectNameHierarchical', 'ProjectName', 'ProjectFullName', 'Id', 'ParentId', 'Type', 'ProjectNameHierarchical', 'ProjectName', 'ProjectFullName',
//BOM relevant attributes //BOM relevant attributes
'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator', 'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Mountnames',
'Description', 'MountNames' 'Description',
], ],
'processEntity' => fn($entity, $depth) => [ 'processEntity' => fn($entity, $depth) => [
'Id' => $entity->getId(), 'Id' => $entity->getId(),
@ -402,9 +402,8 @@ class EntityExporter
'Manufacturer' => '-', 'Manufacturer' => '-',
'Mpn' => '-', 'Mpn' => '-',
'Name' => '-', 'Name' => '-',
'Designator' => '-', 'Mountnames' => '-',
'Description' => '-', 'Description' => '-',
'MountNames' => '-',
], ],
'processBomEntries' => fn($entity, $depth) => array_map(fn(ProjectBOMEntry $bomEntry) => [ 'processBomEntries' => fn($entity, $depth) => array_map(fn(ProjectBOMEntry $bomEntry) => [
'Id' => $entity->getId(), 'Id' => $entity->getId(),
@ -422,9 +421,8 @@ class EntityExporter
'Manufacturer' => $bomEntry->getPart()?->getManufacturer()?->getName() ?? '', 'Manufacturer' => $bomEntry->getPart()?->getManufacturer()?->getName() ?? '',
'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '', 'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '',
'Name' => $bomEntry->getPart()?->getName() ?? '', 'Name' => $bomEntry->getPart()?->getName() ?? '',
'Designator' => $bomEntry->getMountnames() ?? '', 'Mountnames' => $bomEntry->getMountnames(),
'Description' => $bomEntry->getPart()?->getDescription() ?? '', 'Description' => $bomEntry->getPart()?->getDescription() ?? '',
'MountNames' => $bomEntry->getMountNames(),
], $entity->getBomEntries()->toArray()), ], $entity->getBomEntries()->toArray()),
], ],
Assembly::class => [ Assembly::class => [
@ -434,8 +432,8 @@ class EntityExporter
//BOM relevant attributes //BOM relevant attributes
'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator', 'Quantity', 'PartId', 'PartName', 'Ipn', 'Manufacturer', 'Mpn', 'Name', 'Designator',
'Description', 'MountNames', 'ReferencedAssemblyId', 'ReferencedAssemblyIpn', 'Mountnames', 'Description', 'ReferencedAssemblyId', 'ReferencedAssemblyIpn',
'ReferencedAssemblyFullName' 'ReferencedAssemblyFullName',
], ],
'processEntity' => fn($entity, $depth) => [ 'processEntity' => fn($entity, $depth) => [
'Id' => $entity->getId(), 'Id' => $entity->getId(),
@ -455,8 +453,8 @@ class EntityExporter
'Mpn' => '-', 'Mpn' => '-',
'Name' => '-', 'Name' => '-',
'Designator' => '-', 'Designator' => '-',
'Mountnames' => '-',
'Description' => '-', 'Description' => '-',
'MountNames' => '-',
'ReferencedAssemblyId' => '-', 'ReferencedAssemblyId' => '-',
'ReferencedAssemblyIpn' => '-', 'ReferencedAssemblyIpn' => '-',
'ReferencedAssemblyFullName' => '-', 'ReferencedAssemblyFullName' => '-',
@ -593,7 +591,7 @@ class EntityExporter
'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '-', 'Mpn' => $bomEntry->getPart()?->getManufacturerProductNumber() ?? '-',
'Name' => $bomEntry->getName() ?? '-', 'Name' => $bomEntry->getName() ?? '-',
'Designator' => $bomEntry->getDesignator(), 'Designator' => $bomEntry->getDesignator(),
'MountNames' => $bomEntry->getMountNames(), 'Mountnames' => $bomEntry->getMountnames(),
'Description' => $bomEntry->getPart()?->getDescription() ?? '-', 'Description' => $bomEntry->getPart()?->getDescription() ?? '-',
'ReferencedAssemblyId' => $bomEntry->getReferencedAssembly()?->getId() ?? '-', 'ReferencedAssemblyId' => $bomEntry->getReferencedAssembly()?->getId() ?? '-',
'ReferencedAssemblyIpn' => $bomEntry->getReferencedAssembly()?->getIpn() ?? '-', 'ReferencedAssemblyIpn' => $bomEntry->getReferencedAssembly()?->getIpn() ?? '-',
@ -628,8 +626,8 @@ class EntityExporter
'Mpn' => $partData['part']?->getManufacturerProductNumber(), 'Mpn' => $partData['part']?->getManufacturerProductNumber(),
'Name' => $partData['name'] ?? '', 'Name' => $partData['name'] ?? '',
'Designator' => $partData['designator'], 'Designator' => $partData['designator'],
'Mountnames' => '-',
'Description' => $partData['part']?->getDescription(), 'Description' => $partData['part']?->getDescription(),
'MountNames' => '-',
'ReferencedAssemblyId' => '-', 'ReferencedAssemblyId' => '-',
'ReferencedAssemblyIpn' => '-', 'ReferencedAssemblyIpn' => '-',
'ReferencedAssemblyFullName' => '-', 'ReferencedAssemblyFullName' => '-',