Added simple info page for projects

src/DataTables/Column/EntityColumn.php

@@ -65,8 +65,8 @@ class EntityColumn extends AbstractColumn
         });
 
         $resolver->setDefault('render', function (Options $options) {
-            return function ($value, Part $context) use ($options) {
-                /** @var AbstractDBElement|null $entity */
+            return function ($value, $context) use ($options) {
+                /** @var AbstractNamedDBElement|null $entity */
                 $entity = $this->accessor->getValue($context, $options['property']);
 
                 if (null !== $entity) {
@@ -74,7 +74,7 @@ class EntityColumn extends AbstractColumn
                         return sprintf(
                             '<a href="%s">%s</a>',
                             $this->urlGenerator->listPartsURL($entity),
-                            $value
+                            $entity->getName()
                         );
                     }
 

src/DataTables/Helpers/PartDataTableHelper.php

@@ -0,0 +1,91 @@
+<?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/>.
+ */
+
+namespace App\DataTables\Helpers;
+
+use App\Entity\Parts\Part;
+use App\Services\Attachments\AttachmentURLGenerator;
+use App\Services\Attachments\PartPreviewGenerator;
+use App\Services\EntityURLGenerator;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * A helper service which contains common code to render columns for part related tables
+ */
+class PartDataTableHelper
+{
+    private PartPreviewGenerator $previewGenerator;
+    private AttachmentURLGenerator $attachmentURLGenerator;
+
+    private TranslatorInterface $translator;
+    private EntityURLGenerator $entityURLGenerator;
+
+    public function __construct(PartPreviewGenerator $previewGenerator, AttachmentURLGenerator $attachmentURLGenerator,
+    EntityURLGenerator $entityURLGenerator, TranslatorInterface $translator)
+    {
+        $this->previewGenerator = $previewGenerator;
+        $this->attachmentURLGenerator = $attachmentURLGenerator;
+        $this->translator = $translator;
+        $this->entityURLGenerator = $entityURLGenerator;
+    }
+
+    public function renderName(Part $context): string
+    {
+        $icon = '';
+
+        //Depending on the part status we show a different icon (the later conditions have higher priority)
+        if ($context->isFavorite()) {
+            $icon = sprintf('<i class="fa-solid fa-star fa-fw me-1" title="%s"></i>', $this->translator->trans('part.favorite.badge'));
+        }
+        if ($context->isNeedsReview()) {
+            $icon = sprintf('<i class="fa-solid fa-ambulance fa-fw me-1" title="%s"></i>', $this->translator->trans('part.needs_review.badge'));
+        }
+
+
+        return sprintf(
+            '<a href="%s">%s%s</a>',
+            $this->entityURLGenerator->infoURL($context),
+            $icon,
+            htmlentities($context->getName())
+        );
+    }
+
+    public function renderPicture(Part $context): string
+    {
+        $preview_attachment = $this->previewGenerator->getTablePreviewAttachment($context);
+        if (null === $preview_attachment) {
+            return '';
+        }
+
+        $title = htmlspecialchars($preview_attachment->getName());
+        if ($preview_attachment->getFilename()) {
+            $title .= ' ('.htmlspecialchars($preview_attachment->getFilename()).')';
+        }
+
+        return sprintf(
+            '<img alt="%s" src="%s" data-thumbnail="%s" class="%s" data-title="%s" data-controller="elements--hoverpic">',
+            'Part image',
+            $this->attachmentURLGenerator->getThumbnailURL($preview_attachment),
+            $this->attachmentURLGenerator->getThumbnailURL($preview_attachment, 'thumbnail_md'),
+            'img-fluid hoverpic',
+            $title
+        );
+    }
+}

src/DataTables/PartsDataTable.php

@@ -34,6 +34,7 @@ use App\DataTables\Column\SIUnitNumberColumn;
 use App\DataTables\Column\TagsColumn;
 use App\DataTables\Filters\PartFilter;
 use App\DataTables\Filters\PartSearchFilter;
+use App\DataTables\Helpers\PartDataTableHelper;
 use App\Entity\Parts\Category;
 use App\Entity\Parts\Footprint;
 use App\Entity\Parts\Manufacturer;
@@ -63,26 +64,27 @@ final class PartsDataTable implements DataTableTypeInterface
     private TranslatorInterface $translator;
     private NodesListBuilder $treeBuilder;
     private AmountFormatter $amountFormatter;
-    private PartPreviewGenerator $previewGenerator;
     private AttachmentURLGenerator $attachmentURLGenerator;
     private Security $security;
 
+    private PartDataTableHelper $partDataTableHelper;
+
     /**
      * @var EntityURLGenerator
      */
     private $urlGenerator;
 
     public function __construct(EntityURLGenerator $urlGenerator, TranslatorInterface $translator,
-        NodesListBuilder $treeBuilder, AmountFormatter $amountFormatter,
-        PartPreviewGenerator $previewGenerator, AttachmentURLGenerator $attachmentURLGenerator, Security $security)
+        NodesListBuilder $treeBuilder, AmountFormatter $amountFormatter,PartDataTableHelper $partDataTableHelper,
+        AttachmentURLGenerator $attachmentURLGenerator, Security $security)
     {
         $this->urlGenerator = $urlGenerator;
         $this->translator = $translator;
         $this->treeBuilder = $treeBuilder;
         $this->amountFormatter = $amountFormatter;
-        $this->previewGenerator = $previewGenerator;
         $this->attachmentURLGenerator = $attachmentURLGenerator;
         $this->security = $security;
+        $this->partDataTableHelper = $partDataTableHelper;
     }
 
     public function configureOptions(OptionsResolver $optionsResolver): void
@@ -122,46 +124,13 @@ final class PartsDataTable implements DataTableTypeInterface
                 'label' => '',
                 'className' => 'no-colvis',
                 'render' => function ($value, Part $context) {
-                    $preview_attachment = $this->previewGenerator->getTablePreviewAttachment($context);
-                    if (null === $preview_attachment) {
-                        return '';
-                    }
-
-                    $title = htmlspecialchars($preview_attachment->getName());
-                    if ($preview_attachment->getFilename()) {
-                        $title .= ' ('.htmlspecialchars($preview_attachment->getFilename()).')';
-                    }
-
-                    return sprintf(
-                        '<img alt="%s" src="%s" data-thumbnail="%s" class="%s" data-title="%s" data-controller="elements--hoverpic">',
-                        'Part image',
-                        $this->attachmentURLGenerator->getThumbnailURL($preview_attachment),
-                        $this->attachmentURLGenerator->getThumbnailURL($preview_attachment, 'thumbnail_md'),
-                        'img-fluid hoverpic',
-                        $title
-                    );
+                    return $this->partDataTableHelper->renderPicture($context);
                 },
             ])
             ->add('name', TextColumn::class, [
                 'label' => $this->translator->trans('part.table.name'),
                 'render' => function ($value, Part $context) {
-                    $icon = '';
-
-                    //Depending on the part status we show a different icon (the later conditions have higher priority)
-                    if ($context->isFavorite()) {
-                        $icon = sprintf('<i class="fa-solid fa-star fa-fw me-1" title="%s"></i>', $this->translator->trans('part.favorite.badge'));
-                    }
-                    if ($context->isNeedsReview()) {
-                        $icon = sprintf('<i class="fa-solid fa-ambulance fa-fw me-1" title="%s"></i>', $this->translator->trans('part.needs_review.badge'));
-                    }
-
-
-                    return sprintf(
-                        '<a href="%s">%s%s</a>',
-                        $this->urlGenerator->infoURL($context),
-                        $icon,
-                        htmlentities($context->getName())
-                    );
+                    return $this->partDataTableHelper->renderName($context);
                 },
             ])
             ->add('id', TextColumn::class, [

src/DataTables/ProjectBomEntriesDataTable.php

@@ -0,0 +1,178 @@
+<?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/>.
+ */
+
+namespace App\DataTables;
+
+use App\DataTables\Column\EntityColumn;
+use App\DataTables\Column\LocaleDateTimeColumn;
+use App\DataTables\Column\MarkdownColumn;
+use App\DataTables\Column\SelectColumn;
+use App\DataTables\Helpers\PartDataTableHelper;
+use App\Entity\Attachments\Attachment;
+use App\Entity\Parts\Part;
+use App\Entity\ProjectSystem\ProjectBOMEntry;
+use App\Services\EntityURLGenerator;
+use App\Services\Formatters\AmountFormatter;
+use Doctrine\ORM\QueryBuilder;
+use Omines\DataTablesBundle\Adapter\Doctrine\ORM\SearchCriteriaProvider;
+use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
+use Omines\DataTablesBundle\Column\TextColumn;
+use Omines\DataTablesBundle\DataTable;
+use Omines\DataTablesBundle\DataTableTypeInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ProjectBomEntriesDataTable implements DataTableTypeInterface
+{
+    protected TranslatorInterface $translator;
+    protected PartDataTableHelper $partDataTableHelper;
+    protected EntityURLGenerator $entityURLGenerator;
+    protected AmountFormatter $amountFormatter;
+
+    public function __construct(TranslatorInterface $translator, PartDataTableHelper $partDataTableHelper,
+        EntityURLGenerator $entityURLGenerator, AmountFormatter $amountFormatter)
+    {
+        $this->translator = $translator;
+        $this->partDataTableHelper = $partDataTableHelper;
+        $this->entityURLGenerator = $entityURLGenerator;
+        $this->amountFormatter = $amountFormatter;
+    }
+
+
+    public function configure(DataTable $dataTable, array $options)
+    {
+        $dataTable
+            //->add('select', SelectColumn::class)
+            ->add('picture', TextColumn::class, [
+                'label' => '',
+                'className' => 'no-colvis',
+                'render' => function ($value, ProjectBOMEntry $context) {
+                    if($context->getPart() === null) {
+                        return '';
+                    }
+                    return $this->partDataTableHelper->renderPicture($context->getPart());
+                },
+            ])
+
+            ->add('id', TextColumn::class, [
+                'label' => $this->translator->trans('part.table.id'),
+                'visible' => false,
+            ])
+
+            ->add('quantity', TextColumn::class, [
+               'label' => $this->translator->trans('project.bom.quantity'),
+                'className' => 'text-center',
+                'render' => function ($value, ProjectBOMEntry $context) {
+                    //If we have a non-part entry, only show the rounded quantity
+                    if ($context->getPart() === null) {
+                        return round($context->getQuantity());
+                    }
+                    //Otherwise use the unit of the part to format the quantity
+                    return $this->amountFormatter->format($context->getQuantity(), $context->getPart()->getPartUnit());
+                },
+            ])
+
+            ->add('name', TextColumn::class, [
+                'label' => $this->translator->trans('part.table.name'),
+                'orderable' => false,
+                'render' => function ($value, ProjectBOMEntry $context) {
+                    if($context->getPart() === null) {
+                        return $context->getName();
+                    }
+                    if($context->getPart() !== null) {
+                        $tmp = $this->partDataTableHelper->renderName($context->getPart());
+                        if(!empty($context->getName())) {
+                            $tmp .= '<br><b>'.htmlspecialchars($context->getName()).'</b>';
+                        }
+                        return $tmp;
+                    }
+                },
+            ])
+
+            ->add('description', MarkdownColumn::class, [
+                'label' => $this->translator->trans('part.table.description'),
+                'data' => function (ProjectBOMEntry $context) {
+                    if($context->getPart() !== null) {
+                        return $context->getPart()->getDescription();
+                    }
+                    //For non-part BOM entries show the comment field
+                    return $context->getComment();
+                },
+            ])
+
+
+            ->add('category', EntityColumn::class, [
+                'label' => $this->translator->trans('part.table.category'),
+                'property' => 'part.category',
+            ])
+            ->add('footprint', EntityColumn::class, [
+                'property' => 'part.footprint',
+                'label' => $this->translator->trans('part.table.footprint'),
+            ])
+
+            ->add('manufacturer', EntityColumn::class, [
+                'property' => 'part.manufacturer',
+                'label' => $this->translator->trans('part.table.manufacturer'),
+            ])
+
+            ->add('mountnames', TextColumn::class, [
+
+            ])
+
+
+            ->add('addedDate', LocaleDateTimeColumn::class, [
+                'label' => $this->translator->trans('part.table.addedDate'),
+                'visible' => false,
+            ])
+            ->add('lastModified', LocaleDateTimeColumn::class, [
+                'label' => $this->translator->trans('part.table.lastModified'),
+                'visible' => false,
+            ])
+        ;
+
+        $dataTable->createAdapter(ORMAdapter::class, [
+            'entity' => Attachment::class,
+            'query' => function (QueryBuilder $builder) use ($options): void {
+                $this->getQuery($builder, $options);
+            },
+            'criteria' => [
+                function (QueryBuilder $builder) use ($options): void {
+                    $this->buildCriteria($builder, $options);
+                },
+                new SearchCriteriaProvider(),
+            ],
+        ]);
+    }
+
+    private function getQuery(QueryBuilder $builder, array $options): void
+    {
+        $builder->select('bom_entry')
+            ->addSelect('part')
+            ->from(ProjectBOMEntry::class, 'bom_entry')
+            ->leftJoin('bom_entry.part', 'part')
+            ->where('bom_entry.project = :project')
+            ->setParameter('project', $options['project']);
+        ;
+    }
+
+    private function buildCriteria(QueryBuilder $builder, array $options): void
+    {
+
+    }
+}