diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig deleted file mode 100644 index e80e45e8c..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig +++ /dev/null @@ -1,256 +0,0 @@ -{% macro date_status(title, tasks, count, paginator, status, isSingleStatus, person, user) %} - {% if tasks|length > 0 %} -

{{ title|trans }}

- - - - {% 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 %} - {% 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 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) }} - {% 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 }}

- {% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %} - - {% endif %} -{% else %} - - {% 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 %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_listCourse.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_listCourse.html.twig deleted file mode 100644 index 16c907e4c..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_listCourse.html.twig +++ /dev/null @@ -1,107 +0,0 @@ -{% if tasks|length > 0 %} -

{{ title|trans }}

- - - - {% for task in tasks %} - - - - - {% endfor %} - -
-
- {{ task.title }} -
- -
- {{ 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 %} -
-
- {% endif %} - - 		- -
-{% endif %} - - diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_deleteCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_deleteCourseTask.html.twig deleted file mode 100644 index 49857188c..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/confirm_deleteCourseTask.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} - -{% set activeRouteKey = 'chill_task_task_list' %} -{% set course = task.course %} - -{% block title 'Remove task'|trans %} - -{% block content %} - - {{ include('@ChillMain/Util/confirmation_template.html.twig', - { - 'title' : 'Remove task'|trans, - 'confirm_question' : 'Are you sure you want to remove the task about accompanying period "%id%" ?'|trans({ '%id%' : course.id } ), - 'cancel_route' : 'chill_task_singletask_courselist', - 'cancel_parameters' : app.request.query.get('list_params', { } ), - 'form' : delete_form, - } ) }} - -{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig deleted file mode 100644 index 590740cf0..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -{# - * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, - * - * 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 . -#} -{% extends person is defined ? "@ChillPerson/Person/layout.html.twig" %} - -{% set activeRouteKey = 'chill_task_single_task_edit' %} -{% set person = task.person %} - -{% block title %} - {{ 'Edit task'|trans }} -{% endblock %} - -{% block personcontent %} - - {% include 'ChillTaskBundle:SingleTask:_edit.html.twig' %} - -{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig deleted file mode 100644 index 1805761ae..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} - -{% set activeRouteKey = 'chill_task_single_task_edit' %} -{% set course = task.course %} - -{% block title %} - {{ 'Edit task'|trans }} -{% endblock %} - -{% block content %} - - {% include 'ChillTaskBundle:SingleTask:_edit.html.twig' %} - -{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig deleted file mode 100644 index 083c0795c..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} - -{% set activeRouteKey = 'chill_task_single_task_new' %} -{# {% set person = task.person %} #} - -{% block title %} - {{ 'New task'|trans }} -{% endblock %} - -{% block content %} - {% include 'ChillTaskBundle:SingleTask:_new.html.twig' %} -{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig deleted file mode 100644 index 19bf70777..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig +++ /dev/null @@ -1,32 +0,0 @@ -{# - * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, - * - * 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 . -#} -{% extends "@ChillPerson/Person/layout.html.twig" %} - - -{% set activeRouteKey = 'chill_task_single_task_show' %} -{% set person = task.person %} - -{% block title %} - {{ 'Task'|trans }} -{% endblock %} - - -{% block personcontent %} - - {% include 'ChillTaskBundle:SingleTask:_show.html.twig' %} - -{% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig deleted file mode 100644 index 643617a55..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} - - -{% set activeRouteKey = 'chill_task_single_task_show' %} -{% set accompanyingCourse = task.course %} - -{% block title %} - {{ 'Task'|trans }} -{% endblock %} - - -{% block content %} - - {% include 'ChillTaskBundle:SingleTask:_show.html.twig' %} - -{% endblock %}