Merge branch 'features/list-possible-user-referral-period' into 'master'

Features/list possible user referral period

See merge request Chill-Projet/chill-bundles!180

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -8,6 +8,7 @@ use Chill\MainBundle\Security\Authorization\ChillVoterInterface;
 use Chill\MainBundle\Security\ProvideRoleInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
 use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
@@ -38,6 +39,8 @@ class ChillMainBundle extends Bundle
             ->addTag('chill_main.center_resolver');
         $container->registerForAutoconfiguration(ScopeResolverInterface::class)
             ->addTag('chill_main.scope_resolver');
+        $container->registerForAutoconfiguration(ChillEntityRenderInterface::class)
+            ->addTag('chill.render_entity');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());

src/Bundle/ChillMainBundle/Entity/UserJob.php

@@ -3,10 +3,14 @@
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table("chill_main_user_job")
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "user_job"=UserJob::class
+ *     })
  */
 class UserJob
 {
@@ -15,12 +19,14 @@ class UserJob
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Serializer\Groups({"read"})
      */
     protected ?int $id = null;
 
     /**
      * @var array|string[]A
      * @ORM\Column(name="label", type="json")
+     * @Serializer\Groups({"read"})
      */
     protected array $label = [];
 

src/Bundle/ChillMainBundle/Repository/UserRepository.php

@@ -48,6 +48,24 @@ final class UserRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
+    public function countBy(array $criteria): int
+    {
+        return $this->repository->count($criteria);
+    }
+
+    public function countByActive(): int
+    {
+        return $this->countBy(['enabled' => true]);
+    }
+
+    /**
+     * @return User[]|array
+     */
+    public function findByActive(array $orderBy = null, int $limit = null, int $offset = null): array
+    {
+        return $this->findBy(['enabled' => true], $orderBy, $limit, $offset);
+    }
+
     public function getClassName() {
         return User::class;
     }

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue

@@ -0,0 +1,14 @@
+<template>
+<span class="chill-entity entity-user">
+    {{ user.label }}
+    <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span>
+    <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span>
+</span>
+</template>
+
+<script>
+export default {
+    name: "UserRenderBoxBadge",
+    props: ['user'],
+}
+</script>

src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig

@@ -0,0 +1,9 @@
+<span class="chill-entity entity-user">
+    {{- user.label }}
+    {%- if opts['user_job'] and user.userJob is not null %}
+        <span class="user-job">({{ user.userJob.label|localize_translatable_string }})</span>
+    {%- endif -%}
+    {%- if opts['main_scope'] and user.mainScope is not null %}
+    <span class="main-scope">({{ user.mainScope.name|localize_translatable_string }})</span>
+    {%- endif -%}
+</span>

src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php

@@ -20,14 +20,21 @@
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-/**
- *
- * @internal we keep this normalizer, because the property 'text' may be replace by a rendering in the future
- */
-class UserNormalizer implements NormalizerInterface
+class UserNormalizer implements NormalizerInterface, NormalizerAwareInterface
 {
+    use NormalizerAwareTrait;
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
     public function normalize($user, string $format = null, array $context = array())
     {
         /** @var User $user */
@@ -35,7 +42,11 @@ class UserNormalizer implements NormalizerInterface
             'type' => 'user',
             'id' => $user->getId(),
             'username' => $user->getUsername(),
-            'text' => $user->getUsername()
+            'text' => $this->userRender->renderString($user, []),
+            'label' => $user->getLabel(),
+            'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $context),
+            'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $context),
+            'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $context),
         ];
     }
 

src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Chill\MainBundle\Templating\Entity;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Component\Templating\EngineInterface;
+
+class UserRender implements ChillEntityRenderInterface
+{
+    private TranslatableStringHelper $translatableStringHelper;
+    private EngineInterface $engine;
+
+    const DEFAULT_OPTIONS = [
+        'main_scope' => true,
+        'user_job' => true
+    ];
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper, EngineInterface $engine)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->engine = $engine;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof User;
+    }
+
+    /**
+     * @inheritDoc
+     * @param User $entity
+     */
+    public function renderString($entity, array $options): string
+    {
+        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
+
+        $str = $entity->getLabel();
+        if (NULL !== $entity->getUserJob() && $opts['user_job']) {
+            $str .= ' ('.$this->translatableStringHelper
+                ->localize($entity->getUserJob()->getLabel()).')';
+        }
+        if (NULL !== $entity->getMainScope() && $opts['main_scope']) {
+            $str .= ' ('.$this->translatableStringHelper
+                    ->localize($entity->getMainScope()->getName()).')';
+        }
+
+        return $str;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function renderBox($entity, array $options): string
+    {
+        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);
+
+        return $this->engine->render('@ChillMain/Entity/user.html.twig', [
+            'user' => $entity,
+            'opts' => $opts
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/config/services/templating.yaml

@@ -42,10 +42,12 @@ services:
             - { name: twig.extension }
 
     Chill\MainBundle\Templating\Entity\AddressRender:
-        arguments:
-            - '@Symfony\Component\Templating\EngineInterface'
-        tags:
-            - { name: 'chill.render_entity' }
+        autoconfigure: true
+        autowire: true
+
+    Chill\MainBundle\Templating\Entity\UserRender:
+        autoconfigure: true
+        autowire: true
 
     Chill\MainBundle\Templating\Listing\:
         resource: './../../Templating/Listing'