-
+
- + {{ m.download_button(document.object, document.title) }} + +
- + + {# + data-button is optional ! + OPTIONS: + 'changeIcon' string + 'changeClass' string + 'noText' boolean + + #}{% set button = { + 'changeIcon': 'fa-unlock', + } %} + + {# vue component #} + + +
+
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
index 97299675a..9d6175e12 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
@@ -6,61 +6,71 @@
{% block title %}
{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #}
-{% endblock %}
-
-
-{% block js %}
- {{ parent() }}
- {{ encore_entry_script_tags('mod_async_upload') }}
+ {{ 'Document %title%' | trans({ '%title%': document.title }) }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
+ {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
{% endblock %}
{% block content %}
-
-
+ {% if concerne is defined and concerne == true %}
+ {{ 'Concerne'|trans }}:
+ {% endif %}
+
+ {{ 'workflow.Document (n°%doc%)'|trans({'%doc%': document.id}) }}
+
+ {% if description is defined and description == true %}
+ {{ ' — ' ~ document.title }}
+ {% endif %}
+
+
+ {% if breadcrumb is defined and breadcrumb == true %}
+ {{ m.breadcrumb(_context) }}
+ {% endif %}
+{{ 'Document %title%' | trans({ '%title%': document.title }) }}
- --
-
- {{ 'Title'|trans }} -
- {{ document.title }} - +
- {{ 'Title'|trans }} +
- {{ document.title }} + {% if document.category is not null %}
- {{ 'Category'|trans }}
- {{ document.category.name|localize_translatable_string }} {% endif %} + +
- {{ 'Description' | trans }} +
-
+ {% if document.description is empty %}
+ {{ 'Any description'|trans }}
+ {% else %}
+
+ {{ document.description|chill_markdown_to_html }} +
+ {% endif %} +
+ - {{ 'Description' | trans }} -
-
- {% if document.description is empty %}
- {{ 'Any description'|trans }}
- {% else %}
-
- {{ document.description|chill_markdown_to_html }} -
- {% endif %} -
-
-
+
+{% endblock %}
+
+{% block block_post_menu %}
+
+{% endblock %}
- {{ block('title') }}
+ +-
+
-
-
- - - {{ 'Back to the list' | trans }} - - - -
- - {{ m.download_button(document.object, document.title) }} - - - {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %} -
- - - {{ 'Edit' | trans }} - - - {% endif %} - {% endblock %} +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('mod_async_upload') }} + {{ encore_entry_script_tags('mod_entity_workflow_pick') }} +{% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php new file mode 100644 index 000000000..a615ddda2 --- /dev/null +++ b/src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php @@ -0,0 +1,74 @@ +repository = $em->getRepository(AccompanyingCourseDocument::class); + } + + public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument + { + return $this->repository->find($entityWorkflow->getRelatedEntityId()); + } + + public function getRoleShow(EntityWorkflow $entityWorkflow): ?string + { + return null; + } + + public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string + { + return '@ChillDocStore/AccompanyingCourseDocument/_workflow.html.twig'; + } + + public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array + { + return [ + 'entity_workflow' => $entityWorkflow, + 'document' => $this->getRelatedEntity($entityWorkflow), + ]; + } + + public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string + { + return '@ChillDocStore/AccompanyingCourseDocument/_workflow.title.html.twig'; + } + + public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array + { + return $this->getTemplateData($entityWorkflow, $options); + } + + public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool + { + return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class; + } + + public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool + { + return true; + } +} diff --git a/src/Bundle/ChillDocStoreBundle/config/services.yaml b/src/Bundle/ChillDocStoreBundle/config/services.yaml index 2766cb1c7..6685d22eb 100644 --- a/src/Bundle/ChillDocStoreBundle/config/services.yaml +++ b/src/Bundle/ChillDocStoreBundle/config/services.yaml @@ -27,3 +27,8 @@ services: autoconfigure: true tags: - { name: chill.role } + + Chill\DocStoreBundle\Workflow\: + resource: './../Workflow/' + autoconfigure: true + autowire: true diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml index 947471531..3ee10721c 100644 --- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml @@ -9,6 +9,7 @@ Create new document: Créer un nouveau document New document for %name%: Nouveau document pour %name% Editing document for %name%: Modification d'un document pour %name% Edit Document: Modification d'un document +Update document: Modifier le document Existing document: Document existant No document to download: Aucun document à télécharger 'Choose a document category': Choisissez une catégorie de document diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php index 7a4e563bb..07daf65ea 100644 --- a/src/Bundle/ChillMainBundle/ChillMainBundle.php +++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php @@ -31,6 +31,7 @@ use Chill\MainBundle\Security\Resolver\ScopeResolverInterface; use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface; use Chill\MainBundle\Templating\Entity\CompilerPass as RenderEntityCompilerPass; use Chill\MainBundle\Templating\UI\NotificationCounterInterface; +use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; @@ -56,6 +57,8 @@ class ChillMainBundle extends Bundle ->addTag('chill_main.notification_handler'); $container->registerForAutoconfiguration(NotificationCounterInterface::class) ->addTag('chill.count_notification.user'); + $container->registerForAutoconfiguration(EntityWorkflowHandlerInterface::class) + ->addTag('chill_main.workflow_handler'); $container->addCompilerPass(new SearchableServicesCompilerPass()); $container->addCompilerPass(new ConfigConsistencyCompilerPass()); diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php new file mode 100644 index 000000000..dda787708 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php @@ -0,0 +1,118 @@ +entityManager = $entityManager; + $this->security = $security; + } + + /** + * @Route("/api/1.0/main/workflow/{id}/subscribe", methods={"POST"}) + */ + public function subscribe(EntityWorkflow $entityWorkflow, Request $request): Response + { + return $this->handleSubscription($entityWorkflow, $request, 'subscribe'); + } + + /** + * @Route("/api/1.0/main/workflow/{id}/unsubscribe", methods={"POST"}) + */ + public function unsubscribe(EntityWorkflow $entityWorkflow, Request $request): Response + { + return $this->handleSubscription($entityWorkflow, $request, 'unsubscribe'); + } + + private function handleSubscription(EntityWorkflow $entityWorkflow, Request $request, string $action): JsonResponse + { + if (!$this->security->isGranted('IS_AUTHENTICATED_REMEMBERED')) { + throw new AccessDeniedException(); + } + + if (!$request->query->has('subscribe')) { + throw new BadRequestHttpException('missing subscribe parameter'); + } + + $user = $this->security->getUser(); + + switch ($request->query->get('subscribe')) { + case 'final': + switch ($action) { + case 'subscribe': + $entityWorkflow->addSubscriberToFinal($user); + + break; + + case 'unsubscribe': + $entityWorkflow->removeSubscriberToFinal($user); + + break; + + default: + throw new LogicException(); + } + + break; + + case 'step': + switch ($action) { + case 'subscribe': + $entityWorkflow->addSubscriberToStep($user); + + break; + + case 'unsubscribe': + $entityWorkflow->removeSubscriberToStep($user); + + break; + + default: + throw new LogicException(); + } + + break; + + default: + throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"'); + } + + $this->entityManager->flush(); + + return new JsonResponse( + [ + 'step' => $entityWorkflow->isUserSubscribedToStep($user), + 'final' => $entityWorkflow->isUserSubscribedToFinal($user), + ], + JsonResponse::HTTP_OK, + [], + false + ); + } +} diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php new file mode 100644 index 000000000..33f1bd774 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php @@ -0,0 +1,257 @@ +entityWorkflowManager = $entityWorkflowManager; + $this->entityWorkflowRepository = $entityWorkflowRepository; + $this->validator = $validator; + $this->paginatorFactory = $paginatorFactory; + $this->registry = $registry; + $this->entityManager = $entityManager; + $this->translator = $translator; + } + + /** + * @Route("/{_locale}/main/workflow/create", name="chill_main_workflow_create") + */ + public function create(Request $request): Response + { + if (!$request->query->has('entityClass')) { + throw new BadRequestHttpException('Missing entityClass parameter'); + } + + if (!$request->query->has('entityId')) { + throw new BadRequestHttpException('missing entityId parameter'); + } + + if (!$request->query->has('workflow')) { + throw new BadRequestHttpException('missing workflow parameter'); + } + + $entityWorkflow = new EntityWorkflow(); + $entityWorkflow + ->setRelatedEntityClass($request->query->get('entityClass')) + ->setRelatedEntityId($request->query->getInt('entityId')) + ->setWorkflowName($request->query->get('workflow')); + + $errors = $this->validator->validate($entityWorkflow, null, ['creation']); + + if (count($errors) > 0) { + $msg = []; + + foreach ($errors as $error) { + /** @var \Symfony\Component\Validator\ConstraintViolationInterface $error */ + $msg[] = $error->getMessage(); + } + + return new Response(implode("\n", $msg), Response::HTTP_UNPROCESSABLE_ENTITY); + } + + $this->denyAccessUnlessGranted(EntityWorkflowVoter::CREATE, $entityWorkflow); + + $em = $this->getDoctrine()->getManager(); + $em->persist($entityWorkflow); + $em->flush(); + + return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]); + } + + /** + * @Route("/{_locale}/main/workflow/list/dest", name="chill_main_workflow_list_dest") + */ + public function myWorkflowsDest(Request $request): Response + { + $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); + + $total = $this->entityWorkflowRepository->countByDest($this->getUser()); + $paginator = $this->paginatorFactory->create($total); + + $workflows = $this->entityWorkflowRepository->findByDest( + $this->getUser(), + ['createdAt' => 'DESC'], + $paginator->getItemsPerPage(), + $paginator->getCurrentPageFirstItemNumber() + ); + + return $this->render( + '@ChillMain/Workflow/list.html.twig', + [ + 'workflows' => $this->buildHandler($workflows), + 'paginator' => $paginator, + 'step' => 'dest', + ] + ); + } + + /** + * @Route("/{_locale}/main/workflow/list/subscribed", name="chill_main_workflow_list_subscribed") + */ + public function myWorkflowsSubscribed(Request $request): Response + { + $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED'); + + $total = $this->entityWorkflowRepository->countBySubscriber($this->getUser()); + $paginator = $this->paginatorFactory->create($total); + + $workflows = $this->entityWorkflowRepository->findBySubscriber( + $this->getUser(), + ['createdAt' => 'DESC'], + $paginator->getItemsPerPage(), + $paginator->getCurrentPageFirstItemNumber() + ); + + return $this->render( + '@ChillMain/Workflow/list.html.twig', + [ + 'workflows' => $this->buildHandler($workflows), + 'paginator' => $paginator, + 'step' => 'subscribed', + ] + ); + } + + /** + * @Route("/{_locale}/main/workflow/{id}/show", name="chill_main_workflow_show") + */ + public function show(EntityWorkflow $entityWorkflow, Request $request): Response + { + $this->denyAccessUnlessGranted(EntityWorkflowVoter::SEE, $entityWorkflow); + + $handler = $this->entityWorkflowManager->getHandler($entityWorkflow); + $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName()); + + if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) { + // possible transition + $transitionForm = $this->createForm( + WorkflowStepType::class, + $entityWorkflow->getCurrentStep(), + ['transition' => true, 'entity_workflow' => $entityWorkflow] + ); + + $transitionForm->handleRequest($request); + + if ($transitionForm->isSubmitted() && $transitionForm->isValid()) { + if (!$workflow->can($entityWorkflow, $transition = $transitionForm['transition']->getData()->getName())) { + $blockers = $workflow->buildTransitionBlockerList($entityWorkflow, $transition); + $msgs = array_map(function (TransitionBlocker $tb) { + return $this->translator->trans( + $tb->getMessage(), + $tb->getParameters() + ); + }, iterator_to_array($blockers)); + + throw $this->createAccessDeniedException( + sprintf( + "not allowed to apply transition {$transition}: %s", + implode(', ', $msgs) + ) + ); + } + + $workflow->apply($entityWorkflow, $transition); + + foreach ($transitionForm['future_dest_users']->getData() as $user) { + $entityWorkflow->getCurrentStep()->addDestUser($user); + } + + $this->entityManager->flush(); + + return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]); + } + + if ($transitionForm->isSubmitted() && !$transitionForm->isValid()) { + $this->addFlash('error', $this->translator->trans('This form contains errors')); + } + } + + /* + $commentForm = $this->createForm(EntityWorkflowCommentType::class, $newComment = new EntityWorkflowComment()); + $commentForm->handleRequest($request); + + if ($commentForm->isSubmitted() && $commentForm->isValid()) { + $this->entityManager->persist($newComment); + $this->entityManager->flush(); + + $this->addFlash('success', $this->translator->trans('workflow.Comment added')); + + return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]); + } elseif ($commentForm->isSubmitted() && !$commentForm->isValid()) { + $this->addFlash('error', $this->translator->trans('This form contains errors')); + } + */ + + return $this->render( + '@ChillMain/Workflow/index.html.twig', + [ + 'handler_template' => $handler->getTemplate($entityWorkflow), + 'handler_template_title' => $handler->getTemplateTitle($entityWorkflow), + 'handler_template_data' => $handler->getTemplateData($entityWorkflow), + 'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null, + 'entity_workflow' => $entityWorkflow, + //'comment_form' => $commentForm->createView(), + ] + ); + } + + private function buildHandler(array $workflows): array + { + $lines = []; + + foreach ($workflows as $workflow) { + $handler = $this->entityWorkflowManager->getHandler($workflow); + $lines[] = [ + 'handler' => $handler, + 'entity_workflow' => $workflow, + ]; + } + + return $lines; + } +} diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php new file mode 100644 index 000000000..b56435f5d --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php @@ -0,0 +1,439 @@ +subscriberToFinal = new ArrayCollection(); + $this->subscriberToStep = new ArrayCollection(); + $this->comments = new ArrayCollection(); + $this->steps = new ArrayCollection(); + + $initialStep = new EntityWorkflowStep(); + $initialStep + ->setCurrentStep('initial'); + $this->addStep($initialStep); + } + + public function addComment(EntityWorkflowComment $comment): self + { + if (!$this->comments->contains($comment)) { + $this->comments[] = $comment; + $comment->setEntityWorkflow($this); + } + + return $this; + } + + /** + * @internal You should prepare a step and run a workflow transition instead of manually adding a step + */ + public function addStep(EntityWorkflowStep $step): self + { + if (!$this->steps->contains($step)) { + $this->steps[] = $step; + $step->setEntityWorkflow($this); + + if ($this->isFinalize()) { + $step->setFinalizeAfter(true); + } + } + + return $this; + } + + public function addSubscriberToFinal(User $user): self + { + if (!$this->subscriberToFinal->contains($user)) { + $this->subscriberToFinal[] = $user; + } + + return $this; + } + + public function addSubscriberToStep(User $user): self + { + if (!$this->subscriberToStep->contains($user)) { + $this->subscriberToStep[] = $user; + } + + return $this; + } + + public function getComments(): Collection + { + return $this->comments; + } + + public function getCurrentStep(): ?EntityWorkflowStep + { + $step = $this->steps->last(); + + if (false !== $step) { + return $step; + } + + return null; + } + + public function getCurrentStepCreatedAt(): ?DateTimeInterface + { + if (null !== $previous = $this->getPreviousStepIfAny()) { + return $previous->getTransitionAt(); + } + + return null; + } + + public function getCurrentStepCreatedBy(): ?User + { + if (null !== $previous = $this->getPreviousStepIfAny()) { + return $previous->getTransitionBy(); + } + + return null; + } + + public function getId(): ?int + { + return $this->id; + } + + public function getRelatedEntityClass(): string + { + return $this->relatedEntityClass; + } + + public function getRelatedEntityId(): int + { + return $this->relatedEntityId; + } + + /** + * Method used by MarkingStore. + * + * get a string representation of the step + */ + public function getStep(): string + { + return $this->getCurrentStep()->getCurrentStep(); + } + + public function getStepAfter(EntityWorkflowStep $step): ?EntityWorkflowStep + { + $iterator = $this->steps->getIterator(); + + if ($iterator instanceof Iterator) { + $iterator->rewind(); + + while ($iterator->valid()) { + $curStep = $iterator->current(); + + if ($curStep === $step) { + $iterator->next(); + + if ($iterator->valid()) { + return $iterator->current(); + } + + return null; + } + $iterator->next(); + } + + return null; + } + + throw new RuntimeException(); + } + + /** + * @return ArrayCollection|Collection + */ + public function getSteps() + { + return $this->steps; + } + + public function getStepsChained(): array + { + $iterator = $this->steps->getIterator(); + $previous = $next = $current = null; + $steps = []; + + $iterator->rewind(); + + while ($iterator->valid()) { + $previous = $current; + $steps[] = $current = $iterator->current(); + $current->setPrevious($previous); + + $iterator->next(); + + if ($iterator->valid()) { + $next = $iterator->current(); + } else { + $next = null; + } + + $current->setNext($next); + } + + return $steps; + } + + /** + * @return ArrayCollection|Collection + */ + public function getSubscriberToFinal() + { + return $this->subscriberToFinal; + } + + /** + * @return ArrayCollection|Collection + */ + public function getSubscriberToStep() + { + return $this->subscriberToStep; + } + + /** + * get the step which is transitionning. Should be called only by event which will + * concern the transition. + */ + public function getTransitionningStep(): ?EntityWorkflowStep + { + return $this->transitionningStep; + } + + public function getWorkflowName(): string + { + return $this->workflowName; + } + + public function isFinalize(): bool + { + $steps = $this->getStepsChained(); + + if (1 === count($steps)) { + // the initial step cannot be finalized + return false; + } + + /** @var EntityWorkflowStep $last */ + $last = end($steps); + + return $last->getPrevious()->isFinalizeAfter(); + } + + public function isFreeze(): bool + { + $steps = $this->getStepsChained(); + + if (1 === count($steps)) { + // the initial step cannot be finalized + return false; + } + + /** @var EntityWorkflowStep $last */ + $last = end($steps); + + return $last->getPrevious()->isFreezeAfter(); + } + + public function isUserSubscribedToFinal(User $user): bool + { + return $this->subscriberToFinal->contains($user); + } + + public function isUserSubscribedToStep(User $user): bool + { + return $this->subscriberToStep->contains($user); + } + + public function prepareStepBeforeTransition(EntityWorkflowStep $step): self + { + $this->transitionningStep = $step; + + return $this; + } + + public function removeComment(EntityWorkflowComment $comment): self + { + if ($this->comments->removeElement($comment)) { + $comment->setEntityWorkflow(null); + } + + return $this; + } + + public function removeStep(EntityWorkflowStep $step): self + { + if ($this->steps->removeElement($step)) { + $step->setEntityWorkflow(null); + } + + return $this; + } + + public function removeSubscriberToFinal(User $user): self + { + $this->subscriberToFinal->removeElement($user); + + return $this; + } + + public function removeSubscriberToStep(User $user): self + { + $this->subscriberToStep->removeElement($user); + + return $this; + } + + public function setRelatedEntityClass(string $relatedEntityClass): EntityWorkflow + { + $this->relatedEntityClass = $relatedEntityClass; + + return $this; + } + + public function setRelatedEntityId(int $relatedEntityId): EntityWorkflow + { + $this->relatedEntityId = $relatedEntityId; + + return $this; + } + + /** + * Method use by marking store. + * + * @return $this + */ + public function setStep(string $step): self + { + $newStep = new EntityWorkflowStep(); + $newStep->setCurrentStep($step); + + // copy the freeze + if ($this->getCurrentStep()->isFreezeAfter()) { + $newStep->setFreezeAfter(true); + } + + $this->addStep($newStep); + + return $this; + } + + public function setWorkflowName(string $workflowName): EntityWorkflow + { + $this->workflowName = $workflowName; + + return $this; + } + + private function getPreviousStepIfAny(): ?EntityWorkflowStep + { + if (1 === count($this->steps)) { + return null; + } + + return $this->steps->get($this->steps->count() - 2); + } +} diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php new file mode 100644 index 000000000..b041a5aa3 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php @@ -0,0 +1,77 @@ +comment; + } + + public function getEntityWorkflow(): ?EntityWorkflow + { + return $this->entityWorkflow; + } + + public function getId(): ?int + { + return $this->id; + } + + public function setComment(string $comment): self + { + $this->comment = $comment; + + return $this; + } + + /** + * @internal use @see{EntityWorkflow::addComment} + */ + public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): self + { + $this->entityWorkflow = $entityWorkflow; + + return $this; + } +} diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php new file mode 100644 index 000000000..6bd39ae0c --- /dev/null +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php @@ -0,0 +1,336 @@ +destUser = new ArrayCollection(); + } + + public function addDestEmail(string $email): self + { + if (!in_array($email, $this->destEmail, true)) { + $this->destEmail[] = $email; + } + + return $this; + } + + public function addDestUser(User $user): self + { + if (!$this->destUser->contains($user)) { + $this->destUser[] = $user; + } + + return $this; + } + + public function getComment(): string + { + return $this->comment; + } + + public function getCurrentStep(): ?string + { + return $this->currentStep; + } + + public function getDestEmail(): array + { + return $this->destEmail; + } + + /** + * @return ArrayCollection|Collection + */ + public function getDestUser() + { + return $this->destUser; + } + + public function getEntityWorkflow(): ?EntityWorkflow + { + return $this->entityWorkflow; + } + + public function getId(): ?int + { + return $this->id; + } + + public function getNext(): ?EntityWorkflowStep + { + return $this->next; + } + + public function getPrevious(): ?EntityWorkflowStep + { + return $this->previous; + } + + public function getTransitionAfter(): ?string + { + return $this->transitionAfter; + } + + public function getTransitionAt(): ?DateTimeImmutable + { + return $this->transitionAt; + } + + public function getTransitionBy(): ?User + { + return $this->transitionBy; + } + + public function getTransitionByEmail(): ?string + { + return $this->transitionByEmail; + } + + public function isFinalizeAfter(): bool + { + return $this->finalizeAfter; + } + + public function isFreezeAfter(): bool + { + return $this->freezeAfter; + } + + public function removeDestEmail(string $email): self + { + $this->destEmail = array_filter($this->destEmail, static function (string $existing) use ($email) { + return $email !== $existing; + }); + + return $this; + } + + public function removeDestUser(User $user): self + { + $this->destUser->removeElement($user); + + return $this; + } + + public function setComment(?string $comment): EntityWorkflowStep + { + $this->comment = (string) $comment; + + return $this; + } + + public function setCurrentStep(?string $currentStep): EntityWorkflowStep + { + $this->currentStep = $currentStep; + + return $this; + } + + public function setDestEmail(array $destEmail): EntityWorkflowStep + { + $this->destEmail = $destEmail; + + return $this; + } + + /** + * @internal use @see(EntityWorkflow::addStep} instead + */ + public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): EntityWorkflowStep + { + $this->entityWorkflow = $entityWorkflow; + + return $this; + } + + public function setFinalizeAfter(bool $finalizeAfter): EntityWorkflowStep + { + $this->finalizeAfter = $finalizeAfter; + + return $this; + } + + public function setFreezeAfter(bool $freezeAfter): EntityWorkflowStep + { + $this->freezeAfter = $freezeAfter; + + return $this; + } + + /** + * @return EntityWorkflowStep + * + * @internal + */ + public function setNext(?EntityWorkflowStep $next): self + { + $this->next = $next; + + return $this; + } + + /** + * @return EntityWorkflowStep + * + * @internal + */ + public function setPrevious(?EntityWorkflowStep $previous): self + { + $this->previous = $previous; + + return $this; + } + + public function setTransitionAfter(?string $transitionAfter): EntityWorkflowStep + { + $this->transitionAfter = $transitionAfter; + + return $this; + } + + public function setTransitionAt(?DateTimeImmutable $transitionAt): EntityWorkflowStep + { + $this->transitionAt = $transitionAt; + + return $this; + } + + public function setTransitionBy(?User $transitionBy): EntityWorkflowStep + { + $this->transitionBy = $transitionBy; + + return $this; + } + + public function setTransitionByEmail(?string $transitionByEmail): EntityWorkflowStep + { + $this->transitionByEmail = $transitionByEmail; + + return $this; + } + + /** + * @Assert\Callback + * + * @param mixed $payload + */ + public function validateOnCreation(ExecutionContextInterface $context, $payload): void + { + return; + + if ($this->isFinalizeAfter()) { + if (0 !== count($this->getDestUser())) { + $context->buildViolation('workflow.No dest users when the workflow is finalized') + ->atPath('finalizeAfter') + ->addViolation(); + } + } else { + if (0 === count($this->getDestUser())) { + $context->buildViolation('workflow.The next step must count at least one dest') + ->atPath('finalizeAfter') + ->addViolation(); + } + } + } +} diff --git a/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php b/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php new file mode 100644 index 000000000..c32e09dfd --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php @@ -0,0 +1,27 @@ +add('comment', ChillTextareaType::class, [ + 'required' => false, + ]); + } +} diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php index df670f891..ca87ea4f5 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php +++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php @@ -36,14 +36,20 @@ class UserToJsonTransformer implements DataTransformerInterface public function reverseTransform($value) { + $denormalized = json_decode($value, true); + if ($this->multiple) { + if (null === $denormalized) { + return []; + } + return array_map( function ($item) { return $this->denormalizeOne($item); }, - json_decode($value, true) + $denormalized ); } - return $this->denormalizeOne(json_decode($value, true)); + return $this->denormalizeOne($denormalized); } /** diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php new file mode 100644 index 000000000..6600e330a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php @@ -0,0 +1,111 @@ +entityWorkflowManager = $entityWorkflowManager; + $this->registry = $registry; + } + + public function buildForm(FormBuilderInterface $builder, array $options) + { + /** @var \Chill\MainBundle\Entity\Workflow\EntityWorkflow $entityWorkflow */ + $entityWorkflow = $options['entity_workflow']; + $handler = $this->entityWorkflowManager->getHandler($entityWorkflow); + + if (true === $options['transition']) { + if (null === $options['entity_workflow']) { + throw new LogicException('if transition is true, entity_workflow should be defined'); + } + + $transitions = $this->registry + ->get($options['entity_workflow'], $entityWorkflow->getWorkflowName()) + ->getEnabledTransitions($entityWorkflow); + + $choices = array_combine( + array_map(static function (Transition $transition) { return $transition->getName(); }, $transitions), + $transitions + ); + + $builder + ->add('transition', ChoiceType::class, [ + 'label' => 'workflow.Transition', + 'mapped' => false, + 'multiple' => false, + 'expanded' => true, + 'choices' => $choices, + 'choice_label' => static function (Transition $transition) { + return implode(', ', $transition->getTos()); + }, + ]) + ->add('future_dest_users', PickUserDynamicType::class, [ + 'label' => 'workflow.dest for next steps', + 'multiple' => true, + 'mapped' => false, + ]); + } + + if ( + $handler->supportsFreeze($entityWorkflow) + && !$entityWorkflow->isFreeze() + ) { + $builder + ->add('freezeAfter', CheckboxType::class, [ + 'required' => false, + 'label' => 'workflow.Freeze', + 'help' => 'workflow.The associated element will be freezed', + ]); + } + + $builder + ->add('finalizeAfter', CheckboxType::class, [ + 'required' => false, + 'label' => 'workflow.Finalize', + 'help' => 'workflow.The workflow will be finalized', + ]) + ->add('comment', ChillTextareaType::class, [ + 'required' => false, + 'label' => 'Comment', + ]); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefined('class', EntityWorkflowStep::class) + ->setRequired('transition') + ->setAllowedTypes('transition', 'bool') + ->setRequired('entity_workflow') + ->setAllowedTypes('entity_workflow', EntityWorkflow::class); + } +} diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php b/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php new file mode 100644 index 000000000..1692928dd --- /dev/null +++ b/src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php @@ -0,0 +1,36 @@ +add('current_step', WorkflowStepType::class, [ + 'transition' => true, + 'entity_workflow' => $options['entity_workflow'], + ]); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setRequired('entity_workflow') + ->setAllowedTypes('entity_workflow', EntityWorkflow::class); + } +} diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php new file mode 100644 index 000000000..cac5c9996 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php @@ -0,0 +1,137 @@ +repository = $entityManager->getRepository(EntityWorkflow::class); + } + + public function countByDest(User $user): int + { + $qb = $this->buildQueryByDest($user)->select('count(ew)'); + + return (int) $qb->getQuery()->getSingleScalarResult(); + } + + public function countBySubscriber(User $user): int + { + $qb = $this->buildQueryBySubscriber($user)->select('count(ew)'); + + return (int) $qb->getQuery()->getSingleScalarResult(); + } + + public function find($id): ?EntityWorkflow + { + return $this->repository->find($id); + } + + /** + * @return array|EntityWorkflow[] + */ + public function findAll(): array + { + return $this->repository->findAll(); + } + + /** + * @param null|mixed $limit + * @param null|mixed $offset + * + * @return array|EntityWorkflow[] + */ + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function findByDest(User $user, ?array $orderBy = null, $limit = null, $offset = null): array + { + $qb = $this->buildQueryByDest($user)->select('ew'); + + foreach ($orderBy as $key => $sort) { + $qb->addOrderBy('ew.' . $key, $sort); + } + + $qb->setMaxResults($limit)->setFirstResult($offset); + + return $qb->getQuery()->getResult(); + } + + public function findBySubscriber(User $user, ?array $orderBy = null, $limit = null, $offset = null): array + { + $qb = $this->buildQueryBySubscriber($user)->select('ew'); + + foreach ($orderBy as $key => $sort) { + $qb->addOrderBy('ew.' . $key, $sort); + } + + $qb->setMaxResults($limit)->setFirstResult($offset); + + return $qb->getQuery()->getResult(); + } + + public function findOneBy(array $criteria): ?EntityWorkflow + { + return $this->repository->findOneBy($criteria); + } + + public function getClassName(): string + { + return EntityWorkflow::class; + } + + private function buildQueryByDest(User $user): QueryBuilder + { + $qb = $this->repository->createQueryBuilder('ew'); + + $qb->join('ew.steps', 'step'); + + $qb->where( + $qb->expr()->andX( + $qb->expr()->isMemberOf(':user', 'step.destUser'), + $qb->expr()->isNull('step.transitionAfter') + ) + ); + + $qb->setParameter('user', $user); + + return $qb; + } + + private function buildQueryBySubscriber(User $user): QueryBuilder + { + $qb = $this->repository->createQueryBuilder('ew'); + + $qb->where( + $qb->expr()->orX( + $qb->expr()->isMemberOf(':user', 'ew.subscriberToStep'), + $qb->expr()->isMemberOf(':user', 'ew.subscriberToFinal'), + ) + ); + + $qb->setParameter('user', $user); + + return $qb; + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 4829f9634..39f8b3f8a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -1,5 +1,5 @@ // Access to Bootstrap variables and mixins -@import '~ChillMainAssets/module/bootstrap/shared'; +@import 'ChillMainAssets/module/bootstrap/shared'; // Chill variables @import './scss/chill_variables'; @@ -277,11 +277,17 @@ table.table-bordered { } } +/// meta-data +div.updatedBy, +div.metadata { + span.user, span.date { + text-decoration: underline dotted; + } +} div.metadata { font-size: smaller; color: $gray-600; span.user, span.date { - text-decoration: underline dotted; &:hover { color: $gray-700; } @@ -424,7 +430,63 @@ span.item-key { //text-decoration: dotted underline; } +/// Workflows +div.workflow { + section.step { + border: 1px solid $chill-l-gray; + padding: 1em 2em; + div.flex-table { + margin: 1.5em -2em; + } + } + div.to-decision, + div.decided { + font-variant: all-small-caps; + margin-left: 1em; + } + div.to-decision { + font-weight: 300; + } + div.decided { + font-weight: 600; + } + div.breadcrumb { + display: initial; + margin-bottom: 0; + padding-right: 0.5em; + background-color: tint-color($chill-yellow, 90%); + border: 1px solid $chill-yellow; + color: $primary; + border-radius: 1.5em; + font-size: 12pt; + font-weight: 500; + font-variant: small-caps; + span, a { + cursor: pointer; + text-decoration: none; + &:hover { + font-weight: 700; + } + } + } +} + +// Override bootstrap popover styles +div.popover { + box-shadow: 0 0 10px -5px $dark; + .popover-arrow {} + .popover-header {} + .popover-body {} + + // Specific worflow breadcrumb popover + &.workflow-transition { + .popover-header { + font-variant: small-caps; + } + } +} + // increase toast message z-index (above all modals) div.v-toast { z-index: 10000!important; -} \ No newline at end of file +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss index ad0584d74..1eb437a2a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss @@ -18,6 +18,7 @@ $chill-theme-buttons: ( "show": $chill-blue, "view": $chill-blue, "misc": $gray-300, + "download": $gray-300, "cancel": $gray-300, "choose": $gray-300, "notify": $gray-300, @@ -78,6 +79,7 @@ $chill-theme-buttons: ( &.btn-choose::before, &.btn-notify::before, &.btn-tpchild::before, + &.btn-download::before, &.btn-cancel::before { font: normal normal normal 14px/1 ForkAwesome; margin-right: 0.5em; @@ -105,6 +107,7 @@ $chill-theme-buttons: ( &.btn-unlink::before { content: "\f127"; } // fa-chain-broken &.btn-notify::before { content: "\f1d8"; } // fa-paper-plane &.btn-tpchild::before { content: "\f007"; } // fa-user + &.btn-download::before { content: "\f019"; } // fa-download } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index 20fe927a6..67160863d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -41,6 +41,15 @@ div.flex-table { margin-right: 5px; } } + + div.item-meta { + flex-grow: 1 !important; + flex-shrink: 1 !important; + width: unset !important; + display: flex; + flex-direction: column; + justify-content: center; + } } /* diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss index 93e9bd152..15f6deb3a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/notification.scss @@ -68,6 +68,7 @@ div.notification-show { } // Override bootstrap accordion +div#workflow-fold, div#notification-fold { .accordion-button { padding: 0; @@ -78,3 +79,14 @@ div#notification-fold { } } } + +// Counter +div.notification-counter { + span { + &:not(:first-child) { + &::before { + content: '/ '; + } + } + } +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss index 6100bc842..37d4f97c4 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss @@ -106,6 +106,8 @@ section.chill-entity { // used for comment-embeddable &.entity-comment-embeddable { width: 100%; + + /* already defined !! div.metadata { font-size: smaller; color: $gray-600; @@ -116,5 +118,6 @@ section.chill-entity { } } } + */ } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.js b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.js new file mode 100644 index 000000000..a89dd66f5 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.js @@ -0,0 +1,12 @@ +const buildLinkCreate = function(workflowName, relatedEntityClass, relatedEntityId) { + let params = new URLSearchParams(); + params.set('entityClass', relatedEntityClass); + params.set('entityId', relatedEntityId); + params.set('workflow', workflowName); + + return `/fr/main/workflow/create?`+params.toString(); +}; + +export { + buildLinkCreate, +}; diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js index 936587dec..a9d34e01d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js @@ -9,9 +9,10 @@ import Dropdown from 'bootstrap/js/src/dropdown'; import Modal from 'bootstrap/js/dist/modal'; import Collapse from 'bootstrap/js/src/collapse'; import Carousel from 'bootstrap/js/src/carousel'; +import Popover from 'bootstrap/js/src/popover'; // -// ACHeaderSlider is a small slider used in banner of AccompanyingCourse Section +// Carousel: ACHeaderSlider is a small slider used in banner of AccompanyingCourse Section // Initialize options, and show/hide controls in first/last slides // let ACHeaderSlider = document.querySelector('#ACHeaderSlider'); @@ -48,3 +49,14 @@ if (ACHeaderSlider) { } }) } + +// +// Popover: used in workflow breadcrumb, +// (expected in: contextual help, notification-box, workflow-box ) +// +const triggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')); +const popoverList = triggerList.map(function (el) { + return new Popover(el, { + html: true, + }); +}); \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/entity-workflow-pick/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/entity-workflow-pick/index.js new file mode 100644 index 000000000..d6d657719 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/module/entity-workflow-pick/index.js @@ -0,0 +1,49 @@ +import { createApp } from "vue"; +import PickWorkflowVue from 'ChillMainAssets/vuejs/_components/EntityWorkflow/PickWorkflow.vue'; +import ListWorkflowVue from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflow.vue'; + +// pick workflow +document.querySelectorAll('[data-pick-workflow]') + .forEach(function(el) { + const app = { + components: { + PickWorkflowVue + }, + template: + '
- + + + + +
- + diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig index 391158a00..5750a3a2c 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig @@ -2,7 +2,7 @@ @@ -58,7 +58,7 @@
-
@@ -102,7 +102,7 @@
- {% if fold_item is defined and fold_item != 'false' %} + {% if fold_item is defined and fold_item != false %}diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig new file mode 100644 index 000000000..b825e4d43 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig @@ -0,0 +1,120 @@ +{# TODO Adapt condition #} +{% if random(1) == 0 %} + + {# For a document #} +diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig index 690f2187d..ed4a05c34 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig @@ -40,8 +40,8 @@ 'template': handler.getTemplate(notification), 'template_data': handler.getTemplateData(notification) }, - 'action_button': 'false', - 'full_content': 'true' + 'action_button': false, + 'full_content': true } %}
{{ 'Document'|trans ~ 'target'|trans }}
+ +++ +{% else %} + + {# For an action #} ++ ++++Imprimé unique, parcours n°14635
+ Document PDF (6.2 Mo) ++ Description du document. Sed euismod nisi porta lorem mollis aliquam. Non curabitur gravida arcu ac tortor. +
+{{ 'Accompanying Course Action'|trans ~ 'target'|trans }}
+ + + +{% endif %} + +-
+
- + + +
- + {% set x = random(1) %} + + +
{{ 'Join a comment'|trans }}
+ +{{ form_start(comment_form) }} + +{{ form_widget(comment_form.comment) }} + +-
+
- + + +
{{ 'Decision'|trans }}
+ +{% if transition_form is not null %} + {{ form_start(transition_form) }} + + {{ form_row(transition_form.transition) }} + ++ {{ form_row(transition_form.finalizeAfter) }} ++ + {% if transition_form.freezeAfter is defined %} + {{ form_row(transition_form.freezeAfter) }} + {% endif %} + ++ {{ form_row(transition_form.future_dest_users) }} ++ +{{ form_label(transition_form.comment) }}
+ + {{ form_widget(transition_form.comment) }} + +-
+
- + + +
+ + {% if entity_workflow.currentStep.isFinalizeAfter %} ++ +{% endif %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig new file mode 100644 index 000000000..67037465b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_extension_list_workflow_for.html.twig @@ -0,0 +1,13 @@ +{% if is_granted('CHILL_MAIN_WORKFLOW_CREATE', blank_workflow) %} + {# vue component #} + +{% endif %} + +{% if entity_workflows|length > 0 %} + {# vue component #} + +{% endif %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig new file mode 100644 index 000000000..7a14e83fe --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_follow.html.twig @@ -0,0 +1,8 @@ +{{ 'workflow.This workflow is finalized'|trans }}
+ {% else %} +{{ 'workflow.You are not allowed to apply a transition on this workflow'|trans }}
+{{ 'workflow.Only those users are allowed'|trans }}:
+ +-
+ {% for u in entity_workflow.currentStep.destUser -%}
+
- {{ u|chill_entity_render_box }} + {%- endfor %} +
{{ 'Follow workflow'|trans }}
+ +{# vue component #} + diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig new file mode 100644 index 000000000..faa94e3a7 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig @@ -0,0 +1,59 @@ +{{ 'Workflow history'|trans }}
+ ++ {% for step in entity_workflow.stepsChained %} +diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig new file mode 100644 index 000000000..c20f51193 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig @@ -0,0 +1,12 @@ +++ + {% endfor %} + ++ {% if loop.first and step.next is null %} ++ {% if step.next is not null %} ++ {{ 'workflow.No transitions'|trans }} ++ {% endif %} + ++++ {% if not loop.first %} + + {% endif %} + {{ step.currentStep }} ++ {# ++ + Refusé ++ #} +++ {% endif %} + {% if step.comment is not empty %} ++ {% if step.transitionBy is not null %} +++ {{ step.transitionBy|chill_entity_render_box }} ++ {% endif %} ++ {{ step.transitionAt|format_datetime('long', 'medium') }} +++++ + {{ step.next.currentStep }} ++++ {% endif %} ++ {{ step.comment|chill_markdown_to_html }} +
++diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig new file mode 100644 index 000000000..588e2de0b --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/index.html.twig @@ -0,0 +1,56 @@ +{% extends '@ChillMain/layout.html.twig' %} + +{% block title %} + {{ 'Workflow'|trans }} +{% endblock %} + +{% block js %} + {{ parent() }} + + {{ encore_entry_script_tags('mod_async_upload') }} + {{ encore_entry_script_tags('mod_pickentity_type') }} + {{ encore_entry_script_tags('mod_entity_workflow_subscribe') }} + {{ encore_entry_script_tags('page_workflow_show') }} + {{ encore_entry_script_tags('mod_wopi_link') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('mod_pickentity_type') }} + {{ encore_entry_link_tags('mod_entity_workflow_subscribe') }} + {{ encore_entry_link_tags('page_workflow_show') }} + {{ encore_entry_link_tags('mod_wopi_link') }} +{% endblock %} + +{% block content %} ++ {{ 'workflow_'|trans }} +
+ {% include handler.templateTitle(l.entity_workflow) with handler.templateTitleData(entity_workflow)|merge({ + 'description': true, + 'breadcrumb': true, + 'add_classes': 'ms-3 h3' + }) %} + + +++{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig new file mode 100644 index 000000000..6da68e390 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig @@ -0,0 +1,97 @@ +{% extends 'ChillMainBundle::layout.html.twig' %} + +{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %} + +{% block title %} + {{ 'workflow.My workflows'|trans }} +{% endblock %} + +{% block content %} +{{ block('title') }}
+ + {# handler_template: + - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig + - src/Bundle/ChillPersonBundle/Resources/views/Workflow/_accompanying_period_work.html.twig + - src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig + #} ++ + ++ {% include handler_template_title with handler_template_data|merge({'breadcrumb': true }) %} ++ {% include handler_template with handler_template_data|merge({'display_action': true }) %} +{% include '@ChillMain/Workflow/_follow.html.twig' %} +{% include '@ChillMain/Workflow/_decision.html.twig' %} {# +{% include '@ChillMain/Workflow/_comment.html.twig' %} #} +{% include '@ChillMain/Workflow/_history.html.twig' %} + + {# useful ? + + #} ++ ++{% endblock %} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig new file mode 100644 index 000000000..436394012 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig @@ -0,0 +1,45 @@ +{% macro popoverContent(step) %} +{{ block('title') }}
+ + + + {% if workflows|length == 0 %} +{{ 'workflow.No workflow'|trans }}
+ {% else %} ++ {% for l in workflows %} ++ {% endif %} +++ {% endfor %} ++ + {{ macro.breadcrumb(l) }} + +++ +++ {% include l.handler.template(l.entity_workflow) with l.handler.templateData(l.entity_workflow)|merge({ + 'display_action': false + }) %} ++++ ++++ {% if l.entity_workflow.isUserSubscribedToStep(app.user) %} + + {{ 'workflow.you subscribed to all steps'|trans }} + {% endif %} +
++ {% if l.entity_workflow.isUserSubscribedToFinal(app.user) %} + + {{ 'workflow.you subscribed to final step'|trans }} + {% endif %} +
+++-
+
- + + {{ 'Show'|trans }} + + +
-
+
- + {{ 'By'|trans ~ ' : ' }} + {{ step.transitionBy|chill_entity_render_box }} + +
- + {{ 'Le'|trans ~ ' : ' }} + {{ step.transitionAt|format_datetime('short', 'short') }} + +
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
new file mode 100644
index 000000000..4a3346972
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
new file mode 100644
index 000000000..3a39c0eff
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
@@ -0,0 +1,50 @@
+
+
+
+
+ Workflow associés
+
+ {{ w.id }}
+
+-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index b806c4b3e..1a577274b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -15,7 +15,7 @@
+
@@ -38,7 +38,16 @@
*/
export default {
name: 'Modal',
- props: ['modalDialogClass'],
+ props: {
+ modalDialogClass: {
+ type: String,
+ required: false
+ },
+ hideFooter: {
+ type: Boolean,
+ required: false
+ }
+ },
emits: ['close']
}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
new file mode 100644
index 000000000..75fb18de5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+ {{ $t('Update_document') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
index 6efca3256..bf487b089 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
@@ -3,7 +3,7 @@
{% block navigation_search_bar %}{% endblock %}
{% block navigation_section_menu %}
{{ chill_menu('admin_section', {
- 'layout': '@ChillMain/Menu/adminSection.html.twig',
+ 'layout': '@ChillMain/Menu/admin.html.twig',
}) }}
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
index 8adc9c17f..e874819c0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
@@ -23,23 +23,23 @@
{% if options['metadata'] %}
{% endif %}
-{{ closing_box|raw }}
+{{ closing_box|raw }}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
index 56b2f31ee..51be6c2c3 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/verticalMenu.html.twig
@@ -21,13 +21,13 @@
layout ../layoutWithVerticalMenu.html.twig.
#}
-
+
+
+
+ ![]()
+
+ {{ this.title }}
+
+
+
+ {{ $t('save_and_quit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('invalid_title') }}
+ + +{{ $t('invalid_message') }}
+
+
+ -
-
- {% if c.full_content is defined and c.full_content == 'true' %}
+ {% if c.full_content is defined and c.full_content == true %}
{{ c.notification.message|chill_markdown_to_html }}
{% else %}
{{ c.notification.message|u.truncate(250, '…', false)|chill_markdown_to_html }}
@@ -66,7 +66,7 @@
{% endif %}