upgrade forms to update and create person

This commit is contained in:
2014-11-07 16:26:15 +01:00
parent 2a3ebb3659
commit 2358e2a9bb
6 changed files with 9 additions and 43 deletions

View File

@@ -1,10 +1,5 @@
Chill\PersonBundle\Entity\Person:
properties:
belgian_national_number:
- NotBlank:
groups: [general]
- CL\BelgianNationalNumberBundle\Validator\Constraint\BelgianNationalNumber:
groups: [general]
name:
- NotBlank:
groups: [general, creation]
@@ -28,14 +23,6 @@ Chill\PersonBundle\Entity\Person:
- Date:
message: validation.Person.constraint.dateOfBirth.not_valid
groups: [general, creation]
nbOfChild:
- Range:
min: 0
max: 20
minMessage: validation.Person.constraint.nbOfChild_min
maxMessage: validation.Person.constraint.nbOfChild_max
invalidMessage: validation.Person.constraint.nbOfChild_invalid
groups: [general]
history:
- Valid:
traverse: true

View File

@@ -1,4 +1,4 @@
{% extends "CLChillMainBundle::layout.html.twig" %}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block title %}{{ 'views.Person.creation.title'|trans }}{% endblock title %}
@@ -12,8 +12,6 @@
{% endblock %}
{% form_theme form 'CLChillMainBundle:Form:fields.html.twig' %}
{% block content %}

View File

@@ -1,4 +1,4 @@
{% extends "CLChillMainBundle::layout.html.twig" %}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block title %}{{ 'views.Person.review.title'|trans }}{% endblock title %}
@@ -13,7 +13,6 @@
{% endblock %}
{% form_theme form 'CLChillMainBundle:Form:fields.html.twig' %}
{% block content %}
@@ -31,7 +30,7 @@
{% for person in alternatePersons %}
<tr>
<td>
<a href="{{ path('chill_person_view', {'id': person.id } ) }}">
<a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
{{ person }}{% spaceless %}{% if person.isOpen == false %}<i class="icon-lock"></i>{% endif %}
{% endspaceless %}
</a>

View File

@@ -6,12 +6,12 @@
{% block personcontent %}
{% form_theme form 'CLChillMainBundle:Form:fields.html.twig' %}
{% form_theme form 'ChillMainBundle:Form:fields.html.twig' %}
{{ form_start(form) }}
{% set include_temp = 'ChillPersonBundle:Form:form_control.html.twig' %}
{% set include_args = {'return_key': 'chill_person_view',
'return_args' : { 'id' : person.id} } %}
'return_args' : { 'person_id' : person.id} } %}
{{ include(include_temp, include_args) }}
<fieldset>
@@ -32,26 +32,15 @@
{{ include(include_temp, include_args) }}
<fieldset>
<legend><h2>{{ 'views.Person.view.family'|trans }}</h2></legend>
{{ form_row(form.civil_union, {'label' : 'views.Person.view.civil_union'}) }}
{{ form_row(form.nbOfChild, {'label' : 'views.Person.view.nb_of_childs'}) }}
</fieldset>
{{ include(include_temp, include_args) }}
<fieldset>
<legend><h2>{{ 'views.Person.view.administrative'|trans }}</h2></legend>
{{ form_row(form.nationality, { 'label' : 'views.Person.view.nationality'|trans} ) }}
{{ form_row(form.belgian_national_number, { 'label' : 'views.Person.view.national_number'}) }}
</fieldset>
{{ include(include_temp, include_args) }}
<fieldset>
<legend><h2>{{ 'views.Person.view.contact'|trans }}</h2></legend>
{{ form_row(form.address, {'label' : 'views.Person.view.address'}) }}
{{ form_row(form.email, {'label': 'views.Person.view.email'}) }}
</fieldset>