update changelog

.changes/v2.6.1.md

@@ -0,0 +1,3 @@
+## v2.6.1 - 2023-09-14
+### Fixed
+* Filter out active centers in exports, which uses a different PickCenterType. 

.changes/v2.6.2.md

@@ -0,0 +1,3 @@
+## v2.6.2 - 2023-09-18
+### Fixed
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 

CHANGELOG.md

@@ -6,6 +6,14 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.6.2 - 2023-09-18
+### Fixed
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
+
+## v2.6.1 - 2023-09-14
+### Fixed
+* Filter out active centers in exports, which uses a different PickCenterType. 
+
 ## v2.6.0 - 2023-09-14
 ### Feature
 * ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 

src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php

@@ -57,12 +57,14 @@ final class PickCenterType extends AbstractType
             $export->requiredRole()
         );
 
+        $centersActive = array_filter($centers, fn (Center $c) => $c->getIsActive());
+
         // order alphabetically
-        usort($centers, fn (Center $a, Center $b) => $a->getCenter() <=> $b->getName());
+        usort($centersActive, fn (Center $a, Center $b) => $a->getCenter() <=> $b->getName());
 
         $builder->add('center', EntityType::class, [
             'class' => Center::class,
-            'choices' => $centers,
+            'choices' => $centersActive,
             'label' => 'center',
             'multiple' => true,
             'expanded' => true,

src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php

@@ -44,15 +44,6 @@ class AbstractTaskPlaceEvent
      */
     private $datetime;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
     /**
      * @var string
      *
@@ -90,16 +81,6 @@ class AbstractTaskPlaceEvent
         return $this->datetime;
     }
 
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
     /**
      * Get transition.
      *

src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php

@@ -31,6 +31,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
 {
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
     /**
      * @var SingleTask
      * @ORM\ManyToOne(
@@ -51,4 +60,21 @@ class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
 
         return $this;
     }
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setId($id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
 }