From 88907e7c959f0b71f3b9c6808d2c9cec3f77b058 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 20 Nov 2024 22:36:05 +0100 Subject: [PATCH] Groupe les outils --- config/packages/workflow.yaml | 4 ++ templates/project/show.html.twig | 73 ++++++++++++++++++++--- templates/task/show.html.twig | 125 +++++++++++++++++++++++++++++---------- 3 files changed, 161 insertions(+), 41 deletions(-) diff --git a/config/packages/workflow.yaml b/config/packages/workflow.yaml index 4bf092e..abd4d44 100644 --- a/config/packages/workflow.yaml +++ b/config/packages/workflow.yaml @@ -32,6 +32,7 @@ framework: to: !php/const App\Entity\Task::STATUS_DOING metadata: title: 'Commencer la tâche' + short: 'Commencer' route: 'app_task_start' lock: true unlock: false @@ -40,6 +41,7 @@ framework: to: !php/const App\Entity\Task::STATUS_DONE metadata: title: 'Terminer la tâche' + short: 'Terminer' route: 'app_task_finish' lock: false unlock: true @@ -48,6 +50,7 @@ framework: to: !php/const App\Entity\Task::STATUS_TODO metadata: title: 'Abandonner la tâche' + short: 'Abandonner' route: 'app_task_cancel' lock: false unlock: true @@ -56,6 +59,7 @@ framework: to: !php/const App\Entity\Task::STATUS_TODO metadata: title: 'Recommencer la tâche' + short: 'Recommencer' route: 'app_task_reset' lock: false unlock: false diff --git a/templates/project/show.html.twig b/templates/project/show.html.twig index 5447159..89554b5 100644 --- a/templates/project/show.html.twig +++ b/templates/project/show.html.twig @@ -16,22 +16,77 @@ {% block page_content %}
-
- Revenir aux projets +
diff --git a/templates/task/show.html.twig b/templates/task/show.html.twig index 3b6a7f8..757cb69 100644 --- a/templates/task/show.html.twig +++ b/templates/task/show.html.twig @@ -14,40 +14,101 @@ {% block page_content %}
-
- Revenir au projet - {% if is_granted('IS_AUTHENTICATED_FULLY') %} - {% if app.user is same as(task.createdBy) %} - Modifier la tâche - Supprimer la tâche - {% endif %} - {% for transition in workflow_transitions(task) %} - {% if not workflow_metadata(task, 'locking', task.status) or app.user is same as(task.lockedBy) %} - {{ workflow_metadata(task, 'title', transition) }} - {% endif %} - {% endfor %} - {% if workflow_metadata(task, 'locking', task.status) and app.user is same as(task.lockedBy) %} -
- + +
+ - + {% endif %} + {% endif %} +
+
+ {% if randomTask %} + + + + + + Piocher + + {% endif %}
- - {% endif %} - {% endif %} - {% if randomTask %} - Piocher une tâche - {% endif %}