Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

layout of the task list

Browse Source
This commit is contained in:
Julien Fastré 2018-11-21 12:26:11 +01:00
parent 176ca90e39
commit c7125f0866
5 changed files with 104 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -16,4 +16,5 @@ Branche de développement
======================== ========================
- Fix error on the "see more" link which was not showed - Fix error on the "see more" link which was not showed
- Layout of the task list

53
Resources/public/sass/_task-list.scss Normal file
View File

@ -0,0 +1,53 @@
table.chill-task-list {
.chill-task-list__row > div {
margin-bottom: 0.50rem;
}
.chill-task-list__row__title {
font-weight: bold;
font-size: 1.40rem;
}
.chill-task-list__row__type {
font-variant: small-caps;
display: inline;
padding: 0.05rem .15rem;
font-size: 0.88rem;
font-weight: light;
line-height: 1;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border: 1px solid var(--chill-dark-gray);
color: var(--chill-dark-gray);
}
.chill-task-list__row__person-for {
display: inline;
font-weight: bold;
}
.chill-task-list__row__assignee {
display: inline;
}
.chill_task-list__row__assignee_by {
display: inline;
font-weight: bold;
}
.chill-task-list__row__dates {
& > ul {
display: inline;
list-style: none;
& > li {
display: inline;
margin-right: 0.25rem;
}
}
}
}

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

@ -1,5 +1,6 @@
@import '../../../../main/Resources/public/sass/custom/config/colors'; @import '../../../../main/Resources/public/sass/custom/config/colors';
@import "_task-statuses.scss"; @import "_task-statuses.scss";
@import "_task-list.scss";
div#single_task_warningInterval { div#single_task_warningInterval {
display: flex; display: flex;

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

@ -60,6 +60,8 @@ Unassigned: Non assigné
Associated person: Personne associée Associated person: Personne associée
Default task: Tâche par défaut Default task: Tâche par défaut
Not assigned: Aucun utilisateur assigné Not assigned: Aucun utilisateur assigné
For person: Pour
By: Par
# transitions - default task definition # transitions - default task definition
'new': 'nouvelle' 'new': 'nouvelle'

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

@ -2,66 +2,61 @@
{% if tasks|length > 0 %} {% if tasks|length > 0 %}
<h3>{{ title|trans }}</h3> <h3>{{ title|trans }}</h3>
<table class="records_list"> <table class="records_list chill-task-list">
<thead>
<tr>
<th class="chill-red">{{ 'Title'|trans }}</th>
{% if person is null %}
<th>{{ 'Person'|trans }}</th>
{% endif %}
<th class="chill-orange">{{ 'Task status'|trans }}</th>
<th>{{ 'Dates'|trans }}</th>
</tr>
</thead>
<tbody> <tbody>
{% for task in tasks %} {% for task in tasks %}
<tr> <tr>
<td> <td class="chill-task-list__row">
<p><strong>{{ task.title }}</strong></p>
<dl>
<dt>{{ 'Task type'|trans }}</dt>
<dd>{{ task_workflow_metadata(task, 'definition.name')|trans }}</dd>
</dl>
</td>
{% if person is null %}
<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) %}
<span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
{% endfor %}
{% if task.assignee is not null %} <div>
<dl> <span class="chill-task-list__row__title">{{ task.title }}</span>
<dt>{{ 'Assignee'|trans }}</dt> </div>
<dd>{{ task.assignee.username }}</dd>
</dl> {% if person is null %}
<div>
<span class="chill-task-list__row__person-for">{{ 'For person'|trans }}&nbsp;:</span> <span class="chill-task-list__row__person"><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></span>
</div>
{% endif %} {% endif %}
<div>
<span class="chill-task-list__row__type">{{ task_workflow_metadata(task, 'definition.name')|trans }}</span>
</div>
</td> <div>
<td>
{% if task.startDate is null and task.warningDate is null and task.endDate is null %} {% for place in workflow_marked_places(task) %}
{{'No dates specified'|trans}} <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
{% else %} {% endfor %}
<ul class="record_actions_column"> {% if task.assignee is not null %}
{% if task.startDate is not null %} <div class="chill-task-list__row__assignee"><span class="chill_task-list__row__assignee_by">{{ 'By'|trans }}&nbsp;:</span> {{ task.assignee.username }}</div>
<li>
{{'Start'|trans}}&nbsp;: {{ task.startDate|localizeddate('medium', 'none') }}
</li>
{% endif %} {% endif %}
{% if task.warningDate is not null %} </div>
<li>
{{'Warning'|trans}}&nbsp;: {{ task.warningDate|localizeddate('medium', 'none') }}
</li> {% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
{% endif %} <div class="chill-task-list__row__dates">
{% if task.endDate is not null %} <ul class="record_actions_column">
<li> {% if task.startDate is not null %}
{{'End'|trans}}&nbsp;: {{ task.endDate|localizeddate('medium', 'none') }} <li title="{{ 'Start'|trans|escape('html_attr') }}">
</li> <i class="fa fa-play" ></i> {{ task.startDate|localizeddate('medium', 'none') }}
{% endif %} </li>
</ul> {% endif %}
{% if task.warningDate is not null %}
<li title="{{ 'Warning'|trans|escape('html_attr') }}">
<i class="fa fa-exclamation-triangle"></i> {{ task.warningDate|localizeddate('medium', 'none') }}
</li>
{% endif %}
{% if task.endDate is not null %}
<li title="{{ 'End'|trans|escape('html_attr') }}">
<i class="fa fa-hourglass-end"></i> {{ task.endDate|localizeddate('medium', 'none') }}
</li>
{% endif %}
</ul>
</div>
{% endif %} {% endif %}
</td> </td>
<td> <td>
<ul class="record_actions"> <ul class="record_actions">