Baugruppen Stückliste um referenzierte Baugruppe erweitern

src/Services/AssemblySystem/AssemblyBuildHelper.php

@@ -67,6 +67,7 @@ class AssemblyBuildHelper
     public function getMaximumBuildableCount(Assembly $assembly): int
     {
         $maximum_buildable_count = PHP_INT_MAX;
+        /** @var AssemblyBOMEntry $bom_entry */
         foreach ($assembly->getBomEntries() as $bom_entry) {
             //Skip BOM entries without a part (as we can not determine that)
             if (!$bom_entry->isPartBomEntry() && $bom_entry->getProject() === null) {
@@ -76,8 +77,8 @@ class AssemblyBuildHelper
             //The maximum buildable count for the whole project is the minimum of all BOM entries
             if ($bom_entry->getPart() !== null) {
                 $maximum_buildable_count = min($maximum_buildable_count, $this->getMaximumBuildableCountForBOMEntry($bom_entry));
-            } elseif ($bom_entry->getProject() !== null) {
-                $maximum_buildable_count = min($maximum_buildable_count, $this->projectBuildHelper->getMaximumBuildableCount($bom_entry->getProject()));
+            } elseif ($bom_entry->getReferencedAssembly() !== null) {
+                $maximum_buildable_count = min($maximum_buildable_count, $this->projectBuildHelper->getMaximumBuildableCount($bom_entry->getReferencedAssembly()));
             }
         }
 
@@ -117,11 +118,12 @@ class AssemblyBuildHelper
 
         $nonBuildableEntries = [];
 
+        /** @var AssemblyBOMEntry $bomEntry */
         foreach ($assembly->getBomEntries() as $bomEntry) {
             $part = $bomEntry->getPart();
 
             //Skip BOM entries without a part (as we can not determine that)
-            if (!$part instanceof Part && $bomEntry->getAssembly() === null) {
+            if (!$part instanceof Part && $bomEntry->getReferencedAssembly() === null) {
                 continue;
             }
 
@@ -131,8 +133,8 @@ class AssemblyBuildHelper
                 if ($amount_sum < $bomEntry->getQuantity() * $number_of_builds) {
                     $nonBuildableEntries[] = $bomEntry;
                 }
-            } elseif ($bomEntry->getAssembly() !== null) {
-                $nonBuildableAssemblyEntries = $this->projectBuildHelper->getNonBuildableProjectBomEntries($bomEntry->getProject(), $number_of_builds);
+            } elseif ($bomEntry->getReferencedAssembly() !== null) {
+                $nonBuildableAssemblyEntries = $this->getNonBuildableAssemblyBomEntries($bomEntry->getReferencedAssembly(), $number_of_builds);
                 $nonBuildableEntries = array_merge($nonBuildableEntries, $nonBuildableAssemblyEntries);
             }
         }

src/Services/Attachments/AssemblyPreviewGenerator.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ * Copyright (C) 2019 - 2022 Jan Böhmer (https://github.com/jbtronics)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace App\Services\Attachments;
+
+use App\Entity\AssemblySystem\Assembly;
+use App\Entity\Attachments\Attachment;
+
+class AssemblyPreviewGenerator
+{
+    public function __construct(protected AttachmentManager $attachmentHelper)
+    {
+    }
+
+    /**
+     *  Returns a list of attachments that can be used for previewing the assembly ordered by priority.
+     *
+     * @param Assembly $assembly the assembly for which the attachments should be determined
+     *
+     * @return (Attachment|null)[]
+     *
+     * @psalm-return list<Attachment|null>
+     */
+    public function getPreviewAttachments(Assembly $assembly): array
+    {
+        $list = [];
+
+        //Master attachment has top priority
+        $attachment = $assembly->getMasterPictureAttachment();
+        if ($this->isAttachmentValidPicture($attachment)) {
+            $list[] = $attachment;
+        }
+
+        //Then comes the other images of the assembly
+        foreach ($assembly->getAttachments() as $attachment) {
+            //Dont show the master attachment twice
+            if ($this->isAttachmentValidPicture($attachment) && $attachment !== $assembly->getMasterPictureAttachment()) {
+                $list[] = $attachment;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Determines what attachment should be used for previewing a assembly (especially in assembly table).
+     * The returned attachment is guaranteed to be existing and be a picture.
+     *
+     * @param Assembly $assembly The assembly for which the attachment should be determined
+     */
+    public function getTablePreviewAttachment(Assembly $assembly): ?Attachment
+    {
+        $attachment = $assembly->getMasterPictureAttachment();
+        if ($this->isAttachmentValidPicture($attachment)) {
+            return $attachment;
+        }
+
+        return null;
+    }
+
+    /**
+     * Checks if a attachment is exising and a valid picture.
+     *
+     * @param Attachment|null $attachment the attachment that should be checked
+     *
+     * @return bool true if the attachment is valid
+     */
+    protected function isAttachmentValidPicture(?Attachment $attachment): bool
+    {
+        return $attachment instanceof Attachment
+            && $attachment->isPicture()
+            && $this->attachmentHelper->isFileExisting($attachment);
+    }
+}

src/Services/Trees/TreeViewGenerator.php

@@ -188,6 +188,15 @@ class TreeViewGenerator
             $root_node->setExpanded($this->rootNodeExpandedByDefault);
             $root_node->setIcon($this->entityClassToRootNodeIcon($class));
 
+            $generic = [$root_node];
+        } elseif ($mode === 'assemblies' && $this->rootNodeEnabled) {
+            //We show the root node as a link to the list of all assemblies
+            $show_all_parts_url = $this->router->generate('assemblies_list');
+
+            $root_node = new TreeViewNode($this->entityClassToRootNodeString($class), $show_all_parts_url, $generic);
+            $root_node->setExpanded($this->rootNodeExpandedByDefault);
+            $root_node->setIcon($this->entityClassToRootNodeIcon($class));
+
             $generic = [$root_node];
         }