various improvements on 3party

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCivility.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Chill\ThirdPartyBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\Entity\Civility;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+/**
+ * Class LoadThirdPartyCivility
+ *
+ * @author Mathieu Jaumotte mathieu.jaumotte@champs-libres.coop
+ */
+class LoadCivility extends Fixture implements FixtureGroupInterface
+{
+    public static function getGroups(): array
+    {
+        return ['civilities'];
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $civilities = [
+            ['name' => ['fr' => "Monsieur" ]],
+            ['name' => ['fr' => "Madame" ]],
+            ['name' => ['fr' => "Docteur" ]],
+            ['name' => ['fr' => "Professeur" ]],
+            ['name' => ['fr' => "Madame la Directrice" ]],
+            ['name' => ['fr' => "Monsieur le Directeur" ]],
+            ['name' => ['fr' => "Madame la Maire" ]],
+            ['name' => ['fr' => "Monsieur le Maire" ]],
+            ['name' => ['fr' => "Maître" ]],
+        ];
+
+        foreach ( $civilities as $val) {
+            $civility = (new ThirdPartyCivility())
+                ->setName($val['name'])
+                ->setActive(true);
+            $manager->persist($civility);
+        }
+
+        $manager->flush();
+    }
+}

src/Bundle/ChillMainBundle/Entity/Civility.php

@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\MainBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_main_civility")
+ * @ORM\Entity
+ */
+class Civility
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $name = [];
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $abbreviation = [];
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getName(): ?array
+    {
+        return $this->name;
+    }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAbbreviation(): array
+    {
+        return $this->abbreviation;
+    }
+
+    /**
+     * @param array $abbreviation
+     * @return Civility
+     */
+    public function setAbbreviation(array $abbreviation): self
+    {
+        $this->abbreviation = $abbreviation;
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/ChillCollectionType.php

@@ -24,14 +24,14 @@ use Symfony\Component\Form\FormInterface;
 
 /**
  * Available options :
- * 
+ *
  * - `button_add_label`
  * - `button_remove_label`
  * - `identifier`: an identifier to identify the kind of collecton. Useful if some
  *  javascript should be launched associated to `add_entry`, `remove_entry` events.
- * 
+ * - `empty_collection_explain`
+ *
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ChillCollectionType extends AbstractType
 {
@@ -41,10 +41,11 @@ class ChillCollectionType extends AbstractType
             ->setDefaults([
                 'button_add_label' => 'Add an entry',
                 'button_remove_label' => 'Remove entry',
-                'identifier' => ''
+                'identifier' => '',
+                'empty_collection_explain' => '',
             ]);
     }
-    
+
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['button_add_label'] = $options['button_add_label'];
@@ -52,8 +53,9 @@ class ChillCollectionType extends AbstractType
         $view->vars['allow_delete'] = (int) $options['allow_delete'];
         $view->vars['allow_add'] = (int) $options['allow_add'];
         $view->vars['identifier'] = $options['identifier'];
+        $view->vars['empty_collection_explain'] = $options['empty_collection_explain'];
     }
-    
+
     public function getParent()
     {
         return \Symfony\Component\Form\Extension\Core\Type\CollectionType::class;

src/Bundle/ChillMainBundle/Repository/CivilityRepository.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ *
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\ThirdPartyBundle\Repository;
+
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCivility;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ThirdPartyCivility|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ThirdPartyCivility|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ThirdPartyCivility[]    findAll()
+ * @method ThirdPartyCivility[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ThirdPartyCivilityRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ThirdPartyCivility::class);
+    }
+
+}

src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js

@@ -1,27 +1,27 @@
 /**
  * Javascript file which handle ChillCollectionType
- * 
- * Two events are emitted by this module, both on window and on collection / ul. 
- * 
+ *
+ * Two events are emitted by this module, both on window and on collection / ul.
+ *
  * Collection (an UL element) and entry (a li element) are associated with those
  * events.
- * 
+ *
  * ```
  * window.addEventListener('collection-add-entry', function(e) {
  *   console.log(e.detail.collection);
  *   console.log(e.detail.entry);
  * });
- * 
+ *
  * window.addEventListener('collection-remove-entry', function(e) {
  *   console.log(e.detail.collection);
  *   console.log(e.detail.entry);
  * });
- * 
+ *
  * collection.addEventListener('collection-add-entry', function(e) {
  *   console.log(e.detail.collection);
  *   console.log(e.detail.entry);
  * });
- * 
+ *
  * collection.addEventListener('collection-remove-entry', function(e) {
  *   console.log(e.detail.collection);
  *   console.log(e.detail.entry);
@@ -38,7 +38,7 @@ class CollectionEvent {
 }
 
 /**
- * 
+ *
  * @param {type} button
  * @returns {handleAdd}
  */
@@ -47,6 +47,7 @@ var handleAdd = function(button) {
         form_name = button.dataset.collectionAddTarget,
         prototype = button.dataset.formPrototype,
         collection = document.querySelector('ul[data-collection-name="'+form_name+'"]'),
+        empty_explain = collection.querySelector('li[data-collection-empty-explain]'),
         entry = document.createElement('li'),
         event = new CustomEvent('collection-add-entry', { detail: { collection: collection, entry: entry } }),
         counter = collection.childNodes.length,
@@ -56,8 +57,11 @@ var handleAdd = function(button) {
     entry.innerHTML = content;
     entry.classList.add('entry');
     initializeRemove(collection, entry);
+    if (empty_explain !== null) {
+        empty_explain.remove();
+    }
     collection.appendChild(entry);
-    
+
     collection.dispatchEvent(event);
     window.dispatchEvent(event);
 };
@@ -70,30 +74,30 @@ var initializeRemove = function(collection, entry) {
         allowDelete = collection.dataset.collectionAllowDelete,
         event = new CustomEvent('collection-remove-entry', { detail: { collection: collection, entry: entry } })
         ;
-        
+
     if (allowDelete === '0' && isPersisted === '1') {
         return;
     }
-    
+
     button.classList.add('btn', 'btn-delete', 'remove-entry');
     button.textContent = content;
-    
+
     button.addEventListener('click', function(e) {
         e.preventDefault();
         entry.remove();
         collection.dispatchEvent(event);
         window.dispatchEvent(event);
     });
-    
+
     entry.appendChild(button);
 };
 
 window.addEventListener('load', function() {
-    var 
+    var
         addButtons = document.querySelectorAll("button[data-collection-add-target]"),
         collections = document.querySelectorAll("ul[data-collection-name]")
         ;
-    
+
     for (let i = 0; i < addButtons.length; i ++) {
         let addButton = addButtons[i];
         addButton.addEventListener('click', function(e) {
@@ -101,11 +105,15 @@ window.addEventListener('load', function() {
             handleAdd(e.target);
         });
     }
-    
+
     for (let i = 0; i < collections.length; i ++) {
         let entries = collections[i].querySelectorAll(':scope > li');
-        
+
         for (let j = 0; j < entries.length; j ++) {
+            console.log(entries[j].dataset);
+            if (entries[j].dataset.collectionEmptyExplain === "1") {
+                continue;
+            }
             initializeRemove(collections[i], entries[j]);
         }
     }

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -168,6 +168,10 @@
                         {{ form_widget(entry) }}
                     </div>
                 </li>
+            {% else %}
+                <li data-collection-empty-explain="1">
+                    <span class="chill-no-data-statement">{{ form.vars.empty_collection_explain|default('No item')|trans }}</span>
+                </li>
             {% endfor %}
         </ul>
 

src/Bundle/ChillMainBundle/migrations/Version20211007150019.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Create civility table
+ */
+final class Version20211007150019 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'create civility table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_civility_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_civility (id INT NOT NULL, name JSON NOT NULL, abbreviation JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_civility_id_seq');
+        $this->addSql('DROP TABLE chill_main_civility');
+    }
+}