Commit 55846661 authored by Marc Ducobu's avatar Marc Ducobu

Debug

parent 21676a20
......@@ -353,7 +353,7 @@ class PersonController extends Controller
$em = $this->getDoctrine()->getManager();
$person = $em->getRepository('ChillPersonBundle:Person')
->find($id);
->find($id);
return $person;
}
......
......@@ -24,6 +24,7 @@ namespace Chill\PersonBundle\Entity;
use Symfony\Component\Validator\ExecutionContextInterface;
use Chill\MainBundle\Entity\Country;
use Chill\PersonBundle\Entity\MaritalStatus;
use Doctrine\Common\Collections\ArrayCollection;
use Chill\MainBundle\Entity\HasCenterInterface;
......@@ -402,7 +403,7 @@ class Person implements HasCenterInterface {
* @param \Chill\PersonBundle\Entity\MaritalStatus $maritalStatus
* @return Person
*/
public function setMaritalStatus($maritalStatus)
public function setMaritalStatus(MaritalStatus $maritalStatus = null)
{
$this->maritalStatus = $maritalStatus;
return $this;
......
......@@ -55,7 +55,6 @@ class CreationPersonType extends AbstractType
$dateToStringTransformer = new DateTimeToStringTransformer(
null, null, 'dd-MM-yyyy', true);
$builder->add('firstName', 'hidden')
->add('lastName', 'hidden')
->add( $builder->create('birthdate', 'hidden')
......
......@@ -55,6 +55,7 @@ Chill\PersonBundle\Entity\Person:
nullable: false
maritalStatus:
targetEntity: Chill\PersonBundle\Entity\MaritalStatus
nullable: true
oneToMany:
accompanyingPeriods:
targetEntity: AccompanyingPeriod
......
......@@ -116,7 +116,11 @@ This view should receive those arguments:
<dl>
<dt class="inline">{{'Marital status'|trans}}</dt>
<dd>
{{ person.maritalStatus.name|localize_translatable_string }}
{% if person.maritalStatus is not null %}
{{ person.maritalStatus.name|localize_translatable_string }}
{% else %}
{{ 'no data given'|trans }}
{% endif %}
</dd>
</dl>
</figure>
......
......@@ -20,6 +20,8 @@
namespace Chill\PersonBundle\Tests\Controller;
ini_set('memory_limit', '-1');
use Chill\PersonBundle\Entity\Person;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
......@@ -240,7 +242,8 @@ class PersonControllerUpdateTest extends WebTestCase
['memo', '', function(Person $person) { return $person->getMemo(); }],
['countryOfBirth', NULL, function(Person $person) { return $person->getCountryOfBirth(); }],
['nationality', NULL, function(Person $person) { return $person->getNationality(); }],
['gender', Person::FEMALE_GENDER, function(Person $person) { return $person->getGender(); }]
['gender', Person::FEMALE_GENDER, function(Person $person) { return $person->getGender(); }],
['maritalStatus', NULL, function(Person $person) {return $person->getMaritalStatus(); }]
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment