diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig index 461ff3c66..1fb97c0b6 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/form.html.twig @@ -71,4 +71,4 @@ {{ form_end(form) }} -{% endblock personcontent %} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig index 882de4363..b75dcee5d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/re_open.html.twig @@ -24,4 +24,4 @@ -{% endblock personcontent %} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig index c03d9bc34..07639ae23 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig @@ -14,31 +14,37 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . #} -{% extends "@ChillPerson/Person/layout.html.twig" %} +{% extends "@ChillPerson/Person/layout.html.twig" %} {% set activeRouteKey = '' %} {% block title 'Modify address for %name%'|trans({ '%name%': person.firstName ~ ' ' ~ person.lastName } ) %} {% block personcontent %} +
+
+
+ + {% block content %} +

{{ block('title') }}

+
+ {% endblock %} - {% block content %} -

{{ block('title') }}

-
- {% endblock %} +
+
+
+{% endblock %} - {% block stylesheets %} - {{ encore_entry_link_tags('vue_address') }} - {% endblock %} +{% block css %} + {{ encore_entry_link_tags('vue_address') }} +{% endblock %} - {% block js %} - - {{ encore_entry_script_tags('vue_address') }} - {% endblock %} - -{% endblock personcontent %} +{% block js %} + + {{ encore_entry_script_tags('vue_address') }} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig index f5d24b304..714b328eb 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig @@ -24,102 +24,106 @@ {% block personcontent %}
- -

{{ 'Addresses history'|trans }}

- -
- - {% if person.addresses|length == 0 %} - {{ 'No address given'|trans }} - {% else %} -
- {% endif %} - - {% for address in person.addresses %} - - {# if person address #} -
-
- {% if address.isNoAddress == true %} -
{{ 'address.consider homeless'|trans }}
- {% else %} - - {% if address.street is not empty %} -
- {{ address.street }} - {% if address.streetNumber is not empty %} - , {{ address.streetNumber }} - {% endif %} -
- {% endif %} - - {% if address.postCode is not empty %} -
- {{ address.postCode.code }} {{ address.postCode.name }} - ({{ address.postCode.country.name|localize_translatable_string }}) -
- {% endif %} - - {% endif %} - -
    -
  • - -
    • -
-
-
- {# endif #} - -
- - {# if household address #}{# -
-
...
-
- #}{# endif #} - -
- {% if address.validFrom is not empty %} - {{ address.validFrom|format_date('long') }} - {% endif %} -
+
+
- {% endfor %} - - {# TEST HOUSEHOLD POSITION - #} -
-
-
-
- 549, chemin De Sousa - , 45, boulevard Aurore Roux +

{{ 'Addresses history'|trans }}

+ +
+ + {% if person.addresses|length == 0 %} + {{ 'No address given'|trans }} + {% else %} +
+ {% endif %} + + {% for address in person.addresses %} + + {# if person address #} +
+
+ {% if address.isNoAddress == true %} +
{{ 'address.consider homeless'|trans }}
+ {% else %} + + {% if address.street is not empty %} +
+ {{ address.street }} + {% if address.streetNumber is not empty %} + , {{ address.streetNumber }} + {% endif %} +
+ {% endif %} + + {% if address.postCode is not empty %} +
+ {{ address.postCode.code }} {{ address.postCode.name }} + ({{ address.postCode.country.name|localize_translatable_string }}) +
+ {% endif %} + + {% endif %} + +
    +
  • + +
    • +
+
+
+ {# endif #} + +
+ + {# if household address #}{# +
+
...
+
+ #}{# endif #} + +
+ {% if address.validFrom is not empty %} + {{ address.validFrom|format_date('long') }} + {% endif %} +
+ + {% endfor %} + + {# TEST HOUSEHOLD POSITION + #} +
+
+
+
+ 549, chemin De Sousa + , 45, boulevard Aurore Roux +
+
+ 10850 Nanterre (France) +
+
+
-
- 10850 Nanterre (France) -
-
+
01 janvier 1970
+ {# END TEST #} +
-
-
01 janvier 1970
- {# END TEST #} - -
- + +
+
-{% endblock personcontent %} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig index 0770c83a6..785f03f1e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig @@ -23,29 +23,27 @@ {% block personcontent %}
-
+
+ + {% block content %} +

{{ block('title') }}

+
+ {% endblock %} - - {% block content %} -

{{ block('title') }}

-
- {% endblock %} - - {% block stylesheets %} - {{ encore_entry_link_tags('vue_address') }} - {% endblock %} - - {% block js %} - - {{ encore_entry_script_tags('vue_address') }} - {% endblock %} - -
-{% endblock personcontent %} +{% endblock %} + +{% block css %} + {{ encore_entry_link_tags('vue_address') }} +{% endblock %} + +{% block js %} + + {{ encore_entry_script_tags('vue_address') }} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig index 4900ca4ba..9356c0e7a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/CRUD/index.html.twig @@ -12,4 +12,4 @@ {% endblock %} {% endembed %} -{% endblock personcontent %} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig index 845606f24..8c5b6eb35 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create_review.html.twig @@ -24,7 +24,7 @@
-
+
{% transchoice alternatePersons|length with { '%nb%': alternatePersons|length } %} %nb% person with similar name. Please verify that this is a new person @@ -33,7 +33,7 @@
{% if alternatePersons is not empty %} - +
@@ -63,7 +63,7 @@
{{ 'Name'|trans }}
{% endif %} -
+
{{ form_start(form) }}

{{ 'You will create this person'|trans }}

@@ -84,11 +84,13 @@ {{ form_widget(form.altNames) }} {% endif %}
- + {{ form_rest(form) }} - + {{ form_end(form) }}
+
+
{% endblock content %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig index b87b00367..3027de464 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig @@ -143,8 +143,8 @@
-{% endblock personcontent %} +{% endblock %} {% block js %} {{ encore_entry_link_tags('person') }} -{% endblock js %} +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig index 06d8d99bb..c3343aa16 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig @@ -4,178 +4,180 @@ {% block title 'household.Household history for %name%'|trans({'name': person|chill_entity_render_string}) %} - {% block personcontent %} -

{{ block('title') }}

+
+
+
+ +

{{ block('title') }}

+

{{ 'household.Household shared'|trans }}

-

{{ 'household.Household shared'|trans }}

+ {% set memberships = person.getHouseholdParticipationsShareHousehold() %} -{% set memberships = person.getHouseholdParticipationsShareHousehold() %} + {% if memberships|length == 0 %} +

{{ 'household.Never in any household'|trans }}

-{% if memberships|length == 0 %} -

{{ 'household.Never in any household'|trans }}

- - - -{% else %} - -
-
- - {% if not person.isSharingHousehold() %} -
-
-
-
- +
-
-
- {% endif %} + + - {% for p in memberships %} -
-
-
-
- {{ p.startDate|format_date('long') }} -
-
-
-
-
- -
-
-

- - - {{ 'household.Household number'|trans({'household_num': p.household.id }) }} - -

-

{{ p.position.label|localize_translatable_string }} {% if p.holder %}{{ 'household.holder'|trans }}{% endif %} -

-
- {% set simultaneous = p.household.getMembersDuringMembership(p) %} - {% if simultaneous|length == 0 %} -

- {{ 'household.Any simultaneous members'|trans }} -

- {% else %} - {{ 'household.Members at same time'|trans }}: - {% for p in simultaneous -%} - {{- p.person|chill_entity_render_box({'addLink': true }) -}} - {%- if p.holder %} {{'household.holder'|trans }} {% endif %} - {%- if not loop.last %}, {% endif -%} - {%- endfor -%} - {% endif %} - +
+
+ {% endif %} + + {% for p in memberships %} +
+
+
+
+ {{ p.startDate|format_date('long') }} +
+
+
+
+
+ +
+
+

+ + + {{ 'household.Household number'|trans({'household_num': p.household.id }) }} + +

+

{{ p.position.label|localize_translatable_string }} {% if p.holder %}{{ 'household.holder'|trans }}{% endif %} +

+
+ {% set simultaneous = p.household.getMembersDuringMembership(p) %} + {% if simultaneous|length == 0 %} +

+ {{ 'household.Any simultaneous members'|trans }} +

+ {% else %} + {{ 'household.Members at same time'|trans }}: + {% for p in simultaneous -%} + {{- p.person|chill_entity_render_box({'addLink': true }) -}} + {%- if p.holder %} {{'household.holder'|trans }} {% endif %} + {%- if not loop.last %}, {% endif -%} + {%- endfor -%} + {% endif %} + +
+
+
+
+ {% endfor %}
+
-
- {% endfor %} -
- -
-{% endif %} - -

{{ 'household.Household not shared'|trans }}

- -{% set memberships = person.getHouseholdParticipationsNotShareHousehold() %} - -{% if memberships|length == 0 %} -

{{ 'household.Never in any household'|trans }}

-{% else %} - - - - - - - - - - {% for p in memberships %} - - - - - - - {% endfor %} - -
{{ 'household.from'|trans }}{{ 'household.to'|trans }}{{ 'household.Household'|trans }}
{{ p.startDate|format_date('long') }} - {% if p.endDate is not empty %} - {{ p.endDate|format_date('long') }} - {% else %} - {{ 'household.Membership currently running'|trans }} {% endif %} - -
-

- - - {{ 'household.Household number'|trans({'household_num': p.household.id }) }} - -

-

{{ p.position.label|localize_translatable_string }} {% if p.holder %}{{ 'household.holder'|trans }}{% endif %} -

-
- {% set simultaneous = p.household.getMembersDuringMembership(p) %} - {% if simultaneous|length == 0 %} -

- {{ 'household.Any simultaneous members'|trans }} -

- {% else %} - {{ 'household.Members at same time'|trans }}: - {% for p in simultaneous -%} - {{- p.person|chill_entity_render_box({'addLink': true }) -}} - {%- if p.holder %} {{'household.holder'|trans }} {% endif %} - {%- if not loop.last %}, {% endif -%} - {%- endfor -%} - {% endif %} -
- 		-
    -
  • - -
    • -
-
-{% endif %} +

{{ 'household.Household not shared'|trans }}

+ + {% set memberships = person.getHouseholdParticipationsNotShareHousehold() %} + + {% if memberships|length == 0 %} +

{{ 'household.Never in any household'|trans }}

+ {% else %} + + + + + + + + + + {% for p in memberships %} + + + + + + + {% endfor %} + +
{{ 'household.from'|trans }}{{ 'household.to'|trans }}{{ 'household.Household'|trans }}
{{ p.startDate|format_date('long') }} + {% if p.endDate is not empty %} + {{ p.endDate|format_date('long') }} + {% else %} + {{ 'household.Membership currently running'|trans }} + {% endif %} + +
+

+ + + {{ 'household.Household number'|trans({'household_num': p.household.id }) }} + +

+

+ {{ p.position.label|localize_translatable_string }} + {% if p.holder %} + {{ 'household.holder'|trans }} + {% endif %} +

+
+ {% set simultaneous = p.household.getMembersDuringMembership(p) %} + {% if simultaneous|length == 0 %} +

+ {{ 'household.Any simultaneous members'|trans }} +

+ {% else %} + {{ 'household.Members at same time'|trans }}: + {% for p in simultaneous -%} + {{- p.person|chill_entity_render_box({'addLink': true }) -}} + {%- if p.holder %} {{'household.holder'|trans }} {% endif %} + {%- if not loop.last %}, {% endif -%} + {%- endfor -%} + {% endif %} +
+ 		+ +
+ {% endif %} + +
+
+ {% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig index 7b97c83f9..b2ede7558 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig @@ -7,23 +7,29 @@ {% block personcontent %} +
+
+
+ +

{{ 'Désigner un dossier doublon'|trans }}

+ + {{ form_start(form) }} + {{ form_rest(form) }} -

Désigner un dossier doublon

- - {{ form_start(form) }} - {{ form_rest(form) }} + - - - {{ form_end(form) }} + {{ form_end(form) }} +
+
+
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig index 65222d5e0..ba27ac55d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig @@ -5,155 +5,161 @@ {% block title %}{{ 'Person duplicate'|trans|capitalize ~ ' ' ~ person.firstName|capitalize ~ ' ' ~ person.lastName }}{% endblock %} - {% block personcontent %} -

{{ title|default('Person duplicate')|trans }}

+
+
+
+ +

{{ title|default('Person duplicate')|trans }}

-{% if duplicatePersons|length > 0 %} -

{{ title|default('Person duplicate explained')|trans }}

+ {% if duplicatePersons|length > 0 %} +

{{ title|default('Person duplicate explained')|trans }}

- - - - - - - - - +
{% trans %}Name{% endtrans %}{% trans %}Date of birth{% endtrans %}{% trans %}Nationality{% endtrans %} 
+ + + + + + + + - {% for duplicatePerson in duplicatePersons %} - - + + - - - - - {% endfor %} -
{% trans %}Name{% endtrans %}{% trans %}Date of birth{% endtrans %}{% trans %}Nationality{% endtrans %} 
- {% set is_open = duplicatePerson.isOpen() %} - - {{ duplicatePerson|chill_entity_render_box }} - {% apply spaceless %} - {% if chill_person.fields.accompanying_period == 'visible' %} - {% if is_open == false %} - + {% for duplicatePerson in duplicatePersons %} +
+ {% set is_open = duplicatePerson.isOpen() %} + + {{ duplicatePerson|chill_entity_render_box }} + {% apply spaceless %} + {% if chill_person.fields.accompanying_period == 'visible' %} + {% if is_open == false %} + + {% else %} + + {% endif %} + {% endif %} + {% endapply %} + + + {% if duplicatePerson.birthdate is not null %} + {{ duplicatePerson.birthdate|format_date('long') }} {% else %} - + {{ 'Unknown date of birth'|trans }} {% endif %} - {% endif %} - {% endapply %} - - - {% if duplicatePerson.birthdate is not null %} - {{ duplicatePerson.birthdate|format_date('long') }} - {% else %} - {{ 'Unknown date of birth'|trans }} - {% endif %} - - {% if duplicatePerson.nationality is not null %} - {{ duplicatePerson.nationality.name|localize_translatable_string }} - {% else %} - {{ 'Without nationality'|trans }} - {% endif %} - - -
-{% endif %} + + + {% if duplicatePerson.nationality is not null %} + {{ duplicatePerson.nationality.name|localize_translatable_string }} + {% else %} + {{ 'Without nationality'|trans }} + {% endif %} + + + + + + {% endfor %} + + {% endif %} -{% if notDuplicatePersons|length > 0 %} -

{{ 'Person flaged as duplicate' | trans }}

-

{{ 'Person flaged as duplicate explained' | trans }}

+ {% if notDuplicatePersons|length > 0 %} +

{{ 'Person flaged as duplicate' | trans }}

+

{{ 'Person flaged as duplicate explained' | trans }}

- - - - - - - - - +
{% trans %}Name{% endtrans %}{% trans %}Date of birth{% endtrans %}{% trans %}Nationality{% endtrans %} 
+ + + + + + + + - {% for notDuplicatePerson in notDuplicatePersons %} - - + + + + + + {% endfor %} +
{% trans %}Name{% endtrans %}{% trans %}Date of birth{% endtrans %}{% trans %}Nationality{% endtrans %} 
- {% set is_open = notDuplicatePerson.isOpen() %} - - {{ notDuplicatePerson|chill_entity_render_box }} - {% apply spaceless %} - {% if chill_person.fields.accompanying_period == 'visible' %} - {% if is_open == false %} - + {% for notDuplicatePerson in notDuplicatePersons %} +
+ {% set is_open = notDuplicatePerson.isOpen() %} + + {{ notDuplicatePerson|chill_entity_render_box }} + {% apply spaceless %} + {% if chill_person.fields.accompanying_period == 'visible' %} + {% if is_open == false %} + + {% else %} + + {% endif %} + {% endif %} + {% endapply %} + + + {% if notDuplicatePerson.birthdate is not null %} + {{ notDuplicatePerson.birthdate|format_date('long') }} {% else %} - + {{ 'Unknown date of birth'|trans }} {% endif %} - {% endif %} - {% endapply %} + + {% if notDuplicatePerson.nationality is not null %} + {{ notDuplicatePerson.nationality.name|localize_translatable_string }} + {% else %} + {{ 'Without nationality'|trans }} + {% endif %} + + +
+ {% endif %} + + {% if notDuplicatePersons|length == 0 and duplicatePersons|length == 0 %} + {{ 'No duplicate candidates'|trans }} + {% endif %} + + +
+
+
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig index f3a513928..1362add7e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Timeline/index.html.twig @@ -27,9 +27,17 @@ This view should receive those arguments: {% block personcontent %} - {{ timeline|raw }} +
+
+
+ + {{ timeline|raw }} + + {% if nb_items > paginator.getItemsPerPage %} + {{ chill_pagination(paginator) }} + {% endif %} - {% if nb_items > paginator.getItemsPerPage %} - {{ chill_pagination(paginator) }} - {% endif %} -{% endblock personcontent %} +
+
+
+{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig index d8d8565aa..026e354c5 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig @@ -1,178 +1,182 @@ {% macro date_status(title, tasks, count, paginator, status, isSingleStatus, person, user) %} - {% if tasks|length > 0 %} -

{{ title|trans }}

+ {% if tasks|length > 0 %} +

{{ title|trans }}

- - - {% for task in tasks %} - - + + {% endfor %} + +
- -
- {{ task.title }} -
- - {% if person is null %} -
- {{ 'For person'|trans }} : {{ task.person}} -
+ + + {% for task in tasks %} + + + - - - {% endfor %} - -
+
+ {{ task.title }} +
+ + {% if person is null %} +
+ {{ 'For person'|trans }} : {{ task.person}} +
+ {% endif %} + +
+ {{ task_workflow_metadata(task, 'definition.name')|trans }} +
+ +
+ {% for place in workflow_marked_places(task) %} + {{ place|trans }} + {% endfor %} + {% if task.assignee is not null %} +
{{ 'By'|trans }} : {{ task.assignee.username }}
+ {% endif %} +
+ + {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %} +
+
    + {% if task.startDate is not null %} +
  • + {{ task.startDate|format_date('medium') }} +
    • {% endif %} - -
    - {{ task_workflow_metadata(task, 'definition.name')|trans }} -
    - - - -
    - - {% for place in workflow_marked_places(task) %} - {{ place|trans }} - {% endfor %} - {% if task.assignee is not null %} -
    {{ 'By'|trans }} : {{ task.assignee.username }}
    - {% endif %} -
    - - - {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %} -
    -
      - {% if task.startDate is not null %} -
    • - {{ task.startDate|format_date('medium') }} -
      • - {% endif %} - {% if task.warningDate is not null %} -
    • - {{ task.warningDate|format_date('medium') }} -
      • - {% endif %} - {% if task.endDate is not null %} -
    • - {{ task.endDate|format_date('medium') }} -
      • - {% endif %} + {% if task.warningDate is not null %} +
    • + {{ task.warningDate|format_date('medium') }} +
      • + {% endif %} + {% if task.endDate is not null %} +
    • + {{ task.endDate|format_date('medium') }} +
      • + {% endif %} +
    +
    + {% endif %} + +
+ -
    - {% if workflow_transitions(task)|length > 0 %} -
  • -
    -   -
    - {% for transition in workflow_transitions(task) %} - {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }} - {% endfor %} -
    -
    -
    • - {% endif %} -
  • - -
    • - {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %} -
  • - -
    • - {% endif %} - {% if is_granted('CHILL_TASK_TASK_DELETE', task) %} -
  • - -
    • - {% endif %} -
-
+ + {% endif %} + +
  • + +
    • + + {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %} +
  • + +
    • + {% endif %} + + {% if is_granted('CHILL_TASK_TASK_DELETE', task) %} +
  • + +
    • + {% endif %} + +
    - {% if isSingleStatus %} - {% if tasks|length < paginator.getTotalItems %} - {{ chill_pagination(paginator) }} - {% endif %} - - - - {% else %} - + {% if isSingleStatus %} + {% if tasks|length < paginator.getTotalItems %} + {{ chill_pagination(paginator) }} {% endif %} + + + {% else %} + {% endif %} + + {% endif %} {% endmacro %} {% import _self as helper %} -

    {{ app.request.query.get('title', null)|escape('html')|default('Task list'|trans) }}

    {% if false == app.request.query.boolean('hide_form', false) %} -

    {{ 'Filter the tasks'|trans }}

    - {{ form_start(form) }} - {{ form_row(form.user_id) }} - - {% if form.status is defined %} - {{ form_row(form.status) }} +

    {{ 'Filter the tasks'|trans }}

    + {{ form_start(form) }} + {{ form_row(form.user_id) }} + + {% if form.status is defined %} + {{ form_row(form.status) }} + {% endif %} + + {% if form.types is defined %} + {{ form_row(form.types) }} + {% endif %} + + {% if form.person_id is defined %} + {{ form_row(form.person_id) }} + {% endif %} + + {% if form.center_id is defined %} + {{ form_row(form.center_id) }} + {% endif %} + + + + {{ form_end(form)}} {% endif %} - - {% if form.types is defined %} - {{ form_row(form.types) }} - {% endif %} - - {% if form.person_id is defined %} - {{ form_row(form.person_id) }} - {% endif %} - - {% if form.center_id is defined %} - {{ form_row(form.center_id) }} - {% endif %} - - - {{ form_end(form)}} - {% endif %} - - {% if tasks_count == 0 %}

    {{ "There is no tasks."|trans }}

    @@ -180,61 +184,61 @@ {% endif %} {% else %} - {% if false == app.request.query.boolean('hide_form', false) %} + {% if false == app.request.query.boolean('hide_form', false) %}

    {{ 'Tasks'|trans }}

    - {% endif %} - - {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %} - - {% endif %} - - {% if single_task_ended_tasks is defined %} - {{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }} - {% endif %} - - {% if single_task_warning_tasks is defined %} - {{ helper.date_status('Tasks with warning deadline reached', single_task_warning_tasks, single_task_warning_count, single_task_warning_paginator, 'warning', isSingleStatus, person) }} - {% endif %} - - {% if single_task_current_tasks is defined %} - {{ helper.date_status('Current tasks', single_task_current_tasks, single_task_current_count, single_task_current_paginator, 'current', isSingleStatus, person) }} - {% endif %} - - {% if single_task_not_started_tasks is defined %} - {{ helper.date_status('Tasks not started', single_task_not_started_tasks, single_task_not_started_count, single_task_not_started_paginator, 'not_started', isSingleStatus, person) }} - {% endif %} - - {% if single_task_closed_tasks is defined %} - {{ helper.date_status('Closed tasks', single_task_closed_tasks, single_task_closed_count, single_task_closed_paginator, 'closed', isSingleStatus, person) }} - {% endif %} - - {% if isSingleStatus == false %} - - {% endif %} - {% endif %} + + {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %} + + {% endif %} + + {% if single_task_ended_tasks is defined %} + {{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }} + {% endif %} + + {% if single_task_warning_tasks is defined %} + {{ helper.date_status('Tasks with warning deadline reached', single_task_warning_tasks, single_task_warning_count, single_task_warning_paginator, 'warning', isSingleStatus, person) }} + {% endif %} + + {% if single_task_current_tasks is defined %} + {{ helper.date_status('Current tasks', single_task_current_tasks, single_task_current_count, single_task_current_paginator, 'current', isSingleStatus, person) }} + {% endif %} + + {% if single_task_not_started_tasks is defined %} + {{ helper.date_status('Tasks not started', single_task_not_started_tasks, single_task_not_started_count, single_task_not_started_paginator, 'not_started', isSingleStatus, person) }} + {% endif %} + + {% if single_task_closed_tasks is defined %} + {{ helper.date_status('Closed tasks', single_task_closed_tasks, single_task_closed_count, single_task_closed_paginator, 'closed', isSingleStatus, person) }} + {% endif %} + + {% if isSingleStatus == false %} + + {% endif %} + +{% endif %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig index 509137e7d..43445f328 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig @@ -22,35 +22,42 @@ {% block title %}{{ 'Edit task'|trans }}{% endblock %} {% block personcontent %} -

    {{ 'Edit task'|trans }}

    +
    +
    +
    + +

    {{ 'Edit task'|trans }}

    - {{ form_start(form) }} + {{ form_start(form) }} - {{ form_row(form.title) }} - {{ form_row(form.description) }} - {{ form_row(form.assignee) }} - {{ form_row(form.circle) }} - {{ form_row(form.startDate) }} - {{ form_row(form.endDate) }} - {{ form_row(form.warningInterval) }} + {{ form_row(form.title) }} + {{ form_row(form.description) }} + {{ form_row(form.assignee) }} + {{ form_row(form.circle) }} + {{ form_row(form.startDate) }} + {{ form_row(form.endDate) }} + {{ form_row(form.warningInterval) }} - + - {{ form_end(form) }} + {{ form_end(form) }} +
    +
    +
    {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig index 3971cf5f6..b52643afc 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig @@ -27,16 +27,23 @@ {% macro row(task) %} {% endmacro %} - {% block filtertasks %} {% if person is not null %} {% block personcontent %} - {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} +
    +
    +
    + {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} +
    +
    +
    {% endblock %} {% else %} {% block content %} -
    - {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} +
    +
    + {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} +
    {% endblock %} {% endif %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig index 58a023dc8..f1cf607cc 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig @@ -22,26 +22,33 @@ {% block title %}{{ 'New task'|trans }}{% endblock %} {% block personcontent %} -

    {{ 'New task'|trans }}

    +
    +
    +
    + +

    {{ 'New task'|trans }}

    - {{ form_start(form) }} - - {{ form_errors(form) }} + {{ form_start(form) }} + + {{ form_errors(form) }} - {{ form_row(form.title) }} - {{ form_row(form.description) }} - {{ form_row(form.assignee) }} - {{ form_row(form.circle) }} - {{ form_row(form.startDate) }} - {{ form_row(form.endDate) }} - {{ form_row(form.warningInterval) }} + {{ form_row(form.title) }} + {{ form_row(form.description) }} + {{ form_row(form.assignee) }} + {{ form_row(form.circle) }} + {{ form_row(form.startDate) }} + {{ form_row(form.endDate) }} + {{ form_row(form.warningInterval) }} -
      -
    • - {{ form_row(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'} }) }} -
      • -
    +
      +
    • + {{ form_widget(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'} }) }} +
      • +
    - {{ form_end(form) }} + {{ form_end(form) }} +
    +
    +
    {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig index 758934315..6f75a1aae 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig @@ -23,103 +23,121 @@ {% block personcontent %} -

    {{ 'Task'|trans }}

    - -

    {{ task.title }} {% for place in workflow_marked_places(task) %} +
    +
    +
    + +

    {{ 'Task'|trans }}

    + +

    {{ task.title }} {% for place in workflow_marked_places(task) %} {{ place|trans }} - {% endfor %}

    - -
    - -
    {{ 'Description'|trans }}
    -
    - {% if task.description is empty %} - {{"No description"|trans}} - {% else %} -
    - {{ task.description|chill_markdown_to_html }} -
    + {% endfor %}

    + +
    + +
    {{ 'Description'|trans }}
    +
    + {% if task.description is empty %} + {{"No description"|trans}} + {% else %} +
    + {{ task.description|chill_markdown_to_html }} +
    + {% endif %} +
    + +
    {{ 'Assignee'|trans }}
    +
    + {% if task.assignee is null %} + {{"No one assignee"|trans}} + {% else %} + {{ task.assignee }} + {% endif %} +
    + +
    {{ 'Scope'|trans }}
    +
    {{ task.scope.name|localize_translatable_string }}
    + +

    {{"Dates"|trans}}

    + {% if task.startDate is null and task.endDate is null and task.warningDate is null %} +
    +
    {{"No dates specified"|trans}}
    + + {% else %} + {% if task.startDate is not null %} +
    {{ 'Start'|trans }}
    +
    {{ task.startDate|format_date('long') }}
    + {% endif %} + + {% if task.endDate is not null %} +
    {{ 'End'|trans }}
    +
    {{ task.endDate|format_date('long') }}
    + {% endif %} + + {% if task.warningDate is not null %} +
    {{ 'Warning'|trans }}
    +
    {{ task.warningDate|format_date('long') }}
    + {% endif %} + + {% endif %} +
    + + {% if timeline is not null %} +

    {{"Timeline"|trans}}

    + {{ timeline|raw }} {% endif %} - - -
    {{ 'Assignee'|trans }}
    -
    - {% if task.assignee is null %} - {{"No one assignee"|trans}} - {% else %} - {{ task.assignee }} - {% endif %} -
    - -
    {{ 'Scope'|trans }}
    -
    {{ task.scope.name|localize_translatable_string }}
    - -

    {{"Dates"|trans}}

    - {% if task.startDate is null and task.endDate is null and task.warningDate is null %} -
    -
    {{"No dates specified"|trans}}
    - - {% else %} - {% if task.startDate is not null %} -
    {{ 'Start'|trans }}
    -
    {{ task.startDate|format_date('long') }}
    - {% endif %} - - {% if task.endDate is not null %} -
    {{ 'End'|trans }}
    -
    {{ task.endDate|format_date('long') }}
    - {% endif %} - - {% if task.warningDate is not null %} -
    {{ 'Warning'|trans }}
    -
    {{ task.warningDate|format_date('long') }}
    - {% endif %} - - {% endif %} - - - {% if timeline is not null %} -

    {{"Timeline"|trans}}

    - {{ timeline|raw }} - {% endif %} - - + + + +
    + + {% endblock %}