Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-29 11:03:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

household list of accompanying periods + upgrade DBAL version to 3.1

Browse Source
This commit is contained in:
LenaertsJ
2021-11-08 10:57:14 +00:00
committed by Julien Fastré
parent 092ea4d57f
commit 7fabe0214e
49 changed files with 353 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
View File

@@ -40,7 +40,7 @@ class CustomField
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var string
*
@@ -61,18 +61,18 @@ class CustomField
* @ORM\Column(type="boolean")
*/
private $active = true;
/**
* @var array
*
* @ORM\Column(type="json_array")
* @ORM\Column(type="json")
*/
private $options = array();
/**
* @var array
*
* @ORM\Column(type="json_array")
* @ORM\Column(type="json")
*/
private $name;
@@ -82,14 +82,14 @@ class CustomField
* @ORM\Column(type="float")
*/
private $ordering;
/**
* @var boolean
*
* @ORM\Column(type="boolean")
*/
private $required = FALSE;
const ONE_TO_ONE = 1;
const ONE_TO_MANY = 2;
@@ -102,7 +102,7 @@ class CustomField
*/
private $customFieldGroup;
/**
* Get id
*
@@ -112,7 +112,7 @@ class CustomField
{
return $this->id;
}
/**
* @return string
*/
@@ -120,15 +120,15 @@ class CustomField
{
return $this->slug;
}
/**
* @return array
*/
function getOptions()
{
return $this->options;
}
}
/**
* Set type
*
@@ -152,7 +152,7 @@ class CustomField
return $this->type;
}
/**
* Set active
*
@@ -229,9 +229,9 @@ class CustomField
}
}
}
return '';
} else {
return $this->name;
};
@@ -272,7 +272,7 @@ class CustomField
return $this;
}
/**
* @param $slug
* @return $this
@@ -282,20 +282,20 @@ class CustomField
$this->slug = $slug;
return $this;
}
/**
* alias for isRequired
*
*
* @return boolean
*/
public function getRequired()
{
return $this->isRequired();
}
/**
* return true if the field required
*
*
* @return boolean
*/
public function isRequired()
@@ -308,5 +308,5 @@ class CustomField
$this->required = $required;
return $this;
}
}

46
src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
View File

@@ -39,21 +39,21 @@ class Option
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var string
* @ORM\Column(type="string", length=15)
*/
private $key;
/**
* A json representation of text (multilingual)
*
* @var array
* @ORM\Column(type="json_array")
* @ORM\Column(type="json")
*/
private $text;
/**
* @var Collection
* @ORM\OneToMany(
@@ -61,7 +61,7 @@ class Option
* mappedBy="parent")
*/
private $children;
/**
* @var Option
* @ORM\ManyToOne(
@@ -70,19 +70,19 @@ class Option
* @ORM\JoinColumn(nullable=true)
*/
private $parent;
/**
* @var string
* @ORM\Column(type="string", length=50, name="internal_key")
*/
private $internalKey = '';
/**
* @var boolean
* @ORM\Column(type="boolean")
*/
private $active = true;
/**
* @return int
*/
@@ -90,7 +90,7 @@ class Option
{
return $this->id;
}
/**
* @return string
*/
@@ -98,7 +98,7 @@ class Option
{
return $this->key;
}
/**
* @return array
*/
@@ -106,7 +106,7 @@ class Option
{
return $this->text;
}
/**
* @return Collection
*/
@@ -114,7 +114,7 @@ class Option
{
return $this->children;
}
/**
* @return Option
*/
@@ -122,7 +122,7 @@ class Option
{
return $this->parent;
}
/**
* @param $key
* @return $this
@@ -132,7 +132,7 @@ class Option
$this->key = $key;
return $this;
}
/**
* @param array $text
* @return $this
@@ -142,7 +142,7 @@ class Option
$this->text = $text;
return $this;
}
/**
* @param Option|null $parent
* @return $this
@@ -153,16 +153,16 @@ class Option
$this->key = $parent->getKey();
return $this;
}
/**
*
*
* @return boolean
*/
public function hasParent()
{
return $this->parent === NULL ? false : true;
}
/**
* @return string
*/
@@ -170,7 +170,7 @@ class Option
{
return $this->internalKey;
}
/**
* @return bool
*/
@@ -178,7 +178,7 @@ class Option
{
return $this->active;
}
/**
* @return bool
*/
@@ -186,7 +186,7 @@ class Option
{
return $this->isActive();
}
/**
* @param $internal_key
* @return $this
@@ -196,7 +196,7 @@ class Option
$this->internalKey = $internal_key;
return $this;
}
/**
* @param $active
* @return $this
@@ -206,5 +206,5 @@ class Option
$this->active = $active;
return $this;
}
}

24
src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
View File

@@ -45,7 +45,7 @@ class CustomFieldsGroup
/**
* @var array
*
* @ORM\Column(type="json_array")
* @ORM\Column(type="json")
*/
private $name;
@@ -76,15 +76,15 @@ class CustomFieldsGroup
* @var array|null
*/
private $activeCustomFields = null;
/**
* @var array
*
* @ORM\Column(type="json_array")
* @ORM\Column(type="json")
*/
private $options = array();
/**
* CustomFieldsGroup constructor.
*/
@@ -115,7 +115,7 @@ class CustomFieldsGroup
{
$this->customFields->removeElement($customField);
}
/**
* @return Collection
*/
@@ -142,7 +142,7 @@ class CustomFieldsGroup
return $this->activeCustomFields;
}
/**
* Get id
*
@@ -184,9 +184,9 @@ class CustomFieldsGroup
}
}
}
return '';
} else {
return $this->name;
}
@@ -214,10 +214,10 @@ class CustomFieldsGroup
{
return $this->entity;
}
/**
* get options array
*
*
* @return array
*/
public function getOptions()
@@ -227,7 +227,7 @@ class CustomFieldsGroup
/**
* set options array
*
*
* @param array $options
* @return CustomFieldsGroup
*/