mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-08-27 18:13:48 +00:00
improve filter form
- hide form in some places ; - i18n - hide status filtering with a parameter (redundant)
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
Tasks: 'Tâches'
|
||||
'New task': 'Nouvelle tâche'
|
||||
'Add a new task': 'Ajouter une nouvelle tâche'
|
||||
Title: Titre
|
||||
@@ -22,6 +23,7 @@ User: Utilisateur
|
||||
'Tasks with expired deadline': "Tâches avec une date d'échéance dépassée"
|
||||
'Tasks with warning deadline reached': "Tâches avec une date d'avertissement atteinte"
|
||||
'Current tasks': 'Tâches en cours'
|
||||
'Closed tasks': Tâches terminées
|
||||
'Tasks not started': 'Tâches non commencées'
|
||||
'Task start date': 'Date de début'
|
||||
'Task warning date': "Date d'avertissement"
|
||||
@@ -50,7 +52,11 @@ Days: Jour(s)
|
||||
Weeks: Semaine(s)
|
||||
Months: Mois
|
||||
Year: Année(s)
|
||||
|
||||
Filter the tasks: Filtrer les tâches
|
||||
Filter: Filtrer
|
||||
Any user: Tous les utilisateurs
|
||||
Unassigned: Non assigné
|
||||
Associated person: Personne associée
|
||||
|
||||
|
||||
# transitions
|
||||
|
@@ -6,7 +6,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="chill-red">{{ 'Title'|trans }}</th>
|
||||
<th class="chill-green">{{ 'Task type'|trans }}</th>
|
||||
{# <th class="chill-green">{{ 'Task type'|trans }}</th> #}
|
||||
{% if person is null %}
|
||||
<th>{{ 'Person'|trans }}</th>
|
||||
{% endif %}
|
||||
@@ -18,7 +18,7 @@
|
||||
{% for task in tasks %}
|
||||
<tr>
|
||||
<td>{{ task.title }}</td>
|
||||
<td>{{ task.type }}</td>
|
||||
{# <td>{{ task.type }}</td> #}
|
||||
{% if person is null %}
|
||||
<td><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></td>
|
||||
{% endif %}
|
||||
@@ -141,16 +141,26 @@
|
||||
|
||||
<h1>{{ 'Task list'|trans }}</h1>
|
||||
|
||||
<p>Filter the tasks</p>
|
||||
{% if false == app.request.query.boolean('hide_form', false) %}
|
||||
<h3>{{ 'Filter the tasks'|trans }}</h3>
|
||||
{{ form_start(form) }}
|
||||
{{ form_row(form.user_id) }}
|
||||
|
||||
{% if form.status is defined %}
|
||||
{{ form_row(form.status) }}
|
||||
{% endif %}
|
||||
|
||||
{% if form.person_id is defined %}
|
||||
{{ form_row(form.person_id) }}
|
||||
{% endif %}
|
||||
<button type="submit">{{ 'Filter'|trans }}</button>
|
||||
|
||||
<ul class="record_actions">
|
||||
<li>
|
||||
<button type="submit" class="sc-button">{{ 'Filter'|trans }}</button>
|
||||
</li>
|
||||
</ul>
|
||||
{{ form_end(form)}}
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user