diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index b06d7db90..75b6831de 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -50,7 +50,7 @@
{# Flash messages ! #} - {% if app.session.flashbag.all()|length > 0 %} + {% if app.session.flashbag.keys()|length > 0 %}
{% for flashMessage in app.session.flashbag.get('success') %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig index 21a56b027..cfbc16f4f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig @@ -29,7 +29,7 @@
{# Flash messages ! #} - {% if app.session.flashbag.all()|length > 0 %} + {% if app.session.flashbag.keys()|length > 0 %}
{% for flashMessage in app.session.flashbag.get('success') %} diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml new file mode 100644 index 000000000..d5dedbb9f --- /dev/null +++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml @@ -0,0 +1,6 @@ +years_old: >- + {age, plural, + one {# an} + many {# ans} + other {# ans} + } diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index c4b36a348..7f9805f52 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -734,9 +734,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI return $this->birthdate; } - public function getAge(): int + public function getAge(): ?int { - return date_diff($this->birthdate, date_create('now'))->format("%y"); + if ($this->birthdate instanceof \DateTimeInterface) { + return date_diff($this->birthdate, date_create('now'))->format("%y"); + } + + return null; } /** diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig index dd136014e..6fb12847d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner.html.twig @@ -76,10 +76,10 @@ {{ 'Unknown date of birth'|trans }} {% else %} {{ person.birthdate|format_date('short') }} + + {{ 'years_old'|trans({ 'age': person.age }) }} + {% endif %} - - {{ person.age ~ ((person.age > 1) ? ' ans' : ' an') }} -
{%- if chill_person.fields.nationality == 'visible' -%} diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php index 425b00b6c..e841f2615 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php @@ -152,7 +152,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase * with : dateClosing: 2015-02-01 * with : the last closing motive in list * Then the response should redirect to period view - * And the next page should have a `.error` element present in page + * And the next page should have a `.alert-danger` element present in page * * @todo */ @@ -174,7 +174,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase '/fr/person/'.$this->person->getId().'/accompanying-period'), 'the server redirects to /accompanying-period page'); $this->assertGreaterThan(0, $this->client->followRedirect() - ->filter('.success')->count(), + ->filter('.alert-success')->count(), "a 'success' element is shown"); } @@ -186,7 +186,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase * with : dateClosing: 2014-01-01 * with : the last closing motive in list * Then the response should redirect to period view - * And the next page should have a `.error` element present in page + * And the next page should have a `.alert-danger` element present in page * * @todo */ @@ -207,8 +207,8 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stays on the /close page'); $this->assertGreaterThan(0, $crawlerResponse - ->filter('.error')->count(), - "an '.error' element is shown"); + ->filter('.alert-danger')->count(), + "an '.alert-danger' element is shown"); } /** @@ -240,7 +240,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase '/fr/person/'.$this->person->getId().'/accompanying-period'), 'the server redirects to /accompanying-period page'); $this->assertGreaterThan(0, $this->client->followRedirect() - ->filter('.success')->count(), + ->filter('.alert-success')->count(), "a 'success' element is shown"); } @@ -275,7 +275,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stay on form page'); - $this->assertGreaterThan(0, $crawler->filter('.error')->count(), + $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(), "an 'error' element is shown"); } @@ -310,7 +310,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stay on form page'); - $this->assertGreaterThan(0, $crawler->filter('.error')->count(), + $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(), "an 'error' element is shown"); } @@ -351,7 +351,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stay on form page'); - $this->assertGreaterThan(0, $crawlerResponse->filter('.error')->count(), + $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(), "an 'error' element is shown"); } @@ -382,7 +382,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stay on form page'); - $this->assertGreaterThan(0, $crawler->filter('.error')->count(), + $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(), "an 'error' element is shown"); } @@ -424,7 +424,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stay on form page'); - $this->assertGreaterThan(0, $crawlerResponse->filter('.error')->count(), + $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(), "an 'error' element is shown"); } @@ -465,7 +465,7 @@ class AccompanyingPeriodControllerTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the server stay on form page'); - $this->assertGreaterThan(0, $crawlerResponse->filter('.error')->count(), + $this->assertGreaterThan(0, $crawlerResponse->filter('.alert-danger')->count(), "an 'error' element is shown"); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php index ffdd65f35..8a8c04538 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php @@ -102,7 +102,6 @@ class PersonControllerUpdateTest extends WebTestCase public function testHiddenFielsArePresent() { $crawler = $this->client->request('GET', $this->editUrl); - $configurables = array('placeOfBirth', 'phonenumber', 'email', 'countryOfBirth', 'nationality', 'spokenLanguages', 'maritalStatus'); $form = $crawler->selectButton('Enregistrer')->form(); //; @@ -190,7 +189,7 @@ class PersonControllerUpdateTest extends WebTestCase 'the value '.$field.' is updated in db'); $crawler = $this->client->followRedirect(); - $this->assertGreaterThan(0, $crawler->filter('.success')->count(), + $this->assertGreaterThan(0, $crawler->filter('.alert-success')->count(), 'a element .success is shown'); if($field == 'birthdate' or $field == 'memo' or $field == 'countryOfBirth' or $field == 'nationality' @@ -245,7 +244,7 @@ class PersonControllerUpdateTest extends WebTestCase $this->assertFalse($this->client->getResponse()->isRedirect(), 'the page is not redirected to /general'); - $this->assertGreaterThan(0, $crawler->filter('.error')->count(), + $this->assertGreaterThan(0, $crawler->filter('.alert-danger')->count(), 'a element .error is shown'); }