mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 05:44:24 +00:00
[temporary] add a phonenumber field - close #320
This commit is contained in:
parent
dc523beb58
commit
680bb7ca83
@ -99,6 +99,11 @@ class Person {
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
private $cFData;
|
private $cFData;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
private $phonenumber = '';
|
||||||
|
|
||||||
public function __construct(\DateTime $opening = null) {
|
public function __construct(\DateTime $opening = null) {
|
||||||
$this->history = new \Doctrine\Common\Collections\ArrayCollection();
|
$this->history = new \Doctrine\Common\Collections\ArrayCollection();
|
||||||
@ -474,7 +479,6 @@ class Person {
|
|||||||
return $this->getSurname()." ".$this->getName();
|
return $this->getSurname()." ".$this->getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set cFData
|
* Set cFData
|
||||||
*
|
*
|
||||||
@ -499,16 +503,36 @@ class Person {
|
|||||||
return $this->cFData;
|
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();
|
return $this->getLabel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// VALIDATION
|
// VALIDATION
|
||||||
|
|
||||||
|
|
||||||
public function isHistoryValid(ExecutionContextInterface $context) {
|
public function isHistoryValid(ExecutionContextInterface $context) {
|
||||||
$r = $this->checkHistoryIsNotCovering();
|
$r = $this->checkHistoryIsNotCovering();
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ use CL\BelgianNationalNumberBundle\Form\BelgianNationalNumberType;
|
|||||||
|
|
||||||
class PersonType extends AbstractType
|
class PersonType extends AbstractType
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @param FormBuilderInterface $builder
|
* @param FormBuilderInterface $builder
|
||||||
* @param array $options
|
* @param array $options
|
||||||
*/
|
*/
|
||||||
@ -45,6 +45,7 @@ class PersonType extends AbstractType
|
|||||||
'required' => false
|
'required' => false
|
||||||
))
|
))
|
||||||
->add('memo', 'textarea', array('required' => false))
|
->add('memo', 'textarea', array('required' => false))
|
||||||
|
->add('phonenumber', 'textarea', array('required' => false))
|
||||||
->add('email', 'textarea', array('required' => false))
|
->add('email', 'textarea', array('required' => false))
|
||||||
->add('countryOfBirth', 'select2_chill_country', array(
|
->add('countryOfBirth', 'select2_chill_country', array(
|
||||||
'required' => false
|
'required' => false
|
||||||
|
@ -36,6 +36,8 @@ Chill\PersonBundle\Entity\Person:
|
|||||||
name: proxy_open
|
name: proxy_open
|
||||||
cFData:
|
cFData:
|
||||||
type: array
|
type: array
|
||||||
|
phonenumber:
|
||||||
|
type:text
|
||||||
manyToOne:
|
manyToOne:
|
||||||
countryOfBirth:
|
countryOfBirth:
|
||||||
targetEntity: Chill\MainBundle\Entity\Country
|
targetEntity: Chill\MainBundle\Entity\Country
|
||||||
|
@ -1,13 +1,26 @@
|
|||||||
|
{#
|
||||||
|
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
|
||||||
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
#}
|
||||||
{% extends "ChillPersonBundle::layout.html.twig" %}
|
{% extends "ChillPersonBundle::layout.html.twig" %}
|
||||||
|
|
||||||
{% set activeRouteKey = 'chill_person_view' %}
|
{% set activeRouteKey = 'chill_person_view' %}
|
||||||
|
|
||||||
{#
|
{#
|
||||||
|
|
||||||
This view should receive those arguments:
|
This view should receive those arguments:
|
||||||
- person
|
- person
|
||||||
|
|
||||||
|
|
||||||
#}
|
#}
|
||||||
|
|
||||||
{% block title %}ChillPersonBundle:Person:see{% endblock %}
|
{% block title %}ChillPersonBundle:Person:see{% endblock %}
|
||||||
@ -91,6 +104,11 @@ This view should receive those arguments:
|
|||||||
<dt class="inline">{{ 'views.Person.view.email'|trans }}</dt>
|
<dt class="inline">{{ 'views.Person.view.email'|trans }}</dt>
|
||||||
<dd><pre>{{ person.email}} </pre></dd>
|
<dd><pre>{{ person.email}} </pre></dd>
|
||||||
</dl>
|
</dl>
|
||||||
|
<dl>
|
||||||
|
<dt class="inline">{{ 'views.Person.view.phonenumber'|trans }}</dt>
|
||||||
|
<dd><pre>{{ person.phonenumber}} </pre></dd>
|
||||||
|
</dl>
|
||||||
|
|
||||||
</figure>
|
</figure>
|
||||||
|
|
||||||
{{ include(edit_tmp_name, edit_tmp_args) }}
|
{{ include(edit_tmp_name, edit_tmp_args) }}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user