From bba619797e431316c9464d310c6a4f806c38f6b3 Mon Sep 17 00:00:00 2001 From: Marcel Diegelmann Date: Tue, 24 Jun 2025 11:07:20 +0200 Subject: [PATCH] =?UTF-8?q?Part-=C3=9Cbersicht=20sowie=20-Detailansicht=20?= =?UTF-8?q?um=20Assembly=20Information=20erweitern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DataTables/PartsDataTable.php | 29 +++++++++++++++++ templates/parts/info/_assemblies.html.twig | 31 +++++++++++++++++++ templates/parts/info/show_part_info.html.twig | 27 ++++++++++------ translations/messages.cs.xlf | 6 ++++ translations/messages.da.xlf | 6 ++++ translations/messages.de.xlf | 6 ++++ translations/messages.el.xlf | 6 ++++ translations/messages.en.xlf | 6 ++++ translations/messages.es.xlf | 6 ++++ translations/messages.fr.xlf | 6 ++++ translations/messages.it.xlf | 6 ++++ translations/messages.ja.xlf | 6 ++++ translations/messages.nl.xlf | 6 ++++ translations/messages.pl.xlf | 6 ++++ translations/messages.ru.xlf | 6 ++++ translations/messages.zh.xlf | 6 ++++ 16 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 templates/parts/info/_assemblies.html.twig diff --git a/src/DataTables/PartsDataTable.php b/src/DataTables/PartsDataTable.php index a97762b1..7c205d1f 100644 --- a/src/DataTables/PartsDataTable.php +++ b/src/DataTables/PartsDataTable.php @@ -39,6 +39,7 @@ use App\DataTables\Filters\PartSearchFilter; use App\DataTables\Helpers\ColumnSortHelper; use App\DataTables\Helpers\PartDataTableHelper; use App\Doctrine\Helpers\FieldHelper; +use App\Entity\AssemblySystem\Assembly; use App\Entity\Parts\ManufacturingStatus; use App\Entity\Parts\Part; use App\Entity\Parts\PartLot; @@ -240,6 +241,34 @@ final class PartsDataTable implements DataTableTypeInterface ]); } + //Add a assembly column to list where the part is used, when the user has the permission to see the assemblies + if ($this->security->isGranted('read', Assembly::class)) { + $this->csh->add('assemblies', TextColumn::class, [ + 'label' => $this->translator->trans('assembly.labelp'), + 'render' => function ($value, Part $context): string { + //Only show the first 5 assembly names + $assemblies = $context->getAssemblies(); + $tmp = ""; + + $max = 5; + + for ($i = 0; $i < min($max, count($assemblies)); $i++) { + $url = $this->urlGenerator->infoURL($assemblies[$i]); + $tmp .= sprintf('%s', $url, htmlspecialchars($assemblies[$i]->getName())); + if ($i < count($assemblies) - 1) { + $tmp .= ", "; + } + } + + if (count($assemblies) > $max) { + $tmp .= ", + ".(count($assemblies) - $max); + } + + return $tmp; + } + ]); + } + $this->csh ->add('edit', IconLinkColumn::class, [ 'label' => $this->translator->trans('part.table.edit'), diff --git a/templates/parts/info/_assemblies.html.twig b/templates/parts/info/_assemblies.html.twig new file mode 100644 index 00000000..d4996c59 --- /dev/null +++ b/templates/parts/info/_assemblies.html.twig @@ -0,0 +1,31 @@ +{% import "components/attachments.macro.html.twig" as attachments %} +{% import "helper.twig" as helper %} + + + + + + + + + + + + + {% for bom_entry in part.assemblyBomEntries %} + {# @var bom_entry App\Entity\Assembly\AssemblyBOMEntry #} + + + {# Name #} + {# Description #} + + + {% endfor %} + +
{% trans %}entity.info.name{% endtrans %}{% trans %}description.label{% endtrans %}{% trans %}assembly.bom.quantity{% endtrans %}
{% if bom_entry.assembly.masterPictureAttachment is not null %}{{ attachments.attachment_icon(bom_entry.assembly.masterPictureAttachment, attachment_manager) }}{% endif %}{{ bom_entry.assembly.name }}{{ bom_entry.assembly.description|format_markdown }}{{ bom_entry.quantity | format_amount(part.partUnit) }}
+ + + + {% trans %}part.info.add_part_to_assembly{% endtrans %} + \ No newline at end of file diff --git a/templates/parts/info/show_part_info.html.twig b/templates/parts/info/show_part_info.html.twig index 96b5e209..cd7b4ce7 100644 --- a/templates/parts/info/show_part_info.html.twig +++ b/templates/parts/info/show_part_info.html.twig @@ -109,15 +109,20 @@ {% trans %}vendor.partinfo.history{% endtrans %} - {% if part.projectBomEntries is not empty %} -
  • - - - {% trans %}project.labelp{% endtrans %} - {{ part.projectBomEntries | length }} - -
    • - {% endif %} +
  • + + + {% trans %}project.labelp{% endtrans %} + {{ part.projectBomEntries | length }} + +
    • +
  • + + + {% trans %}assembly.labelp{% endtrans %} + {{ part.assemblyBomEntries | length }} + +
  • @@ -167,6 +172,10 @@ {% include "parts/info/_projects.html.twig" %} +
    + {% include "parts/info/_assemblies.html.twig" %} +
    +
    {% include "parts/info/_history.html.twig" %}
    diff --git a/translations/messages.cs.xlf b/translations/messages.cs.xlf index 1acfef09..de9d2918 100644 --- a/translations/messages.cs.xlf +++ b/translations/messages.cs.xlf @@ -14092,6 +14092,12 @@ Vezměte prosím na vědomí, že se nemůžete vydávat za uživatele se zakáz Přidat součásti do sestavy + + + part.info.add_part_to_assembly + Přidat tuto součástku do sestavy + + assembly.bom.project diff --git a/translations/messages.da.xlf b/translations/messages.da.xlf index 108df80e..cb08bf9a 100644 --- a/translations/messages.da.xlf +++ b/translations/messages.da.xlf @@ -12809,6 +12809,12 @@ Bemærk venligst, at du ikke kan kopiere fra deaktiveret bruger. Hvis du prøver Tilføj dele til samlingen + + + part.info.add_part_to_assembly + Tilføj denne del til en samling + + assembly.bom.project diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf index 31eead69..5267ac9f 100644 --- a/translations/messages.de.xlf +++ b/translations/messages.de.xlf @@ -13542,6 +13542,12 @@ Bitte beachten Sie, dass Sie sich nicht als deaktivierter Benutzer ausgeben kön Bauteile zur Baugruppe hinzufügen + + + part.info.add_part_to_assembly + Dieses Bauteil zu einer Baugruppe hinzufügen + + assembly.bom.project diff --git a/translations/messages.el.xlf b/translations/messages.el.xlf index 3707e55d..fc03f08b 100644 --- a/translations/messages.el.xlf +++ b/translations/messages.el.xlf @@ -1823,6 +1823,12 @@ Προσθήκη εξαρτημάτων στη συναρμολόγηση + + + part.info.add_part_to_assembly + Προσθέστε αυτό το εξάρτημα σε μια συναρμολόγηση + + assembly.bom.project diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index 25572459..791a0e35 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -13543,6 +13543,12 @@ Please note, that you can not impersonate a disabled user. If you try you will g Add parts to assembly + + + part.info.add_part_to_assembly + Add this part to an assembly + + assembly.bom.project diff --git a/translations/messages.es.xlf b/translations/messages.es.xlf index 56bcf2a5..7b41a5a8 100644 --- a/translations/messages.es.xlf +++ b/translations/messages.es.xlf @@ -12981,6 +12981,12 @@ Por favor ten en cuenta que no puedes personificar a un usuario deshabilitado. S Añadir piezas al ensamblaje + + + part.info.add_part_to_assembly + Agregar esta parte a un ensamblaje + + assembly.bom.project diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index 6d455221..f5c7dc97 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -9385,6 +9385,12 @@ exemple de ville Ajouter des pièces à l'assemblage + + + part.info.add_part_to_assembly + Ajouter cette pièce à un assemblage + + assembly.bom.project diff --git a/translations/messages.it.xlf b/translations/messages.it.xlf index 1f56dfc9..55d963ca 100644 --- a/translations/messages.it.xlf +++ b/translations/messages.it.xlf @@ -12959,6 +12959,12 @@ Notare che non è possibile impersonare un utente disattivato. Quando si prova a Aggiungi componenti al gruppo + + + part.info.add_part_to_assembly + Aggiungi questa parte a un assemblaggio + + assembly.bom.project diff --git a/translations/messages.ja.xlf b/translations/messages.ja.xlf index 8991fc17..b61b585f 100644 --- a/translations/messages.ja.xlf +++ b/translations/messages.ja.xlf @@ -9122,6 +9122,12 @@ Exampletown アセンブリに部品を追加 + + + part.info.add_part_to_assembly + このパーツをアセンブリに追加 + + assembly.bom.project diff --git a/translations/messages.nl.xlf b/translations/messages.nl.xlf index 9525ba29..c52a4733 100644 --- a/translations/messages.nl.xlf +++ b/translations/messages.nl.xlf @@ -1012,6 +1012,12 @@ Onderdelen toevoegen aan assemblage + + + part.info.add_part_to_assembly + Dit onderdeel aan een assemblage toevoegen + + assembly.bom.project diff --git a/translations/messages.pl.xlf b/translations/messages.pl.xlf index c221767b..6ae246be 100644 --- a/translations/messages.pl.xlf +++ b/translations/messages.pl.xlf @@ -12836,6 +12836,12 @@ Należy pamiętać, że nie możesz udawać nieaktywnych użytkowników. Jeśli Dodaj części do zespołu + + + part.info.add_part_to_assembly + Dodaj tę część do zespołu + + assembly.bom.project diff --git a/translations/messages.ru.xlf b/translations/messages.ru.xlf index 5d4c8885..5f658422 100644 --- a/translations/messages.ru.xlf +++ b/translations/messages.ru.xlf @@ -12936,6 +12936,12 @@ Добавить детали в сборку + + + part.info.add_part_to_assembly + Добавить эту часть в сборку + + assembly.bom.project diff --git a/translations/messages.zh.xlf b/translations/messages.zh.xlf index 3a6f5375..e4b236db 100644 --- a/translations/messages.zh.xlf +++ b/translations/messages.zh.xlf @@ -12821,6 +12821,12 @@ Element 3 添加零件到组件 + + + part.info.add_part_to_assembly + 将此零件添加到装配体中 + + assembly.bom.project