diff --git a/CHANGELOG.md b/CHANGELOG.md index 399a0daed..35bc9a1c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,4 +16,5 @@ Branche de développement ======================== - Fix error on the "see more" link which was not showed +- Layout of the task list diff --git a/Resources/public/sass/_task-list.scss b/Resources/public/sass/_task-list.scss new file mode 100644 index 000000000..3350a4ace --- /dev/null +++ b/Resources/public/sass/_task-list.scss @@ -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; + + } + } + } +} + diff --git a/Resources/public/sass/_task.scss b/Resources/public/sass/_task.scss index 6f28b5164..4e668f3fe 100644 --- a/Resources/public/sass/_task.scss +++ b/Resources/public/sass/_task.scss @@ -1,5 +1,6 @@ @import '../../../../main/Resources/public/sass/custom/config/colors'; @import "_task-statuses.scss"; +@import "_task-list.scss"; div#single_task_warningInterval { display: flex; diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 239ee16ab..80d3065b1 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -60,6 +60,8 @@ Unassigned: Non assigné Associated person: Personne associée Default task: Tâche par défaut Not assigned: Aucun utilisateur assigné +For person: Pour +By: Par # transitions - default task definition 'new': 'nouvelle' diff --git a/Resources/views/SingleTask/_list.html.twig b/Resources/views/SingleTask/_list.html.twig index db2df8771..9f124d866 100644 --- a/Resources/views/SingleTask/_list.html.twig +++ b/Resources/views/SingleTask/_list.html.twig @@ -2,66 +2,61 @@ {% if tasks|length > 0 %}

{{ title|trans }}

- - - - - {% if person is null %} - - {% endif %} - - - - +
{{ 'Title'|trans }}{{ 'Person'|trans }}{{ 'Task status'|trans }}{{ 'Dates'|trans }}
{% for task in tasks %} - - {% if person is null %} - - {% endif %} - -
- -

{{ task.title }}

-
-
{{ 'Task type'|trans }}
-
{{ task_workflow_metadata(task, 'definition.name')|trans }}
-
-
{{ task.person}} - {% for place in workflow_marked_places(task) %} - {{ place|trans }} - {% endfor %} + - {% if task.assignee is not null %} -
-
{{ 'Assignee'|trans }}
-
{{ task.assignee.username }}
-
+
+ {{ task.title }} +
+ + {% if person is null %} +
+ {{ 'For person'|trans }} : {{ task.person}} +
{% endif %} + +
+ {{ task_workflow_metadata(task, 'definition.name')|trans }} +
+ + -
- {% if task.startDate is null and task.warningDate is null and task.endDate is null %} - {{'No dates specified'|trans}} - {% else %} -
    - {% if task.startDate is not null %} -
  • - {{'Start'|trans}} : {{ task.startDate|localizeddate('medium', 'none') }} -
  • +
    + + {% for place in workflow_marked_places(task) %} + {{ place|trans }} + {% endfor %} + {% if task.assignee is not null %} +
    {{ 'By'|trans }} : {{ task.assignee.username }}
    {% endif %} - {% if task.warningDate is not null %} -
  • - {{'Warning'|trans}} : {{ task.warningDate|localizeddate('medium', 'none') }} -
  • - {% endif %} - {% if task.endDate is not null %} -
  • - {{'End'|trans}} : {{ task.endDate|localizeddate('medium', 'none') }} -
  • - {% 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|localizeddate('medium', 'none') }} +
  • + {% endif %} + {% if task.warningDate is not null %} +
  • + {{ task.warningDate|localizeddate('medium', 'none') }} +
  • + {% endif %} + {% if task.endDate is not null %} +
  • + {{ task.endDate|localizeddate('medium', 'none') }} +
  • + {% endif %} +
+
{% endif %} +