diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig index 4ec11a8e8..0a1942f6d 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig @@ -21,24 +21,28 @@ +{% set freezed = false %} +{% for step in entity_workflow.stepsChained %} + {% if loop.last %} + {% if step.previous is not null and step.previous.freezeAfter == true %} + {% set freezed = true %} + {% endif %} + {% endif %} +{% endfor %} + {% if display_action is defined and display_action == true %} {% endif %} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig index faa94e3a7..7fea14f21 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig @@ -4,26 +4,34 @@ {% for step in entity_workflow.stepsChained %}
+ {% if loop.first and step.next is null %}
{{ 'workflow.No transitions'|trans }}
- {% endif %} - -
-
- {% if not loop.first %} - + {% else %} + +
+ {% if step.previous is not null and step.previous.freezeAfter == true %} + {% endif %} - {{ step.currentStep }}
- {# -
- - Refusé +
+
+ {% if not loop.first %} + + {% endif %} + {{ step.currentStep }} +
+ {# +
+ + Refusé +
+ #}
- #} -
+ {% endif %} +
{% if step.next is not null %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig index 436394012..2bae33678 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig @@ -11,14 +11,18 @@ {% endmacro %} +{% macro popoverTitle(step) %} + {% if step.previous is not null and step.previous.freezeAfter == true %} + + {% endif %} + {{ step.currentStep }} +{% endmacro %} + {% macro breadcrumb(_ctx) %}