Task: Misc adjustments

This commit is contained in:
Björn Fromme
2023-10-25 15:22:38 +02:00
parent 3e540e215d
commit 011f1faf0f
20 changed files with 125 additions and 57 deletions
+19 -19
View File
@@ -38,10 +38,10 @@ class Application implements TimestampableEntityInterface
private ?string $status;
#[ORM\Column(type: Types::TEXT, nullable: true)]
private ?string $remarks = null;
private ?string $comment = null;
#[ORM\ManyToOne]
private ?User $remarksBy = null;
#[ORM\Column]
private ?bool $commentVisible = false;
public function __construct(Assignment $assignment, Teamer $teamer)
{
@@ -109,18 +109,6 @@ class Application implements TimestampableEntityInterface
return $this;
}
public function getRemarks(): ?string
{
return $this->remarks;
}
public function setRemarks(?string $remarks): static
{
$this->remarks = $remarks;
return $this;
}
public function matchesPickup(): bool
{
if (0 === $pickupId = (int) $this->getAssignment()->getPickup()) {
@@ -147,14 +135,26 @@ class Application implements TimestampableEntityInterface
return $count === $requiredTrainings->count();
}
public function getRemarksBy(): ?User
public function getComment(): ?string
{
return $this->remarksBy;
return $this->comment;
}
public function setRemarksBy(?User $remarksBy): static
public function setComment(?string $comment): static
{
$this->remarksBy = $remarksBy;
$this->comment = $comment;
return $this;
}
public function isCommentVisible(): ?bool
{
return $this->commentVisible;
}
public function setCommentVisible(bool $commentVisible): static
{
$this->commentVisible = $commentVisible;
return $this;
}
-1
View File
@@ -54,7 +54,6 @@ class Disposition implements BlameableEntityInterface, TimestampableEntityInterf
$this->status = static::STATUS_NEW;
$this->assignment = $application->getAssignment();
$this->teamer = $application->getTeamer();
$this->remarks = $application->getRemarks();
$this->documents = new ArrayCollection();
}