diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index 7737e1d04..e04b9f43a 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -37,7 +37,7 @@ Choose an user: Choisir un utilisateur No value: Aucune information Last updated by: Dernière mise à jour par Last updated on: Dernière mise à jour le -on: le +on: "le " Edit: Modifier Update: Mettre à jour diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 5e521b60a..86a1d9bc8 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -50,6 +50,7 @@ use Chill\PersonBundle\Validator\Constraints\Person\Birthdate; use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint; use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter; use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential; +use DateTimeInterface; /** * Person Class @@ -390,19 +391,19 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI /** * @ORM\Column(type="datetime", nullable=true, options={"default": NULL}) */ - private \DateTimeInterface $createdAt; + private $createdAt; /** * @ORM\ManyToOne( * targetEntity=User::class * ) */ - private User $updatedBy; + private $updatedBy; /** * @ORM\Column(type="datetime", nullable=true, options={"default": NULL}) */ - private \DateTimeInterface $updatedAt; + private $updatedAt; /** * @var boolean @@ -1823,6 +1824,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI return $this; } + public function getCreatedAt(): ?DateTimeInterface + { + return $this->createdAt; + } + public function setCreatedAt(\DateTimeInterface $datetime): self { $this->createdAt = $datetime; @@ -1830,6 +1836,16 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI return $this; } + public function getUpdatedBy(): ?User + { + return $this->updatedBy; + } + + public function getUpdatedAt(): ?DateTimeInterface + { + return $this->updatedAt; + } + public function setUpdatedBy(User $user): self { $this->updatedBy = $user; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index 2e5821659..6c9687ff9 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -237,8 +237,13 @@ abbr.referrer { // still used ? align-self: center; // in flex context } -.updatedBy { +.updatedBy, .createdBy { margin-top: 0.3rem; font-size: 0.9rem; font-style: italic; } + +.created-updated { + border: 1px solid black; + padding: 10px; +} \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig index 0351d0ba1..807a0d894 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig @@ -259,6 +259,21 @@ This view should receive those arguments: {% endif %} +