Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-28 10:33:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Julien Fastré
2018-05-03 23:40:17 +02:00
parent 86f7188d4a c2a5ab2e69
commit 31fcfed2f5
7 changed files with 162 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/public/sass/_task.scss
View File

@@ -73,8 +73,10 @@ div#single_task_warningInterval {
position: absolute;
background-color: #f9f9f9;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
padding: 0.4em 0.7em;
z-index: 1;
a {
margin: 0.4em;
}
}
.bt-dropdown:hover .bt-dropdown-content {

10
Resources/translations/messages.fr.yml
View File

@@ -26,9 +26,9 @@ User: Utilisateur
'Task start date': 'Date de début'
'Task warning date': "Date d'avertissement"
'Task end date': "Date d'échéance"
'Start': 'Début: '
'Warning': 'Avertissement: '
'End': 'Échéance: '
'Start': 'Début'
'Warning': 'Avertissement'
'End': 'Échéance'
'Task type': 'Type'
'Task status': 'Statut'
'Edit the task': 'Éditer la tâche'
@@ -69,5 +69,5 @@ cancel: annuler
'The task has been successfully removed.': 'La tâche a bien été supprimée'
'This form contains errors': 'Ce formulaire contient des erreurs'
'The task has been updated': 'La tâche a été mise à jour'
'The transition is sucessfully applyed': 'La transition a bien été effectuée'
'The transition could not be applyed': "La transition n'a pas pu être appliquée"
'The transition is successfully applied': 'La transition a bien été effectuée'
'The transition could not be applied': "La transition n'a pas pu être appliquée"

43
Resources/views/SingleTask/_list.html.twig
View File

@@ -20,7 +20,7 @@
<td>{{ task.title }}</td>
<td>{{ task.type }}</td>
{% if person is null %}
<td>{{ task.person }}</td>
<td><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></td>
{% endif %}
<td>
{% for place in workflow_marked_places(task) %}
@@ -140,51 +140,58 @@
<h1>{{ 'Task list'|trans }}</h1>
{% if tasks_count == 0 %}
<p>Filter the tasks</p>
{{ form_start(form) }}
{{ form_row(form.user) }}
{{ form_row(form.status) }}
{{ form_end(form)}}
{% if view.tasks_count == 0 %}
<p class="chill-no-data-statement">{{ "There is no tasks."|trans }}</p>
{% if person is not null %}
<a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="sc-button bt-create">
{% if view.person is not null %}
<a href="{{ path('chill_task_single_task_new', {'person_id': view.person.id}) }}" class="sc-button bt-create">
{{ 'Add a new task' | trans }}
</a>
{% endif %}
<!-- Pour l'instant, il n'est pas encore possible d'ajouter une tache sans personne liée -->
<!-- {% if person is null %}
<!-- {% if view.person is null %}
<a href="{{ path('chill_task_single_task_new') }}" class="sc-button bt-create">
{{ 'Add a new task' | trans }}
</a>
{% endif %} -->
{% else %}
{% 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) }}
{% if view.single_task_ended_tasks is defined %}
{{ helper.date_status('Tasks with expired deadline', view.single_task_ended_tasks, view.single_task_ended_count, view.single_task_ended_paginator, 'ended', view.isSingleStatus, view.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) }}
{% if view.single_task_warning_tasks is defined %}
{{ helper.date_status('Tasks with warning deadline reached', view.single_task_warning_tasks, view.single_task_warning_count, view.single_task_warning_paginator, 'warning', view.isSingleStatus, view.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) }}
{% if view.single_task_current_tasks is defined %}
{{ helper.date_status('Current tasks', view.single_task_current_tasks, view.single_task_current_count, view.single_task_current_paginator, 'current', view.isSingleStatus, view.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) }}
{% if view.single_task_not_started_tasks is defined %}
{{ helper.date_status('Tasks not started', view.single_task_not_started_tasks, view.single_task_not_started_count, view.single_task_not_started_paginator, 'not_started', view.isSingleStatus, view.person) }}
{% endif %}
{% if single_task_closed_tasks is defined %}
{{ helper.date_status('Closed', single_task_closed_tasks, single_task_closed_count, single_task_closed_paginator, 'closed', isSingleStatus, person) }}
{% if view.single_task_closed_tasks is defined %}
{{ helper.date_status('Closed', view.single_task_closed_tasks, view.single_task_closed_count, view.single_task_closed_paginator, 'closed', view.isSingleStatus, view.person) }}
{% endif %}
{% if isSingleStatus == false %}
{% if view.isSingleStatus == false %}
<ul class="record_actions">
<li>
{% if person is not null %}
{% if view.person is not null %}
<a href="{{ path('chill_task_single_task_new', {'person_id': person.id}) }}" class="sc-button bt-create">
{{ 'Add a new task' | trans }}
</a>
{% endif %}
<!-- Pour l'instant, il n'est pas encore possible d'ajouter une tache sans personne liée -->
<!-- {% if person is null %}
<!-- {% if view.person is null %}
<a href="{{ path('chill_task_single_task_new') }}" class="sc-button bt-create">
{{ 'Add a new task' | trans }}
</a>

4
Resources/views/SingleTask/index.html.twig
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends layout %}
{% extends view.layout %}
{% set activeRouteKey = 'chill_task_single_task_new' %}
@@ -32,7 +32,7 @@
{# filter tasks #}
{% if person is not null %}
{% if view.person is not null %}
{% block personcontent %}
{% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
{% endblock %}