diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index 4a3346972..a59d83d79 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -5,6 +5,19 @@
{{ w.id }}
+
+ Etape actuelle: {{ w.currentStep.currentStep.text }}
+
+
+ -
+ Etape: {{ w.currentStep.text }},
+
+ transition pour arriver à cette étape : {{ w.transitionPrevious.text }},
+ par: {{ w.transitionPreviousBy.text }}, le {{ w.transitionPreviousAt.datetime }}
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
index 8fad9d864..bc053b3cf 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
@@ -47,7 +47,7 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
'relatedEntityClass' => $object->getRelatedEntityClass(),
'relatedEntityId' => $object->getRelatedEntityId(),
'workflow' => $this->metadataExtractor->buildArrayPresentationForWorkflow($workflow),
- 'current_step' => $this->metadataExtractor->buildArrayPresentationForPlace($object),
+ 'currentStep' => $this->normalizer->normalize($object->getCurrentStep(), $format, $context),
'steps' => $this->normalizer->normalize($object->getStepsChained(), $format, $context),
];
}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntitWorkflowStepNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
similarity index 61%
rename from src/Bundle/ChillMainBundle/Serializer/Normalizer/EntitWorkflowStepNormalizer.php
rename to src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
index ac6c31983..c231071d3 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntitWorkflowStepNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
@@ -17,7 +17,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-class EntitWorkflowStepNormalizer implements NormalizerAwareInterface, NormalizerInterface
+class EntityWorkflowStepNormalizer implements NormalizerAwareInterface, NormalizerInterface
{
use NormalizerAwareTrait;
@@ -38,27 +38,45 @@ class EntitWorkflowStepNormalizer implements NormalizerAwareInterface, Normalize
'id' => $object->getId(),
'comment' => $object->getComment(),
'currentStep' => $this->metadataExtractor->buildArrayPresentationForPlace($object->getEntityWorkflow(), $object),
- 'finalizeAfter' => $object->isFinalizeAfter(),
+ 'isFinal' => $object->isFinal(),
'isFreezed' => false,
'isFinalized' => false,
+ 'transitionPrevious' => null,
+ 'transitionAfter' => null,
'previousId' => null,
'nextId' => null,
- 'by' => null,
- 'at' => null,
+ 'transitionPreviousBy' => null,
+ 'transitionPreviousAt' => null,
];
if (null !== $previous = $object->getPrevious()) {
+ $data['transitionPrevious'] = $this->metadataExtractor
+ ->buildArrayPresentationForTransition($object->getEntityWorkflow(), $object->getPrevious()->getTransitionAfter());
$data['previousId'] = $previous->getId();
$data['isFreezed'] = $previous->isFreezeAfter();
- $data['isFinalized'] = $previous->isFreezeAfter();
- $data['by'] = $previous->getTransitionBy();
- $data['at'] = $previous->getTransitionAt();
+ $data['transitionPreviousBy'] = $this->normalizer->normalize(
+ $previous->getTransitionBy(),
+ $format,
+ $context
+ );
+ $data['transitionPreviousAt'] = $this->normalizer->normalize(
+ $previous->getTransitionAt(),
+ $format,
+ $context
+ );
}
if (null !== $next = $object->getNext()) {
$data['nextId'] = $next->getId();
}
+ if (null !== $object->getTransitionAfter()) {
+ $data['transitionAfter'] = $this->metadataExtractor->buildArrayPresentationForTransition(
+ $object->getEntityWorkflow(),
+ $object->getTransitionAfter()
+ );
+ }
+
return $data;
}
diff --git a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
index 1484f6618..60b65020e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
@@ -65,6 +65,26 @@ class MetadataExtractor
return ['name' => $step->getCurrentStep(), 'text' => $text];
}
+ public function buildArrayPresentationForTransition(EntityWorkflow $entityWorkflow, string $transitionName): array
+ {
+ $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+ $transitions = $workflow->getDefinition()->getTransitions();
+
+ foreach ($transitions as $transition) {
+ if ($transition->getName() === $transitionName) {
+ break;
+ }
+ }
+ $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
+
+ return [
+ 'name' => $transition->getName(),
+ 'text' => array_key_exists('label', $metadata) ?
+ $this->translatableStringHelper->localize($metadata['label']) : $transition->getName(),
+ 'isForward' => $metadata['isForward'] ?? null,
+ ];
+ }
+
public function buildArrayPresentationForWorkflow(WorkflowInterface $workflow): array
{
$metadata = $workflow->getMetadataStore()->getWorkflowMetadata();