ActivityType : rename some fields

This commit is contained in:
Jean-Francois Monfort
2021-04-15 13:56:39 +02:00
parent dad8fd5378
commit cb5cf5763e
3 changed files with 70 additions and 50 deletions

View File

@@ -43,7 +43,7 @@ class ActivityType
* @ORM\Column(name="id", type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private ?int $id;
private ?int $id;
/**
* @ORM\Column(type="json_array")
@@ -113,12 +113,12 @@ class ActivityType
/**
* @ORM\Column(type="smallint", nullable=false, options={"default"=1})
*/
private int $thirdpartyVisible = self::FIELD_INVISIBLE;
private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
/**
* @ORM\Column(type="string", nullable=false, options={"default"=""})
*/
private string $thirdpartyLabel = '';
private string $thirdPartiesLabel = '';
/**
* @ORM\Column(type="smallint", nullable=false, options={"default"=1})
@@ -173,12 +173,12 @@ class ActivityType
/**
* @ORM\Column(type="smallint", nullable=false, options={"default"=1})
*/
private int $documentVisible = self::FIELD_OPTIONAL;
private int $documentsVisible = self::FIELD_OPTIONAL;
/**
* @ORM\Column(type="string", nullable=false, options={"default"=""})
*/
private string $documentLabel = '';
private string $documentsLabel = '';
/**
* @ORM\Column(type="smallint", nullable=false, options={"default"=1})
@@ -221,7 +221,7 @@ class ActivityType
/**
* Set name
*/
public function setName(string $name): self
public function setName(array $name): self
{
$this->name = $name;
@@ -230,25 +230,10 @@ class ActivityType
/**
* Get name
*
* @return array | string
*/
public function getName(?string $locale = null)
public function getName(): array
{
if ($locale) {
if (isset($this->name[$locale])) {
return $this->name[$locale];
} else {
foreach ($this->name as $name) {
if (!empty($name)) {
return $name;
}
}
}
return '';
} else {
return $this->name;
}
return $this->name;
}
/**
@@ -390,24 +375,24 @@ class ActivityType
$this->personsLabel = $personsLabel;
}
public function getThirdpartyVisible(): int
public function getThirdPartiesVisible(): int
{
return $this->thirdpartyVisible;
return $this->thirdPartiesVisible;
}
public function setThirdpartyVisible(int $thirdpartyVisible): void
public function setThirdPartiesVisible(int $thirdPartiesVisible): void
{
$this->thirdpartyVisible = $thirdpartyVisible;
$this->thirdPartiesVisible = $thirdPartiesVisible;
}
public function getThirdpartyLabel(): string
public function getThirdPartiesLabel(): string
{
return $this->thirdpartyLabel;
return $this->thirdPartiesLabel;
}
public function setThirdpartyLabel(string $thirdpartyLabel): void
public function setThirdPartiesLabel(string $thirdPartiesLabel): void
{
$this->thirdpartyLabel = $thirdpartyLabel;
$this->thirdPartiesLabel = $thirdPartiesLabel;
}
public function getDurationTimeVisible(): int
@@ -510,24 +495,24 @@ class ActivityType
$this->sentReceivedLabel = $sentReceivedLabel;
}
public function getDocumentVisible(): int
public function getDocumentsVisible(): int
{
return $this->documentVisible;
return $this->documentsVisible;
}
public function setDocumentVisible(int $documentVisible): void
public function setDocumentsVisible(int $documentsVisible): void
{
$this->documentVisible = $documentVisible;
$this->documentsVisible = $documentsVisible;
}
public function getDocumentLabel(): string
public function getDocumentsLabel(): string
{
return $this->documentLabel;
return $this->documentsLabel;
}
public function setDocumentLabel(string $documentLabel): void
public function setDocumentsLabel(string $documentsLabel): void
{
$this->documentLabel = $documentLabel;
$this->documentsLabel = $documentsLabel;
}
public function getEmergencyVisible(): int