diff --git a/DataFixtures/ORM/LoadEventTypes.php b/DataFixtures/ORM/LoadEventTypes.php index 38e171d97..40e9b76b0 100644 --- a/DataFixtures/ORM/LoadEventTypes.php +++ b/DataFixtures/ORM/LoadEventTypes.php @@ -29,7 +29,7 @@ class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface { $type = (new EventType()) ->setActive(true) - ->setLabel(array('fr' => 'Échange de savoirs', 'en' => 'Exchange of knowledge')) + ->setName(array('fr' => 'Échange de savoirs', 'en' => 'Exchange of knowledge')) ; $manager->persist($type); $this->addReference('event_type_knowledge', $type); @@ -37,26 +37,26 @@ class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface $role = (new Role()) ->setActive(true) - ->setLabel(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant')) + ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant')) ->setType($type) ; $manager->persist($role); $role = (new Role()) ->setActive(true) - ->setLabel(array('fr' => 'Animateur')) + ->setName(array('fr' => 'Animateur')) ->setType($type); $manager->persist($role); $status = (new Status()) ->setActive(true) - ->setLabel(array('fr' => 'Inscrit')) + ->setName(array('fr' => 'Inscrit')) ->setType($type); $manager->persist($status); $status = (new Status()) ->setActive(true) - ->setLabel(array('fr' => 'Présent')) + ->setName(array('fr' => 'Présent')) ->setType($type) ; $manager->persist($status); @@ -64,7 +64,7 @@ class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface $type = (new EventType()) ->setActive(true) - ->setLabel(array('fr' => 'Formation', 'en' => 'Course', 'nl' => 'Opleiding')) + ->setName(array('fr' => 'Formation', 'en' => 'Course', 'nl' => 'Opleiding')) ; $manager->persist($type); $this->addReference('event_type_course', $type); @@ -72,21 +72,21 @@ class LoadEventTypes extends AbstractFixture implements OrderedFixtureInterface $role = (new Role()) ->setActive(true) - ->setLabel(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant')) + ->setName(array('fr' => 'Participant', 'nl' => 'Deelneemer', 'en' => 'Participant')) ->setType($type) ; $manager->persist($role); $status = (new Status()) ->setActive(true) - ->setLabel(array('fr' => 'Inscrit')) + ->setName(array('fr' => 'Inscrit')) ->setType($type) ; $manager->persist($status); $status = (new Status()) ->setActive(true) - ->setLabel(array('fr' => 'En liste d\'attente')) + ->setName(array('fr' => 'En liste d\'attente')) ->setType($type) ; $manager->persist($status); diff --git a/DataFixtures/ORM/LoadParticipation.php b/DataFixtures/ORM/LoadParticipation.php index 98f19a82e..5f18d06b2 100644 --- a/DataFixtures/ORM/LoadParticipation.php +++ b/DataFixtures/ORM/LoadParticipation.php @@ -80,7 +80,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa for($i=0; $i<$expectedNumber; $i++) { $event = (new Event()) ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months')) - ->setLabel($this->faker->words(rand(2,4), true)) + ->setName($this->faker->words(rand(2,4), true)) ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)])) ->setCenter($center) ->setCircle( diff --git a/Entity/Event.php b/Entity/Event.php index d9512fda0..0246be6fd 100644 --- a/Entity/Event.php +++ b/Entity/Event.php @@ -18,7 +18,7 @@ class Event implements HasCenterInterface, HasScopeInterface /** * @var string */ - private $label; + private $name; /** * @var \DateTime @@ -74,9 +74,9 @@ class Event implements HasCenterInterface, HasScopeInterface * * @return Event */ - public function setLabel($label) + public function setName($label) { - $this->label = $label; + $this->name = $label; return $this; } @@ -86,9 +86,9 @@ class Event implements HasCenterInterface, HasScopeInterface * * @return string */ - public function getLabel() + public function getName() { - return $this->label; + return $this->name; } /** diff --git a/Entity/EventType.php b/Entity/EventType.php index e7646c03a..8f0d2bba4 100644 --- a/Entity/EventType.php +++ b/Entity/EventType.php @@ -15,7 +15,7 @@ class EventType /** * @var array */ - private $label; + private $name; /** * @var boolean @@ -58,9 +58,9 @@ class EventType * * @return EventType */ - public function setLabel($label) + public function setName($label) { - $this->label = $label; + $this->name = $label; return $this; } @@ -70,9 +70,9 @@ class EventType * * @return array */ - public function getLabel() + public function getName() { - return $this->label; + return $this->name; } /** diff --git a/Entity/Role.php b/Entity/Role.php index fe98414ab..c50665b11 100644 --- a/Entity/Role.php +++ b/Entity/Role.php @@ -15,7 +15,7 @@ class Role /** * @var array */ - private $label; + private $name; /** * @var boolean @@ -45,9 +45,9 @@ class Role * * @return Role */ - public function setLabel($label) + public function setName($label) { - $this->label = $label; + $this->name = $label; return $this; } @@ -57,9 +57,9 @@ class Role * * @return array */ - public function getLabel() + public function getName() { - return $this->label; + return $this->name; } /** diff --git a/Entity/Status.php b/Entity/Status.php index d39a325c3..6a4ee29ad 100644 --- a/Entity/Status.php +++ b/Entity/Status.php @@ -15,7 +15,7 @@ class Status /** * @var array */ - private $label; + private $name; /** * @var boolean @@ -41,13 +41,13 @@ class Status /** * Set label * - * @param array $label + * @param array $name * * @return Status */ - public function setLabel($label) + public function setName($name) { - $this->label = $label; + $this->name = $name; return $this; } @@ -57,9 +57,9 @@ class Status * * @return array */ - public function getLabel() + public function getName() { - return $this->label; + return $this->name; } diff --git a/Form/EventType.php b/Form/EventType.php index 29b32a086..a3417a81e 100644 --- a/Form/EventType.php +++ b/Form/EventType.php @@ -67,7 +67,7 @@ class EventType extends AbstractType } $builder - ->add('label') + ->add('name') ->add( 'date', 'date', diff --git a/Form/EventTypeType.php b/Form/EventTypeType.php index 02ec828e8..9616f9f59 100644 --- a/Form/EventTypeType.php +++ b/Form/EventTypeType.php @@ -15,7 +15,7 @@ class EventTypeType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('label') + ->add('name') ->add('active') ; } diff --git a/Form/ParticipationType.php b/Form/ParticipationType.php index 4891a4811..5b754dcf9 100644 --- a/Form/ParticipationType.php +++ b/Form/ParticipationType.php @@ -76,7 +76,7 @@ class ParticipationType extends AbstractType ); }, 'choice_label' => function(Role $r) use ($translatableStringHelper) { - return $translatableStringHelper->localize($r->getLabel()); + return $translatableStringHelper->localize($r->getName()); } )); @@ -102,7 +102,7 @@ class ParticipationType extends AbstractType return $qb; }, 'choice_label' => function(Status $s) use ($translatableStringHelper) { - return $translatableStringHelper->localize($s->getLabel()); + return $translatableStringHelper->localize($s->getName()); } )); diff --git a/Form/RoleType.php b/Form/RoleType.php index 293aec1d1..4f8fb3c53 100644 --- a/Form/RoleType.php +++ b/Form/RoleType.php @@ -15,7 +15,7 @@ class RoleType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('label') + ->add('name') ->add('active') ->add('type') ; diff --git a/Form/StatusType.php b/Form/StatusType.php index 24bdcd604..1bef97168 100644 --- a/Form/StatusType.php +++ b/Form/StatusType.php @@ -15,7 +15,7 @@ class StatusType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('label') + ->add('name') ->add('active') ->add('type') ; diff --git a/Form/Type/TranslatableEventType.php b/Form/Type/TranslatableEventType.php index cf2abc14a..6b7a80d03 100644 --- a/Form/Type/TranslatableEventType.php +++ b/Form/Type/TranslatableEventType.php @@ -62,7 +62,7 @@ class TranslatableEventType extends AbstractType ->where('et.active = true'); }, 'choice_label' => function (EventType $t) use ($helper) { - return $helper->localize($t->getLabel()); + return $helper->localize($t->getName()); }, ) ); diff --git a/Resources/config/doctrine/Event.orm.yml b/Resources/config/doctrine/Event.orm.yml index ae69e2f06..eb02041e4 100644 --- a/Resources/config/doctrine/Event.orm.yml +++ b/Resources/config/doctrine/Event.orm.yml @@ -8,7 +8,7 @@ Chill\EventBundle\Entity\Event: generator: strategy: AUTO fields: - label: + name: type: string length: '150' date: diff --git a/Resources/config/doctrine/EventType.orm.yml b/Resources/config/doctrine/EventType.orm.yml index 17bc5cadb..dcfab3ba6 100644 --- a/Resources/config/doctrine/EventType.orm.yml +++ b/Resources/config/doctrine/EventType.orm.yml @@ -8,7 +8,7 @@ Chill\EventBundle\Entity\EventType: generator: strategy: AUTO fields: - label: + name: type: json_array active: type: boolean diff --git a/Resources/config/doctrine/Role.orm.yml b/Resources/config/doctrine/Role.orm.yml index 8d1723c37..b6a1ae677 100644 --- a/Resources/config/doctrine/Role.orm.yml +++ b/Resources/config/doctrine/Role.orm.yml @@ -8,7 +8,7 @@ Chill\EventBundle\Entity\Role: generator: strategy: AUTO fields: - label: + name: type: json_array active: type: boolean diff --git a/Resources/config/doctrine/Status.orm.yml b/Resources/config/doctrine/Status.orm.yml index 2849b7522..f1567f8f0 100644 --- a/Resources/config/doctrine/Status.orm.yml +++ b/Resources/config/doctrine/Status.orm.yml @@ -8,7 +8,7 @@ Chill\EventBundle\Entity\Status: generator: strategy: AUTO fields: - label: + name: type: json_array active: type: boolean diff --git a/Resources/migrations/Version20160318111334.php b/Resources/migrations/Version20160318111334.php index fe23df743..df23eaab1 100644 --- a/Resources/migrations/Version20160318111334.php +++ b/Resources/migrations/Version20160318111334.php @@ -24,24 +24,24 @@ class Version20160318111334 extends AbstractMigration $this->addSql('CREATE SEQUENCE chill_event_event_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE SEQUENCE chill_event_participation_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE TABLE chill_event_event_type (' - . 'id INT NOT NULL, label JSON NOT NULL, ' + . 'id INT NOT NULL, name JSON NOT NULL, ' . 'active BOOLEAN NOT NULL, PRIMARY KEY(id))'); $this->addSql('CREATE TABLE chill_event_role (' . 'id INT NOT NULL, ' . 'type_id INT DEFAULT NULL, ' - . 'label JSON NOT NULL, ' + . 'name JSON NOT NULL, ' . 'active BOOLEAN NOT NULL, ' . 'PRIMARY KEY(id))'); $this->addSql('CREATE INDEX IDX_AA714E54C54C8C93 ON chill_event_role (type_id)'); $this->addSql('CREATE TABLE chill_event_status (id INT NOT NULL, ' . 'type_id INT DEFAULT NULL, ' - . 'label JSON NOT NULL, ' + . 'name JSON NOT NULL, ' . 'active BOOLEAN NOT NULL, ' . 'PRIMARY KEY(id))'); $this->addSql('CREATE INDEX IDX_A6CC85D0C54C8C93 ON chill_event_status (type_id)'); $this->addSql('CREATE TABLE chill_event_event (' . 'id INT NOT NULL, ' - . 'label VARCHAR(150) NOT NULL, ' + . 'name VARCHAR(150) NOT NULL, ' . 'date DATE NOT NULL, ' . 'center_id INT DEFAULT NULL, ' . 'type_id INT DEFAULT NULL, ' diff --git a/Resources/views/Event/edit.html.twig b/Resources/views/Event/edit.html.twig index ca326aa80..03519eff9 100644 --- a/Resources/views/Event/edit.html.twig +++ b/Resources/views/Event/edit.html.twig @@ -11,7 +11,7 @@ {% if edit_form.center is defined %} {{ form_row(edit_form.center) }} {% endif %} - {{ form_row(edit_form.label) }} + {{ form_row(edit_form.name) }} {{ form_row(edit_form.date) }} {{ form_row(edit_form.type, { 'label': 'Event type' }) }} diff --git a/Resources/views/Event/index.html.twig b/Resources/views/Event/index.html.twig index b5ac1e62a..442d5ca67 100644 --- a/Resources/views/Event/index.html.twig +++ b/Resources/views/Event/index.html.twig @@ -7,7 +7,7 @@ Id - Label + Name Date Actions @@ -16,7 +16,7 @@ {% for entity in entities %} {{ entity.id }} - {{ entity.label }} + {{ entity.name }} {% if entity.date %}{{ entity.date|date('Y-m-d H:i:s') }}{% endif %}