mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-09-14 02:34:58 +00:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
b7119a2733 | |||
eca26a15e6 | |||
f609bb0645 | |||
bdee637c9f | |||
722026b768 | |||
8ed899a9c4 |
3
.changes/v2.6.2.md
Normal file
3
.changes/v2.6.2.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
## v2.6.2 - 2023-09-18
|
||||||
|
### Fixed
|
||||||
|
* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
|
4
.changes/v2.6.3.md
Normal file
4
.changes/v2.6.3.md
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
## v2.6.3 - 2023-09-19
|
||||||
|
### Fixed
|
||||||
|
* Remove id property from document
|
||||||
|
mappedsuperclass
|
@@ -6,6 +6,15 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
|||||||
and is generated by [Changie](https://github.com/miniscruff/changie).
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
|
## v2.6.3 - 2023-09-19
|
||||||
|
### Fixed
|
||||||
|
* Remove id property from document
|
||||||
|
mappedsuperclass
|
||||||
|
|
||||||
|
## v2.6.2 - 2023-09-18
|
||||||
|
### Fixed
|
||||||
|
* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
|
||||||
|
|
||||||
## v2.6.1 - 2023-09-14
|
## v2.6.1 - 2023-09-14
|
||||||
### Fixed
|
### Fixed
|
||||||
* Filter out active centers in exports, which uses a different PickCenterType.
|
* Filter out active centers in exports, which uses a different PickCenterType.
|
||||||
|
@@ -28,6 +28,13 @@ class AccompanyingCourseDocument extends Document implements HasScopesInterface,
|
|||||||
*/
|
*/
|
||||||
private ?AccompanyingPeriod $course = null;
|
private ?AccompanyingPeriod $course = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ORM\Id
|
||||||
|
* @ORM\GeneratedValue
|
||||||
|
* @ORM\Column(type="integer")
|
||||||
|
*/
|
||||||
|
private $id;
|
||||||
|
|
||||||
public function getCenters(): ?iterable
|
public function getCenters(): ?iterable
|
||||||
{
|
{
|
||||||
return $this->course->getCenters();
|
return $this->course->getCenters();
|
||||||
@@ -38,6 +45,11 @@ class AccompanyingCourseDocument extends Document implements HasScopesInterface,
|
|||||||
return $this->course;
|
return $this->course;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getId()
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
public function getScopes(): iterable
|
public function getScopes(): iterable
|
||||||
{
|
{
|
||||||
if (null === $this->course) {
|
if (null === $this->course) {
|
||||||
@@ -53,4 +65,11 @@ class AccompanyingCourseDocument extends Document implements HasScopesInterface,
|
|||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setId($id): self
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -49,13 +49,6 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
*/
|
*/
|
||||||
private $description = '';
|
private $description = '';
|
||||||
|
|
||||||
/**
|
|
||||||
* @ORM\Id
|
|
||||||
* @ORM\GeneratedValue
|
|
||||||
* @ORM\Column(type="integer")
|
|
||||||
*/
|
|
||||||
private $id;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\ManyToOne(
|
* @ORM\ManyToOne(
|
||||||
* targetEntity="Chill\DocStoreBundle\Entity\StoredObject",
|
* targetEntity="Chill\DocStoreBundle\Entity\StoredObject",
|
||||||
@@ -103,11 +96,6 @@ class Document implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
return $this->description;
|
return $this->description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getId()
|
|
||||||
{
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getObject(): ?StoredObject
|
public function getObject(): ?StoredObject
|
||||||
{
|
{
|
||||||
return $this->object;
|
return $this->object;
|
||||||
|
@@ -23,6 +23,13 @@ use Doctrine\ORM\Mapping as ORM;
|
|||||||
*/
|
*/
|
||||||
class PersonDocument extends Document implements HasCenterInterface, HasScopeInterface
|
class PersonDocument extends Document implements HasCenterInterface, HasScopeInterface
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @ORM\Id
|
||||||
|
* @ORM\GeneratedValue
|
||||||
|
* @ORM\Column(type="integer")
|
||||||
|
*/
|
||||||
|
private $id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
|
* @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
|
||||||
*/
|
*/
|
||||||
@@ -40,6 +47,11 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
|
|||||||
return $this->getPerson()->getCenter();
|
return $this->getPerson()->getCenter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getId()
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
public function getPerson(): Person
|
public function getPerson(): Person
|
||||||
{
|
{
|
||||||
return $this->person;
|
return $this->person;
|
||||||
@@ -50,6 +62,13 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
|
|||||||
return $this->scope;
|
return $this->scope;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setId($id): self
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function setPerson($person): self
|
public function setPerson($person): self
|
||||||
{
|
{
|
||||||
$this->person = $person;
|
$this->person = $person;
|
||||||
|
@@ -44,15 +44,6 @@ class AbstractTaskPlaceEvent
|
|||||||
*/
|
*/
|
||||||
private $datetime;
|
private $datetime;
|
||||||
|
|
||||||
/**
|
|
||||||
* @var int
|
|
||||||
*
|
|
||||||
* @ORM\Column(name="id", type="integer")
|
|
||||||
* @ORM\Id
|
|
||||||
* @ORM\GeneratedValue(strategy="AUTO")
|
|
||||||
*/
|
|
||||||
private $id;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
@@ -90,16 +81,6 @@ class AbstractTaskPlaceEvent
|
|||||||
return $this->datetime;
|
return $this->datetime;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get id.
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function getId()
|
|
||||||
{
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get transition.
|
* Get transition.
|
||||||
*
|
*
|
||||||
|
@@ -31,6 +31,15 @@ use Doctrine\ORM\Mapping as ORM;
|
|||||||
*/
|
*/
|
||||||
class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
|
class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @var int
|
||||||
|
*
|
||||||
|
* @ORM\Column(name="id", type="integer")
|
||||||
|
* @ORM\Id
|
||||||
|
* @ORM\GeneratedValue(strategy="AUTO")
|
||||||
|
*/
|
||||||
|
private $id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var SingleTask
|
* @var SingleTask
|
||||||
* @ORM\ManyToOne(
|
* @ORM\ManyToOne(
|
||||||
@@ -51,4 +60,21 @@ class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
|
|||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get id.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getId()
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setId($id): self
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user