From 968bf74cbafc579a011996b7a32b2752e7ca2f93 Mon Sep 17 00:00:00 2001 From: Marcel Diegelmann Date: Wed, 2 Apr 2025 12:24:14 +0200 Subject: [PATCH] Anpassungen aus Benutzersicht, um den Fokus auf die reine Baugruppen-Konfiguration zu legen --- templates/assemblies/info/_bom.html.twig | 22 --------------- .../assemblies/info/_info_card.html.twig | 15 ---------- .../assemblies/info/_subassemblies.html.twig | 28 ------------------- .../form/collection_types_layout.html.twig | 1 + 4 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 templates/assemblies/info/_bom.html.twig delete mode 100644 templates/assemblies/info/_subassemblies.html.twig diff --git a/templates/assemblies/info/_bom.html.twig b/templates/assemblies/info/_bom.html.twig deleted file mode 100644 index 6a2ca3e0..00000000 --- a/templates/assemblies/info/_bom.html.twig +++ /dev/null @@ -1,22 +0,0 @@ -{% import "components/datatables.macro.html.twig" as datatables %} - -
- - - {% trans %}assembly.info.bom_add_parts{% endtrans %} - - - -
- -{{ datatables.datatable(datatable, 'elements/datatables/datatables', 'assemblies') }} \ No newline at end of file diff --git a/templates/assemblies/info/_info_card.html.twig b/templates/assemblies/info/_info_card.html.twig index c89c77fe..6b63bebc 100644 --- a/templates/assemblies/info/_info_card.html.twig +++ b/templates/assemblies/info/_info_card.html.twig @@ -37,12 +37,6 @@ {% trans %}entity.info.attachments.tab{% endtrans %} {% endif %} - {% if assembly.parameters is not empty %} - - - {% trans %}entity.info.parameters.tab{% endtrans %} - - {% endif %} {% if assembly.comment is not empty %} @@ -108,15 +102,6 @@ {% endif %} - {% if assembly.parameters is not empty %} -
- {% for name, parameters in assembly.groupedParameters %} - {% if name is not empty %}
{{ name }}
{% endif %} - {{ helper.parameters_table(assembly) }} - {% endfor %} -
- {% endif %} - {% if assembly.comment is not empty %}
diff --git a/templates/assemblies/info/_subassemblies.html.twig b/templates/assemblies/info/_subassemblies.html.twig deleted file mode 100644 index 8c92c5e9..00000000 --- a/templates/assemblies/info/_subassemblies.html.twig +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - {% for subassembly in assembly.children %} - - - - - - - {% endfor %} - -
{% trans %}name.label{% endtrans %}{% trans %}description.label{% endtrans %}# {% trans %}assembly.info.bom_entries_count{% endtrans %}# {% trans %}assembly.info.sub_assemblies_count{% endtrans %}
{# Name #} - {{ subassembly.name }} - {# Description #} - {{ subassembly.description | format_markdown }} - - {{ subassembly.bomEntries | length }} - - {{ subassembly.children | length }} -
\ No newline at end of file diff --git a/templates/form/collection_types_layout.html.twig b/templates/form/collection_types_layout.html.twig index def23500..0175aeaf 100644 --- a/templates/form/collection_types_layout.html.twig +++ b/templates/form/collection_types_layout.html.twig @@ -44,6 +44,7 @@ {{ form_row(form.part) }} {{ form_errors(form.part) }} +
{{ form_widget(form.assembly) }} {{ form_errors(form.assembly) }}