Added advanced options to category admin page.

src/Controller/CategoryController.php

@@ -35,6 +35,7 @@ namespace App\Controller;
 use App\Entity\AttachmentType;
 use App\Entity\Category;
 use App\Form\BaseEntityAdminForm;
+use App\Form\CategoryAdminForm;
 use App\Services\EntityExporter;
 use App\Services\EntityImporter;
 use App\Services\StructuralElementRecursionHelper;
@@ -53,7 +54,7 @@ class CategoryController extends BaseAdminController
 
     protected $entity_class = Category::class;
     protected $twig_template = 'AdminPages/CategoryAdmin.html.twig';
-    protected $form_class = BaseEntityAdminForm::class;
+    protected $form_class = CategoryAdminForm::class;
     protected $route_base = "category";
 
     /**

src/Entity/Category.php

@@ -53,49 +53,49 @@ class Category extends PartsContainingDBElement
      * @var string
      * @ORM\Column(type="string")
      */
-    protected $partname_hint;
+    protected $partname_hint = "";
 
     /**
      * @var string
      * @ORM\Column(type="string")
      */
-    protected $partname_regex;
+    protected $partname_regex = "";
 
     /**
      * @var bool
      * @ORM\Column(type="boolean")
      */
-    protected $disable_footprints;
+    protected $disable_footprints = false;
 
     /**
      * @var bool
      * @ORM\Column(type="boolean")
      */
-    protected $disable_manufacturers;
+    protected $disable_manufacturers = false;
 
     /**
      * @var bool
      * @ORM\Column(type="boolean")
      */
-    protected $disable_autodatasheets;
+    protected $disable_autodatasheets = false;
 
     /**
      * @var bool
      * @ORM\Column(type="boolean")
      */
-    protected $disable_properties;
+    protected $disable_properties = false;
 
     /**
      * @var string
      * @ORM\Column(type="string")
      */
-    protected $default_description;
+    protected $default_description = "";
 
     /**
      * @var string
      * @ORM\Column(type="string")
      */
-    protected $default_comment;
+    protected $default_comment = "";
 
     /**
      * Returns the ID as an string, defined by the element class.
@@ -107,4 +107,150 @@ class Category extends PartsContainingDBElement
     {
         return 'C'.sprintf('%09d', $this->getID());
     }
+
+    /**
+     * @return string
+     */
+    public function getPartnameHint(): string
+    {
+        return $this->partname_hint;
+    }
+
+    /**
+     * @param string $partname_hint
+     * @return Category
+     */
+    public function setPartnameHint(string $partname_hint): Category
+    {
+        $this->partname_hint = $partname_hint;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPartnameRegex(): string
+    {
+        return $this->partname_regex;
+    }
+
+    /**
+     * @param string $partname_regex
+     * @return Category
+     */
+    public function setPartnameRegex(string $partname_regex): Category
+    {
+        $this->partname_regex = $partname_regex;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDisableFootprints(): bool
+    {
+        return $this->disable_footprints;
+    }
+
+    /**
+     * @param bool $disable_footprints
+     * @return Category
+     */
+    public function setDisableFootprints(bool $disable_footprints): Category
+    {
+        $this->disable_footprints = $disable_footprints;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDisableManufacturers(): bool
+    {
+        return $this->disable_manufacturers;
+    }
+
+    /**
+     * @param bool $disable_manufacturers
+     * @return Category
+     */
+    public function setDisableManufacturers(bool $disable_manufacturers): Category
+    {
+        $this->disable_manufacturers = $disable_manufacturers;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDisableAutodatasheets(): bool
+    {
+        return $this->disable_autodatasheets;
+    }
+
+    /**
+     * @param bool $disable_autodatasheets
+     * @return Category
+     */
+    public function setDisableAutodatasheets(bool $disable_autodatasheets): Category
+    {
+        $this->disable_autodatasheets = $disable_autodatasheets;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDisableProperties(): bool
+    {
+        return $this->disable_properties;
+    }
+
+    /**
+     * @param bool $disable_properties
+     * @return Category
+     */
+    public function setDisableProperties(bool $disable_properties): Category
+    {
+        $this->disable_properties = $disable_properties;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDefaultDescription(): string
+    {
+        return $this->default_description;
+    }
+
+    /**
+     * @param string $default_description
+     * @return Category
+     */
+    public function setDefaultDescription(string $default_description): Category
+    {
+        $this->default_description = $default_description;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDefaultComment(): string
+    {
+        return $this->default_comment;
+    }
+
+    /**
+     * @param string $default_comment
+     * @return Category
+     */
+    public function setDefaultComment(string $default_comment): Category
+    {
+        $this->default_comment = $default_comment;
+        return $this;
+    }
+
+
 }

src/Form/BaseEntityAdminForm.php

@@ -32,6 +32,7 @@
 namespace App\Form;
 
 
+use App\Entity\NamedDBElement;
 use App\Entity\StructuralDBElement;
 use FOS\CKEditorBundle\Form\Type\CKEditorType;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -70,13 +71,20 @@ class BaseEntityAdminForm extends AbstractType
 
             ->add('comment', CKEditorType::class, ['required' => false,
                 'label' => 'comment.label', 'attr' => ['rows' => 4], 'help' => 'bbcode.hint',
-                'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity)])
+                'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity)]);
+
+            $this->additionalFormElements($builder, $options, $entity);
 
             //Buttons
-            ->add('save', SubmitType::class, ['label' =>  $is_new ? 'entity.create' : 'entity.edit.save',
+            $builder->add('save', SubmitType::class, ['label' =>  $is_new ? 'entity.create' : 'entity.edit.save',
                 'attr' => ['class' => $is_new ? 'btn-success' : ''],
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity)])
             ->add('reset', ResetType::class, ['label' => 'entity.edit.reset',
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity)]);
     }
+
+    protected function additionalFormElements(FormBuilderInterface $builder, array $options, NamedDBElement $entity)
+    {
+        //Empty for Base
+    }
 }

src/Form/CategoryAdminForm.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ *
+ * part-db version 0.1
+ * Copyright (C) 2005 Christoph Lechner
+ * http://www.cl-projects.de/
+ *
+ * part-db version 0.2+
+ * Copyright (C) 2009 K. Jacobs and others (see authors.php)
+ * http://code.google.com/p/part-db/
+ *
+ * Part-DB Version 0.4+
+ * Copyright (C) 2016 - 2019 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 General Public License
+ * as published by the Free Software Foundation; either version 2
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ *
+ */
+
+namespace App\Form;
+
+
+use App\Entity\NamedDBElement;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CategoryAdminForm extends BaseEntityAdminForm
+{
+    protected function additionalFormElements(FormBuilderInterface $builder, array $options, NamedDBElement $entity)
+    {
+        $is_new = $entity->getID() === null;
+
+        $builder->add('disable_footprints', CheckboxType::class, ['required' => false,
+            'label' => 'disable_footprints.label', 'help' => 'disable_footprints.help', 'label_attr'=> ['class' => 'checkbox-custom'],
+                'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('disable_manufacturers', CheckboxType::class, ['required' => false,
+            'label' => 'disable_manufacturers.label', 'help' => 'disable_manufacturers.help', 'label_attr'=> ['class' => 'checkbox-custom'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('disable_autodatasheets', CheckboxType::class, ['required' => false,
+            'label' => 'disable_autodatasheets.label', 'help' => 'disable_autodatasheets.help', 'label_attr'=> ['class' => 'checkbox-custom'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('disable_properties', CheckboxType::class, ['required' => false,
+            'label' => 'disable_properties.label', 'help' => 'disable_properties.help', 'label_attr'=> ['class' => 'checkbox-custom'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('partname_hint', TextType::class, ['required' => false, 'empty_data' => '',
+            'label' => 'disable_manufacturers.label', 'attr' => ['placeholder' => 'disable_manufacturers.placeholder'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('partname_regex', TextType::class, ['required' => false, 'empty_data' => '',
+            'label' => 'partname_regex.label', 'attr' => ['placeholder' => 'partname_regex.placeholder'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('default_description', TextType::class, ['required' => false, 'empty_data' => '',
+            'label' => 'default_description.label', 'attr' => ['placeholder' => 'default_description.placeholder'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+
+        $builder->add('default_comment', TextType::class, ['required' => false, 'empty_data' => '',
+            'label' => 'default_description.label', 'attr' => ['placeholder' => 'default_comment.placeholder'],
+            'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity)]);
+    }
+}

templates/AdminPages/CategoryAdmin.html.twig

@@ -3,3 +3,25 @@
 {% block card_title %}
     <i class="fas fa-tags fa-fw"></i> {% trans %}category.labelp{% endtrans %}
 {% endblock %}
+
+{% block additional_pills %}
+    <li class="nav-item"><a data-toggle="tab" class="nav-link link-anchor" href="#home_options">{% trans %}admin.options{% endtrans %}</a></li>
+    <li class="nav-item"><a data-toggle="tab" class="nav-link link-anchor" href="#home_advanced">{% trans %}admin.advanced{% endtrans %}</a></li>
+{% endblock %}
+
+{% block additional_panes %}
+    <div class="tab-pane" id="home_options">
+        {{ form_row(form.disable_footprints) }}
+        {{ form_row(form.disable_manufacturers) }}
+        {{ form_row(form.disable_autodatasheets) }}
+        {{ form_row(form.disable_properties) }}
+    </div>
+
+    <div class="tab-pane" id="home_advanced">
+        {{ form_row(form.partname_regex) }}
+        {{ form_row(form.partname_hint) }}
+        <hr>
+        {{ form_row(form.default_description) }}
+        {{ form_row(form.default_comment) }}
+    </div>
+{% endblock %}

templates/AdminPages/EntityAdminBase.html.twig

@@ -49,20 +49,38 @@
                 </ul>
 
                 <div class="tab-content mb-3 mt-3">
+
                     <div id="home" class="tab-pane fade show active">
+
                         {{ form_start(form) }}
+
+                        {% if block('additional_pills') is not empty %}
+                        <ul class="nav nav-pills mb-2">
+                            <li class="nav-item"><a data-toggle="tab" class="nav-link link-anchor active" href="#home_common">{% trans %}admin.common{% endtrans %}</a></li>
+                            {% block additional_pills %}{% endblock %}
+                        </ul>
+                        {% endif %}
+
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div class="tab-pane active" id="home_common">
                                 {{ form_row(form.name) }}
                                 {{ form_row(form.parent) }}
-                        {% block additional_controls %}{% endblock %}
                                 {{ form_row(form.comment) }}
+                            </div>
+                            {% block additional_panes %}{% endblock %}
+                        </div>
+
                         {{ form_row(form.save) }}
                         {{ form_row(form.reset) }}
                         {{ form_end(form) }}
 
+
                         {# Only include on existing parts #}
                         {% if entity.id %}
                             {{ include('AdminPages/_delete_form.html.twig') }}
                         {% endif %}
+
                     </div>
 
                     <div id="info" class="tab-pane fade">
@@ -100,6 +118,8 @@
                         </div>
                     </div>
 
+
+
                     {% if entity.id %}
                         <div id="export" class="tab-pane fade">
                             {% include 'AdminPages/_export_form.html.twig' with {'path' : path('attachment_type_export', {'id': entity.id})} %}
@@ -120,6 +140,8 @@
 
 
                     {% endif %}
+
+
                 </div>