diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php index edc5917a..8c8d7520 100644 --- a/src/Controller/AdminPages/BaseAdminController.php +++ b/src/Controller/AdminPages/BaseAdminController.php @@ -232,6 +232,7 @@ abstract class BaseAdminController extends AbstractController 'timeTravel' => $timeTravel_timestamp, 'repo' => $repo, 'partsContainingElement' => $repo instanceof PartsContainingRepositoryInterface, + 'showParameters' => !($this instanceof AssemblyAdminController), ]); } @@ -382,6 +383,7 @@ abstract class BaseAdminController extends AbstractController 'import_form' => $import_form, 'mass_creation_form' => $mass_creation_form, 'route_base' => $this->route_base, + 'showParameters' => !($this instanceof AssemblyAdminController), ]); } diff --git a/src/Form/Type/AssemblySelectType.php b/src/Form/Type/AssemblySelectType.php index ee6cf7c2..10e858f2 100644 --- a/src/Form/Type/AssemblySelectType.php +++ b/src/Form/Type/AssemblySelectType.php @@ -71,7 +71,6 @@ class AssemblySelectType extends AbstractType implements DataMapperInterface $resolver->setDefaults([ 'class' => Assembly::class, 'choice_label' => 'name', - 'placeholder' => 'None', 'compound' => true, 'error_bubbling' => false, ]); diff --git a/templates/admin/assembly_admin.html.twig b/templates/admin/assembly_admin.html.twig index d8b3ab25..57dde7d1 100644 --- a/templates/admin/assembly_admin.html.twig +++ b/templates/admin/assembly_admin.html.twig @@ -15,7 +15,7 @@ {% endblock %} {% block additional_pills %} -
  • BOM
    • +
  • {% trans %}assembly_bom_entry.label{% endtrans %}
    • {% endblock %} {% block quick_links %} @@ -47,7 +47,7 @@ {% endblock %} {% block additional_panes %} -
    +
    {% form_theme form.bom_entries with ['form/collection_types_layout_assembly.html.twig'] %} {{ form_errors(form.bom_entries) }} {{ form_widget(form.bom_entries) }} diff --git a/templates/admin/base_admin.html.twig b/templates/admin/base_admin.html.twig index 51790c3c..e9fc0fb9 100644 --- a/templates/admin/base_admin.html.twig +++ b/templates/admin/base_admin.html.twig @@ -86,7 +86,7 @@
  • {% trans %}admin.attachments{% endtrans %}
    • - {% if entity.parameters is defined %} + {% if entity.parameters is defined and showParameters == true %}
  • {% trans %}admin.parameters{% endtrans %}
    • 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 508b2b06..2d0c535b 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/_part.html.twig b/templates/assemblies/info/_part.html.twig new file mode 100644 index 00000000..1fa8b90e --- /dev/null +++ b/templates/assemblies/info/_part.html.twig @@ -0,0 +1,5 @@ +{% import "components/datatables.macro.html.twig" as datatables %} + +
    + +{{ datatables.datatable(datatable, 'elements/datatables/datatables', 'assemblies') }} \ No newline at end of file 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/assemblies/info/info.html.twig b/templates/assemblies/info/info.html.twig index f5dac1e6..166535a6 100644 --- a/templates/assemblies/info/info.html.twig +++ b/templates/assemblies/info/info.html.twig @@ -5,8 +5,49 @@ {% trans %}assembly.info.title{% endtrans %}: {{ assembly.name }} {% endblock %} -{% block content %} +{% block before_card %} +
    +
    + + + {% trans %}assembly.new{% endtrans %} + +
    + + + {% trans %}assembly.info.bom_add_parts{% endtrans %} + + + +
    + + + + {% trans %}assembly_bom_entry.label{% endtrans %} + + + + + +
    +
    +{% endblock %} + +{% block content %} {{ helper.breadcrumb_entity_link(assembly) }} {{ parent() }} {% endblock %} @@ -23,30 +64,20 @@ {% block card_content %}
      - {% if assembly.children is not empty %} - - {% endif %} - + {% endif %} - {% if assembly.parameters is not empty %} -
    • - - - {% trans %}entity.info.parameters.tab{% endtrans %} - {{ assembly.parameters | length }} - -
      • - {% endif %}
    -
    - {% include "assemblies/info/_info.html.twig" %} +
    + {% include "assemblies/info/_part.html.twig" %}
    - {% if assembly.children is not empty %} -
    - {% include "assemblies/info/_subassemblies.html.twig" %} -
    - {% endif %} -
    - {% include "assemblies/info/_bom.html.twig" %} +
    + {% include "assemblies/info/_info.html.twig" %}
    {% include "assemblies/info/_builds.html.twig" %} @@ -94,12 +110,6 @@
    {% include "parts/info/_attachments_info.html.twig" with {"part": assembly} %}
    -
    - {% for name, parameters in assembly.groupedParameters %} - {% if name is not empty %}
    {{ name }}
    {% endif %} - {{ helper.parameters_table(assembly.parameters) }} - {% endfor %} -
    {% endblock %} \ 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) }}