{% if step.next is not null %}
+ {% set transition = chill_workflow_transition_by_string(step.entityWorkflow, step.transitionAfter) %}
+ {% set transition_labels = workflow_metadata(step.entityWorkflow, 'label', transition) %}
+ {% set transition_label = transition_labels is null ? step.transitionAfter : transition_labels|localize_translatable_string %}
+ {% set forward = workflow_metadata(step.entityWorkflow, 'isForward', transition) %}
{% if step.transitionBy is not null %}
@@ -40,7 +52,12 @@
- {{ step.next.currentStep }}
+ {% if forward %}
+
+ {% else %}
+
+ {% endif %}
+ {{ transition_label }}
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..6fb3fe2ff 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
@@ -1,41 +1,62 @@
{% macro popoverContent(step) %}
- -
- {{ 'By'|trans ~ ' : ' }}
- {{ step.transitionBy|chill_entity_render_box }}
-
- -
- {{ 'Le'|trans ~ ' : ' }}
- {{ step.transitionAt|format_datetime('short', 'short') }}
-
+ {% if step.previous is not null %}
+ -
+ {{ 'By'|trans ~ ' : ' }}
+ {{ step.previous.transitionBy|chill_entity_render_box }}
+
+ -
+ {{ 'Le'|trans ~ ' : ' }}
+ {{ step.previous.transitionAt|format_datetime('short', 'short') }}
+
+ {% else %}
+ -
+ {{ 'workflow.Created by'|trans ~ ' : ' }}
+ {{ step.entityWorkflow.createdBy|chill_entity_render_box }}
+
+ -
+ {{ 'Le'|trans ~ ' : ' }}
+ {{ step.entityWorkflow.createdAt|format_datetime('short', 'short') }}
+
+ {% endif %}
{% endmacro %}
+{% macro popoverTitle(step) %}
+ {% if step.previous is not null and step.previous.freezeAfter == true %}
+
+ {% endif %}
+ {% if step.previous is not null %}
+ {% set transition = chill_workflow_transition_by_string(step.entityWorkflow, step.previous.transitionAfter) %}
+ {% set labels = workflow_metadata(step.entityWorkflow, 'label', transition) %}
+ {% set label = labels is null ? step.previous.transitionAfter : labels|localize_translatable_string %}
+ {{ label }}
+ {% endif %}
+{% endmacro %}
+
{% macro breadcrumb(_ctx) %}
{% for step in _ctx.entity_workflow.stepsChained %}
- {% if step.previous is null %}
- {#
- {% set popContent = "Point de départ du workflow" %}
- {{ dump(step) }}
- #}
- {% set popContent = _self.popoverContent(step) %}
- {% else %}
- {% set popContent = _self.popoverContent(step.previous) %}
- {% endif %}
+ {% set labels = workflow_metadata(_ctx.entity_workflow, 'label', step.currentStep) %}
+ {% set label = labels is null ? step.currentStep : labels|localize_translatable_string %}
+ {% set popTitle = _self.popoverTitle(step) %}
+ {% set popContent = _self.popoverContent(step) %}
{% if step.currentStep == 'initial' %}
{% endif %}
- {{ step.currentStep }}
+ {% if step.previous is not null and step.previous.freezeAfter == true %}
+
+ {% endif %}
+ {{ label }}
{% if not loop.last %}
→
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index ef48414e0..c11422a1b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -60,26 +60,26 @@
{% endif %}
{% block content %}
-
-
{{ 'Search'|trans }}
-
-
-
-
-
- {{ chill_widget('homepage', {} ) }}
+
+
{{ 'Search'|trans }}
+
+
+
+
+ {# DISABLED {{ chill_widget('homepage', {} ) }} #}
+
+ {% include '@ChillMain/Homepage/index.html.twig' %}
+
{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
new file mode 100644
index 000000000..da1d348c7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Model/Counter.php
@@ -0,0 +1,41 @@
+counter = $counter;
+ }
+
+ public function getCounter(): ?int
+ {
+ return $this->counter;
+ }
+
+ public function jsonSerialize()
+ {
+ return ['count' => $this->counter];
+ }
+
+ public function setCounter(?int $counter): Counter
+ {
+ $this->counter = $counter;
+
+ return $this;
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
new file mode 100644
index 000000000..bc053b3cf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
@@ -0,0 +1,59 @@
+metadataExtractor = $metadataExtractor;
+ $this->registry = $registry;
+ }
+
+ /**
+ * @param EntityWorkflow $object
+ *
+ * @return array
+ */
+ public function normalize($object, ?string $format = null, array $context = [])
+ {
+ $workflow = $this->registry->get($object, $object->getWorkflowName());
+
+ return [
+ 'type' => 'entity_workflow',
+ 'id' => $object->getId(),
+ 'relatedEntityClass' => $object->getRelatedEntityClass(),
+ 'relatedEntityId' => $object->getRelatedEntityId(),
+ 'workflow' => $this->metadataExtractor->buildArrayPresentationForWorkflow($workflow),
+ 'currentStep' => $this->normalizer->normalize($object->getCurrentStep(), $format, $context),
+ 'steps' => $this->normalizer->normalize($object->getStepsChained(), $format, $context),
+ ];
+ }
+
+ public function supportsNormalization($data, ?string $format = null): bool
+ {
+ return $data instanceof EntityWorkflow && 'json' === $format;
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
new file mode 100644
index 000000000..c231071d3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
@@ -0,0 +1,87 @@
+metadataExtractor = $metadataExtractor;
+ }
+
+ /**
+ * @param EntityWorkflowStep $object
+ */
+ public function normalize($object, ?string $format = null, array $context = []): array
+ {
+ $data = [
+ 'type' => 'entity_workflow_step',
+ 'id' => $object->getId(),
+ 'comment' => $object->getComment(),
+ 'currentStep' => $this->metadataExtractor->buildArrayPresentationForPlace($object->getEntityWorkflow(), $object),
+ 'isFinal' => $object->isFinal(),
+ 'isFreezed' => false,
+ 'isFinalized' => false,
+ 'transitionPrevious' => null,
+ 'transitionAfter' => null,
+ 'previousId' => null,
+ 'nextId' => 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['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;
+ }
+
+ public function supportsNormalization($data, ?string $format = null): bool
+ {
+ return $data instanceof EntityWorkflowStep && 'json' === $format;
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
new file mode 100644
index 000000000..08deac745
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
@@ -0,0 +1,71 @@
+notificationHandlerManager = $notificationHandlerManager;
+ $this->entityManager = $entityManager;
+ $this->security = $security;
+ }
+
+ /**
+ * @param Notification $object
+ *
+ * @return array|ArrayObject|bool|float|int|string|void|null
+ */
+ public function normalize($object, ?string $format = null, array $context = [])
+ {
+ dump($object);
+ $entity = $this->entityManager
+ ->getRepository($object->getRelatedEntityClass())
+ ->find($object->getRelatedEntityId());
+
+ return [
+ 'type' => 'notification',
+ 'id' => $object->getId(),
+ 'addressees' => $this->normalizer->normalize($object->getAddressees(), $format, $context),
+ 'date' => $this->normalizer->normalize($object->getDate(), $format, $context),
+ 'isRead' => $object->isReadBy($this->security->getUser()),
+ 'message' => $object->getMessage(),
+ 'relatedEntityClass' => $object->getRelatedEntityClass(),
+ 'relatedEntityId' => $object->getRelatedEntityId(),
+ 'sender' => $this->normalizer->normalize($object->getSender(), $format, $context),
+ 'title' => $object->getTitle(),
+ 'entity' => null !== $entity ? $this->normalizer->normalize($entity, $format, $context) : null,
+ ];
+ }
+
+ public function supportsNormalization($data, ?string $format = null)
+ {
+ return $data instanceof Notification && 'json' === $format;
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
index fba36924a..1fc56e898 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
@@ -21,6 +21,7 @@ use Symfony\Component\Security\Core\Security;
use Symfony\Component\Workflow\Event\Event;
use Symfony\Component\Workflow\Event\GuardEvent;
use Symfony\Component\Workflow\TransitionBlocker;
+use function array_key_exists;
class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterface
{
@@ -44,6 +45,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
{
return [
'workflow.transition' => 'onTransition',
+ 'workflow.completed' => 'onCompleted',
'workflow.guard' => [
['guardEntityWorkflow', 0],
],
@@ -59,7 +61,7 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
/** @var EntityWorkflow $entityWorkflow */
$entityWorkflow = $event->getSubject();
- if ($entityWorkflow->isFinalize()) {
+ if ($entityWorkflow->isFinal()) {
$event->addTransitionBlocker(
new TransitionBlocker(
'workflow.The workflow is finalized',
@@ -88,7 +90,25 @@ class EntityWorkflowTransitionEventSubscriber implements EventSubscriberInterfac
}
}
- public function onTransition(Event $event)
+ public function onCompleted(Event $event): void
+ {
+ if (!$event->getSubject() instanceof EntityWorkflow) {
+ return;
+ }
+
+ /** @var EntityWorkflow $entityWorkflow */
+ $entityWorkflow = $event->getSubject();
+ $step = $entityWorkflow->getCurrentStep();
+
+ $placeMetadata = $event->getWorkflow()->getMetadataStore()
+ ->getPlaceMetadata($step->getCurrentStep());
+
+ if (array_key_exists('isFinal', $placeMetadata) && true === $placeMetadata['isFinal']) {
+ $step->setIsFinal(true);
+ }
+ }
+
+ public function onTransition(Event $event): void
{
if (!$event->getSubject() instanceof EntityWorkflow) {
return;
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
index fd251bca6..c46899e52 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php
@@ -61,7 +61,7 @@ class NotificationOnTransition implements EventSubscriberInterface
$dests = array_merge(
$entityWorkflow->getSubscriberToStep()->toArray(),
- $entityWorkflow->isFinalize() ? $entityWorkflow->getSubscriberToFinal()->toArray() : [],
+ $entityWorkflow->isFinal() ? $entityWorkflow->getSubscriberToFinal()->toArray() : [],
$entityWorkflow->getCurrentStep()->getDestUser()->toArray()
);
diff --git a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
index 1f5af77c5..60b65020e 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Helper/MetadataExtractor.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Workflow\Helper;
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Symfony\Component\Workflow\Registry;
use Symfony\Component\Workflow\WorkflowInterface;
@@ -51,16 +52,37 @@ class MetadataExtractor
return $workflowsList;
}
- public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow): array
+ public function buildArrayPresentationForPlace(EntityWorkflow $entityWorkflow, ?EntityWorkflowStep $step = null): array
{
$workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+ $step ??= $entityWorkflow->getCurrentStep();
- $markingMetadata = $workflow->getMetadataStore()->getPlaceMetadata($entityWorkflow->getCurrentStep()->getCurrentStep());
+ $markingMetadata = $workflow->getMetadataStore()->getPlaceMetadata($step->getCurrentStep());
$text = array_key_exists('label', $markingMetadata) ?
- $this->translatableStringHelper->localize($markingMetadata['label']) : $entityWorkflow->getCurrentStep()->getCurrentStep();
+ $this->translatableStringHelper->localize($markingMetadata['label']) : $step->getCurrentStep();
- return ['name' => $entityWorkflow->getCurrentStep()->getCurrentStep(), 'text' => $text];
+ 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
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php
index 09dce0c6e..839c461b3 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtension.php
@@ -24,6 +24,10 @@ class WorkflowTwigExtension extends AbstractExtension
[WorkflowTwigExtensionRuntime::class, 'listWorkflows'],
['needs_environment' => true, 'is_safe' => ['html']]
),
+ new TwigFunction(
+ 'chill_workflow_transition_by_string',
+ [WorkflowTwigExtensionRuntime::class, 'getTransitionByString']
+ ),
];
}
}
diff --git a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
index 0f034267f..edb1aa7b7 100644
--- a/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
+++ b/src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager;
use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\Transition;
use Twig\Environment;
use Twig\Extension\RuntimeExtensionInterface;
@@ -46,6 +47,20 @@ class WorkflowTwigExtensionRuntime implements RuntimeExtensionInterface
$this->normalizer = $normalizer;
}
+ public function getTransitionByString(EntityWorkflow $entityWorkflow, string $key): ?Transition
+ {
+ $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+ $transitions = $workflow->getDefinition()->getTransitions();
+
+ foreach ($transitions as $transition) {
+ if ($transition->getName() === $key) {
+ return $transition;
+ }
+ }
+
+ return null;
+ }
+
public function listWorkflows(Environment $environment, string $relatedEntityClass, int $relatedEntityId, array $options = []): string
{
$blankEntityWorkflow = new EntityWorkflow();
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 113d326c1..93f71dd94 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -53,6 +53,7 @@ module.exports = function(encore, entries)
encore.addEntry('page_login', __dirname + '/Resources/public/page/login/index.js');
encore.addEntry('page_location', __dirname + '/Resources/public/page/location/index.js');
encore.addEntry('page_workflow_show', __dirname + '/Resources/public/page/workflow-show/index.js');
+ encore.addEntry('page_homepage_widget', __dirname + '/Resources/public/page/homepage_widget/index.js');
buildCKEditor(encore);
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php b/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php
new file mode 100644
index 000000000..8a61e5f72
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220128211748.php
@@ -0,0 +1,33 @@
+addSql('ALTER TABLE chill_main_workflow_entity_step RENAME COLUMN isFinal TO finalizeAfter;');
+ }
+
+ public function getDescription(): string
+ {
+ return 'rename workflow entity step from finalizeAfter to isFinal';
+ }
+
+ public function up(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_main_workflow_entity_step RENAME COLUMN finalizeAfter TO isFinal;');
+ }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e8bd44dc5..605cafe8e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -370,9 +370,11 @@ Workflow history: Historique de la décision
workflow:
Created by: Créé par
- Transition: Prochaine étape
+ Transition to apply: Ma décision
dest for next steps: Utilisateurs qui valideront la prochaine étape
Freeze: Geler
+ Freezed: Gelé
+ freezed document: Le document est gelé
The associated element will be freezed: L'élément associé sera gelé et ne pourra plus être modifié après cette décision.
Finalize: Étape finale
The workflow will be finalized: Le suivi est clôturé lors de cette décision.
@@ -386,8 +388,8 @@ workflow:
Evaluation (n°%eval%): "Évaluation (n°%eval%)"
Document (n°%doc%): "Document (n°%doc%)"
Work (n°%w%): "Action d'accompagnement (n°%w%)"
- subscribed: Souscrit
- dest: Destinataire de l'étape finale
+ subscribed: Workflows suivis
+ dest: Workflows en attente d'action
you subscribed to all steps: Vous recevrez une notification à chaque étape
you subscribed to final step: Vous recevrez une notification à l'étape finale
@@ -396,6 +398,7 @@ Subscribe all steps: Recevoir une notification à chaque étape
notification:
Notification: Notification
+ Notifications: Notifications
My own notifications: Mes notifications
Notify: Envoyer une notification
Send: Envoyer
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index 3b051a59d..c66488869 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -13,7 +13,9 @@ namespace Chill\PersonBundle\Controller;
use Chill\MainBundle\CRUD\Controller\ApiController;
use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\MainBundle\Serializer\Model\Counter;
use Chill\PersonBundle\AccompanyingPeriod\Suggestion\ReferralsSuggestionInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -23,8 +25,11 @@ use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
use Chill\PersonBundle\Repository\AccompanyingPeriodACLAwareRepository;
+use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateInterval;
+use DateTimeImmutable;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
@@ -32,13 +37,14 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Serializer\Exception\RuntimeException;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ConstraintViolationListInterface;
+
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Component\Workflow\Registry;
-
use function array_values;
use function count;
@@ -46,6 +52,8 @@ final class AccompanyingCourseApiController extends ApiController
{
private AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository;
+ private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+
private EventDispatcherInterface $eventDispatcher;
private ReferralsSuggestionInterface $referralAvailable;
@@ -55,17 +63,19 @@ final class AccompanyingCourseApiController extends ApiController
private ValidatorInterface $validator;
public function __construct(
- EventDispatcherInterface $eventDispatcher,
- ValidatorInterface $validator,
- Registry $registry,
+ AccompanyingPeriodRepository $accompanyingPeriodRepository,
AccompanyingPeriodACLAwareRepository $accompanyingPeriodACLAwareRepository,
- ReferralsSuggestionInterface $referralAvailable
+ EventDispatcherInterface $eventDispatcher,
+ ReferralsSuggestionInterface $referralAvailable,
+ Registry $registry,
+ ValidatorInterface $validator
) {
- $this->eventDispatcher = $eventDispatcher;
- $this->validator = $validator;
- $this->registry = $registry;
+ $this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
$this->accompanyingPeriodACLAwareRepository = $accompanyingPeriodACLAwareRepository;
+ $this->eventDispatcher = $eventDispatcher;
$this->referralAvailable = $referralAvailable;
+ $this->registry = $registry;
+ $this->validator = $validator;
}
public function commentApi($id, Request $request, string $_format): Response
@@ -99,6 +109,57 @@ final class AccompanyingCourseApiController extends ApiController
]);
}
+ /**
+ * @Route("/api/1.0/person/accompanying-course/list/by-recent-attributions")
+ */
+ public function findMyRecentCourseAttribution(Request $request): JsonResponse
+ {
+ $this->denyAccessUnlessGranted('ROLE_USER');
+ $user = $this->getUser();
+
+ if (!$user instanceof User) {
+ throw new AccessDeniedException();
+ }
+
+ $since = (new DateTimeImmutable('now'))->sub(new DateInterval('P15D'));
+
+ $total = $this->accompanyingPeriodRepository->countByRecentUserHistory($user, $since);
+
+ if ($request->query->getBoolean('countOnly', false)) {
+ return new JsonResponse(
+ $this->getSerializer()->serialize(new Counter($total), 'json'),
+ JsonResponse::HTTP_OK,
+ [],
+ true
+ );
+ }
+
+ $paginator = $this->getPaginatorFactory()->create($total);
+
+ if (0 === $total) {
+ return new JsonResponse(
+ $this->getSerializer()->serialize(new Collection([], $paginator), 'json'),
+ JsonResponse::HTTP_OK,
+ [],
+ true
+ );
+ }
+
+ $courses = $this->accompanyingPeriodRepository->findByRecentUserHistory(
+ $user,
+ $since,
+ $paginator->getItemsPerPage(),
+ $paginator->getCurrentPageFirstItemNumber()
+ );
+
+ return new JsonResponse(
+ $this->getSerializer()->serialize(new Collection($courses, $paginator), 'json', ['groups' => ['read']]),
+ JsonResponse::HTTP_OK,
+ [],
+ true
+ );
+ }
+
/**
* @ParamConverter("person", options={"id": "person_id"})
*/
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
index 95cbaf023..fb25a3ff7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php
@@ -12,10 +12,54 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Controller;
use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\MainBundle\Serializer\Model\Counter;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use DateInterval;
+use DateTimeImmutable;
+use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
class AccompanyingCourseWorkApiController extends ApiController
{
+ private AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository;
+
+ public function __construct(AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository)
+ {
+ $this->accompanyingPeriodWorkRepository = $accompanyingPeriodWorkRepository;
+ }
+
+ /**
+ * @Route("/api/1.0/person/accompanying-period/work/my-near-end")
+ */
+ public function myWorksNearEndDate(Request $request): JsonResponse
+ {
+ $since = (new DateTimeImmutable('now'))
+ ->sub(new DateInterval('P' . $request->query->getInt('since', 15) . 'D'));
+ $until = (new DateTimeImmutable('now'))
+ ->add(new DateInterval('P' . $request->query->getInt('since', 15) . 'D'));
+ $total = $this->accompanyingPeriodWorkRepository
+ ->countNearEndDateByUser($this->getUser(), $since, $until);
+
+ if ($request->query->getBoolean('countOnly', false)) {
+ return $this->json(
+ new Counter($total),
+ JsonResponse::HTTP_OK,
+ [],
+ ['groups' => ['read']]
+ );
+ }
+
+ $paginator = $this->getPaginatorFactory()->create($total);
+ $works = $this->accompanyingPeriodWorkRepository
+ ->findNearEndDateByUser($this->getUser(), $since, $until, $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
+
+ $collection = new Collection($works, $paginator);
+
+ return $this->json($collection, 200, [], ['groups' => ['read']]);
+ }
+
protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
{
switch ($action) {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
index cc918c1db..1bb4bc1fe 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
@@ -15,11 +15,15 @@ use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\MainBundle\Serializer\Model\Counter;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationRepository;
use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
use Symfony\Component\Serializer\SerializerInterface;
@@ -28,20 +32,28 @@ use function in_array;
class AccompanyingPeriodWorkEvaluationApiController
{
+ private AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository;
+
private DocGeneratorTemplateRepository $docGeneratorTemplateRepository;
private PaginatorFactory $paginatorFactory;
+ private Security $security;
+
private SerializerInterface $serializer;
public function __construct(
+ AccompanyingPeriodWorkEvaluationRepository $accompanyingPeriodWorkEvaluationRepository,
DocGeneratorTemplateRepository $docGeneratorTemplateRepository,
SerializerInterface $serializer,
- PaginatorFactory $paginatorFactory
+ PaginatorFactory $paginatorFactory,
+ Security $security
) {
+ $this->accompanyingPeriodWorkEvaluationRepository = $accompanyingPeriodWorkEvaluationRepository;
$this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
$this->serializer = $serializer;
$this->paginatorFactory = $paginatorFactory;
+ $this->security = $security;
}
/**
@@ -76,4 +88,39 @@ class AccompanyingPeriodWorkEvaluationApiController
]
), JsonResponse::HTTP_OK, [], true);
}
+
+ /**
+ * @Route("/api/1.0/person/accompanying-period/work/evaluation/my-near-end")
+ */
+ public function myWorksNearEndDate(Request $request): JsonResponse
+ {
+ $total = $this->accompanyingPeriodWorkEvaluationRepository
+ ->countNearMaxDateByUser($this->security->getUser());
+
+ if ($request->query->getBoolean('countOnly', false)) {
+ return new JsonResponse(
+ $this->serializer->serialize(new Counter($total), 'json', ['groups' => 'read']),
+ JsonResponse::HTTP_OK,
+ [],
+ true
+ );
+ }
+
+ $paginator = $this->paginatorFactory->create($total);
+ $works = $this->accompanyingPeriodWorkEvaluationRepository
+ ->findNearMaxDateByUser(
+ $this->security->getUser(),
+ $paginator->getItemsPerPage(),
+ $paginator->getCurrentPageFirstItemNumber()
+ );
+
+ $collection = new Collection($works, $paginator);
+
+ return new JsonResponse(
+ $this->serializer->serialize($collection, 'json', ['groups' => 'read']),
+ JsonResponse::HTTP_OK,
+ [],
+ true
+ );
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index e7a1c514b..07fb859b7 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -26,6 +26,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\AccompanyingPeriodValidity;
use Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\ParticipationOverlap;
@@ -338,6 +339,14 @@ class AccompanyingPeriod implements
*/
private ?User $user = null;
+ /**
+ * @ORM\OneToMany(targetEntity=UserHistory::class, mappedBy="accompanyingPeriod", orphanRemoval=true,
+ * cascade={"persist", "remove"})
+ *
+ * @var Collection|UserHistory[]
+ */
+ private Collection $userHistories;
+
/**
* Temporary field, which is filled when the user is changed.
*
@@ -370,6 +379,7 @@ class AccompanyingPeriod implements
$this->comments = new ArrayCollection();
$this->works = new ArrayCollection();
$this->resources = new ArrayCollection();
+ $this->userHistories = new ArrayCollection();
}
/**
@@ -1214,10 +1224,20 @@ class AccompanyingPeriod implements
return $this;
}
- public function setUser(User $user): self
+ public function setUser(?User $user): self
{
if ($this->user !== $user) {
$this->userPrevious = $this->user;
+
+ foreach ($this->userHistories as $history) {
+ if (null === $history->getEndDate()) {
+ $history->setEndDate(new DateTimeImmutable('now'));
+ }
+ }
+
+ if (null !== $user) {
+ $this->userHistories->add(new UserHistory($this, $user));
+ }
}
$this->user = $user;
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
new file mode 100644
index 000000000..4e0e2493f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/UserHistory.php
@@ -0,0 +1,96 @@
+startDate = $startDate ?? new DateTimeImmutable('now');
+ $this->accompanyingPeriod = $accompanyingPeriod;
+ $this->user = $user;
+ }
+
+ public function getAccompanyingPeriod(): AccompanyingPeriod
+ {
+ return $this->accompanyingPeriod;
+ }
+
+ public function getEndDate(): ?DateTimeImmutable
+ {
+ return $this->endDate;
+ }
+
+ public function getId(): ?int
+ {
+ return $this->id;
+ }
+
+ public function getStartDate(): DateTimeImmutable
+ {
+ return $this->startDate;
+ }
+
+ public function getUser(): User
+ {
+ return $this->user;
+ }
+
+ public function setEndDate(?DateTimeImmutable $endDate): UserHistory
+ {
+ $this->endDate = $endDate;
+
+ return $this;
+ }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
index 06634b3cc..3178aa6e2 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
@@ -11,9 +11,12 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
+use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
+use DateTimeImmutable;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
use Doctrine\Persistence\ObjectRepository;
class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
@@ -25,6 +28,12 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
$this->repository = $entityManager->getRepository(AccompanyingPeriodWorkEvaluation::class);
}
+ public function countNearMaxDateByUser(User $user): int
+ {
+ return $this->buildQueryNearMaxDateByUser($user)
+ ->select('count(e)')->getQuery()->getSingleScalarResult();
+ }
+
public function find($id): ?AccompanyingPeriodWorkEvaluation
{
return $this->repository->find($id);
@@ -39,8 +48,8 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
}
/**
- * @param null|mixed $limit
- * @param null|mixed $offset
+ * @param int $limit
+ * @param int $offset
*
* @return array|AccompanyingPeriodWorkEvaluation[]
*/
@@ -49,13 +58,45 @@ class AccompanyingPeriodWorkEvaluationRepository implements ObjectRepository
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
- public function findOneBy(array $criteria): ?AccompanyingPeriodWorkEvaluation
+ public function findNearMaxDateByUser(User $user, int $limit = 20, int $offset = 0): array
{
- return $this->findOneBy($criteria);
+ return $this->buildQueryNearMaxDateByUser($user)
+ ->select('e')
+ ->setFirstResult($offset)
+ ->setMaxResults($limit)
+ ->getQuery()
+ ->getResult();
}
- public function getClassName()
+ public function findOneBy(array $criteria): ?AccompanyingPeriodWorkEvaluation
+ {
+ return $this->repository->findOneBy($criteria);
+ }
+
+ public function getClassName(): string
{
return AccompanyingPeriodWorkEvaluation::class;
}
+
+ private function buildQueryNearMaxDateByUser(User $user): QueryBuilder
+ {
+ $qb = $this->repository->createQueryBuilder('e');
+
+ $qb
+ ->join('e.accompanyingPeriodWork', 'work')
+ ->join('work.accompanyingPeriod', 'period')
+ ->where(
+ $qb->expr()->andX(
+ $qb->expr()->eq('period.user', ':user'),
+ $qb->expr()->isNull('e.endDate'),
+ $qb->expr()->gte(':now', $qb->expr()->diff('e.maxDate', 'e.warningInterval'))
+ )
+ )
+ ->setParameters([
+ 'user' => $user,
+ 'now' => new DateTimeImmutable('now'),
+ ]);
+
+ return $qb;
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
index 23ccf57a9..70e972aa5 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
@@ -11,10 +11,14 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
+use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use DateTimeImmutable;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
use Doctrine\Persistence\ObjectRepository;
final class AccompanyingPeriodWorkRepository implements ObjectRepository
@@ -41,6 +45,12 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
->getSingleScalarResult();
}
+ public function countNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until): int
+ {
+ return $this->buildQueryNearEndDateByUser($user, $since, $until)
+ ->select('count(w)')->getQuery()->getSingleScalarResult();
+ }
+
public function find($id): ?AccompanyingPeriodWork
{
return $this->repository->find($id);
@@ -68,6 +78,16 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
return $this->repository->findByAccompanyingPeriod($period, $orderBy, $limit, $offset);
}
+ public function findNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until, int $limit = 20, int $offset = 0): array
+ {
+ return $this->buildQueryNearEndDateByUser($user, $since, $until)
+ ->select('w')
+ ->setFirstResult($offset)
+ ->setMaxResults($limit)
+ ->getQuery()
+ ->getResult();
+ }
+
public function findOneBy(array $criteria): ?AccompanyingPeriodWork
{
return $this->repository->findOneBy($criteria);
@@ -78,22 +98,6 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
return AccompanyingPeriodWork::class;
}
- public function toDelete()
- {
- $qb = $this->buildQueryBySocialActionWithDescendants($action);
- $qb->select('g');
-
- foreach ($orderBy as $sort => $order) {
- $qb->addOrderBy('g.' . $sort, $order);
- }
-
- return $qb
- ->setMaxResults($limit)
- ->setFirstResult($offset)
- ->getQuery()
- ->getResult();
- }
-
private function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
{
$actions = $action->getDescendantsWithThis();
@@ -103,12 +107,34 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
$orx = $qb->expr()->orX();
$i = 0;
- foreach ($actions as $action) {
+ foreach ($actions as $a) {
$orx->add(":action_{$i} MEMBER OF g.socialActions");
- $qb->setParameter("action_{$i}", $action);
+ $qb->setParameter("action_{$i}", $a);
}
$qb->where($orx);
return $qb;
}
+
+ private function buildQueryNearEndDateByUser(User $user, DateTimeImmutable $since, DateTimeImmutable $until): QueryBuilder
+ {
+ $qb = $this->repository->createQueryBuilder('w');
+
+ $qb
+ ->join('w.accompanyingPeriod', 'period')
+ ->where(
+ $qb->expr()->andX(
+ $qb->expr()->eq('period.user', ':user'),
+ $qb->expr()->gte('w.endDate', ':since'),
+ $qb->expr()->lte('w.startDate', ':until')
+ )
+ )
+ ->setParameters([
+ 'user' => $user,
+ 'since' => $since,
+ 'until' => $until,
+ ]);
+
+ return $qb;
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
index edb4b4f3d..3f0c30e47 100644
--- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php
@@ -11,7 +11,9 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Repository;
+use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use DateTimeImmutable;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\QueryBuilder;
@@ -26,6 +28,13 @@ final class AccompanyingPeriodRepository implements ObjectRepository
$this->repository = $entityManager->getRepository(AccompanyingPeriod::class);
}
+ public function countByRecentUserHistory(User $user, DateTimeImmutable $since): int
+ {
+ $qb = $this->buildQueryByRecentUserHistory($user, $since);
+
+ return $qb->select('count(a)')->getQuery()->getSingleScalarResult();
+ }
+
public function countBy(array $criteria): int
{
return $this->repository->count($criteria);
@@ -54,6 +63,21 @@ final class AccompanyingPeriodRepository implements ObjectRepository
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
+ /**
+ * @return array|AccompanyingPeriod[]
+ */
+ public function findByRecentUserHistory(User $user, DateTimeImmutable $since, ?int $limit = 20, ?int $offset = 0): array
+ {
+ $qb = $this->buildQueryByRecentUserHistory($user, $since);
+
+ return $qb->select('a')
+ ->distinct(true)
+ ->getQuery()
+ ->setMaxResults($limit)
+ ->setFirstResult($offset)
+ ->getResult();
+ }
+
public function findOneBy(array $criteria): ?AccompanyingPeriod
{
return $this->findOneBy($criteria);
@@ -63,4 +87,19 @@ final class AccompanyingPeriodRepository implements ObjectRepository
{
return AccompanyingPeriod::class;
}
+
+ private function buildQueryByRecentUserHistory(User $user, DateTimeImmutable $since): QueryBuilder
+ {
+ $qb = $this->repository->createQueryBuilder('a');
+
+ $qb
+ ->join('a.userHistories', 'userHistory')
+ ->where($qb->expr()->eq('a.user', ':user'))
+ ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
+ ->andWhere($qb->expr()->isNull('userHistory.endDate'))
+ ->setParameter('user', $user)
+ ->setParameter('since', $since);
+
+ return $qb;
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index e8a98bc80..365074d05 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -80,6 +80,8 @@ div.dashboard {
}
}
div.dashboard,
+h4.badge-title,
+h3.badge-title,
h2.badge-title {
display: flex;
flex-direction: row;
@@ -128,6 +130,8 @@ ul.columns { // XS:1 SM:2 MD:1 LG:2 XL:2 XXL:2
/// dashboard_like_badge in AccompanyingCourse Work list Page
div[class*='accompanying_course_work'] {
div.dashboard,
+ h4.badge-title,
+ h3.badge-title,
h2.badge-title {
span.title_label {
// Calculate same color then border:groove
@@ -143,6 +147,8 @@ div[class*='accompanying_course_work'] {
/// dashboard_like_badge in Activities on resume page
div[class*='activity-'] {
div.dashboard,
+ h4.badge-title,
+ h3.badge-title,
h2.badge-title {
span.title_label {
// Calculate same color then border:groove
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 249cd7d41..87f6d8d09 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -152,8 +152,8 @@ const appMessages = {
not_valid: "Sélectionnez un métier du référent"
},
startdate: {
- change: "Modifier la date de début",
- date: "Date de début",
+ change: "Date d'ouverture",
+ date: "Date d'ouverture",
},
// catch errors
'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 5237dc7e2..c88de825b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -244,16 +244,15 @@
{{ 'notification.comments_list'|trans }}
+ + {% if notification.comments|length > 0 %} ++-
+
+ {{ 'cancel'|trans }}
+
+
+ -
+
+
+
+ {{ form_end(editedCommentForm) }} + +{{ 'Write a new comment'|trans }}
+ + {{ form_start(appendCommentForm) }} + {{ form_errors(appendCommentForm) }} + {{ form_widget(appendCommentForm.content) }} + ++-
+
+
+
+ {{ form_end(appendCommentForm) }} + +