Merge branch 'issue363_localisation_type_not_available_to_users' into 'master'

localisation type not available to edit by users

See merge request Chill-Projet/chill-bundles!282

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
 * [main] Add mainLocation field to User entity and add it in user form type
 * rewrite page which allow to select activity
 * [main] Add mainLocation field to User entity and add it in user form type

src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php

@@ -24,6 +24,7 @@ class LocationTypeApiController extends ApiController
         $query->andWhere(
             $query->expr()->andX(
                 $query->expr()->eq('e.availableForUsers', "'TRUE'"),
+                $query->expr()->eq('e.editableByUsers', "'TRUE'"),
                 $query->expr()->eq('e.active', "'TRUE'"),
             )
         );

src/Bundle/ChillMainBundle/Entity/LocationType.php

@@ -67,6 +67,12 @@ class LocationType
      */
     private ?string $defaultFor = null;
 
+    /**
+     * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read"})
+     */
+    private bool $editableByUsers = true;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -107,6 +113,11 @@ class LocationType
         return $this->defaultFor;
     }
 
+    public function getEditableByUsers(): ?bool
+    {
+        return $this->editableByUsers;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -152,6 +163,13 @@ class LocationType
         return $this;
     }
 
+    public function setEditableByUsers(bool $editableByUsers): self
+    {
+        $this->editableByUsers = $editableByUsers;
+
+        return $this;
+    }
+
     public function setTitle(array $title): self
     {
         $this->title = $title;

src/Bundle/ChillMainBundle/Form/LocationTypeType.php

@@ -39,6 +39,17 @@ final class LocationTypeType extends AbstractType
                     'expanded' => true,
                 ]
             )
+            ->add(
+                'editableByUsers',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Yes' => true,
+                        'No' => false,
+                    ],
+                    'expanded' => true,
+                ]
+            )
             ->add(
                 'addressRequired',
                 ChoiceType::class,

src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig

@@ -8,6 +8,7 @@
 			<tr>
                 <th>{{ 'Title'|trans }}</th>
 				<th>{{ 'Available for users'|trans }}</th>
+				<th>{{ 'Editable by users'|trans }}</th>
 				<th>{{ 'Address required'|trans }}</th>
 				<th>{{ 'Contact data'|trans }}</th>
 				<th>{{ 'Active'|trans }}</th>
@@ -25,6 +26,13 @@
 							<i class="fa fa-square-o"></i>
 						{%- endif -%}
 					</td>
+					<td style="text-align:center;">
+						{%- if entity.editableByUsers -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
 					<td>{{ entity.addressRequired|trans }}</td>
 					<td>{{ entity.contactData|trans }}</td>
 					<td style="text-align:center;">

src/Bundle/ChillMainBundle/migrations/Version20220112150413.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add editableByUsers field to ChillMain/LocationType.
+ */
+final class Version20220112150413 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_location_type DROP editableByUsers');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add editableByUsers field to ChillMain/LocationType';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_location_type ADD editableByUsers BOOLEAN DEFAULT TRUE');
+    }
+}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -202,6 +202,7 @@ Location: Localisation
 Location type list: Liste des types de localisation
 Create a new location type: Créer un nouveau type de localisation
 Available for users: Disponible aux utilisateurs
+Editable by users: Éditable par les utilisateurs
 Address required: Adresse requise?
 Contact data: Données de contact?
 optional: optionnel