diff --git a/Entity/Person.php b/Entity/Person.php index 2bfa5889b..7b3c9f894 100644 --- a/Entity/Person.php +++ b/Entity/Person.php @@ -99,6 +99,11 @@ class Person { * @var array */ private $cFData; + + /** + * @var string + */ + private $phonenumber = ''; public function __construct(\DateTime $opening = null) { $this->history = new \Doctrine\Common\Collections\ArrayCollection(); @@ -474,7 +479,6 @@ class Person { return $this->getSurname()." ".$this->getName(); } - /** * Set cFData * @@ -499,16 +503,36 @@ class Person { return $this->cFData; } + /** + * Set phonenumber + * + * @param string $phonenumber + * @return Person + */ + public function setPhonenumber($phonenumber = '') + { + $this->phonenumber = $phonenumber; - public function __toString() { + return $this; + } + + /** + * Get phonenumber + * + * @return string + */ + public function getPhonenumber() + { + return $this->phonenumber; + } + + public function __toString() + { return $this->getLabel(); } - // VALIDATION - - public function isHistoryValid(ExecutionContextInterface $context) { $r = $this->checkHistoryIsNotCovering(); diff --git a/Form/PersonType.php b/Form/PersonType.php index d95fa364b..29afaccdb 100644 --- a/Form/PersonType.php +++ b/Form/PersonType.php @@ -30,7 +30,7 @@ use CL\BelgianNationalNumberBundle\Form\BelgianNationalNumberType; class PersonType extends AbstractType { - /** + /** * @param FormBuilderInterface $builder * @param array $options */ @@ -45,6 +45,7 @@ class PersonType extends AbstractType 'required' => false )) ->add('memo', 'textarea', array('required' => false)) + ->add('phonenumber', 'textarea', array('required' => false)) ->add('email', 'textarea', array('required' => false)) ->add('countryOfBirth', 'select2_chill_country', array( 'required' => false diff --git a/Resources/config/doctrine/Person.orm.yml b/Resources/config/doctrine/Person.orm.yml index 4d93758d4..7d99a9118 100644 --- a/Resources/config/doctrine/Person.orm.yml +++ b/Resources/config/doctrine/Person.orm.yml @@ -36,6 +36,8 @@ Chill\PersonBundle\Entity\Person: name: proxy_open cFData: type: array + phonenumber: + type:text manyToOne: countryOfBirth: targetEntity: Chill\MainBundle\Entity\Country diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig index a208d5752..e08091882 100644 --- a/Resources/views/Person/view.html.twig +++ b/Resources/views/Person/view.html.twig @@ -1,13 +1,26 @@ +{# + * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . +#} {% extends "ChillPersonBundle::layout.html.twig" %} {% set activeRouteKey = 'chill_person_view' %} {# - This view should receive those arguments: - person - - #} {% block title %}ChillPersonBundle:Person:see{% endblock %} @@ -91,6 +104,11 @@ This view should receive those arguments:
{{ 'views.Person.view.email'|trans }}
{{ person.email}} 
+
+
{{ 'views.Person.view.phonenumber'|trans }}
+
{{ person.phonenumber}} 
+
+ {{ include(edit_tmp_name, edit_tmp_args) }}