fix: [calendar list on person page] add scripts to download documents

+ improve typing

src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php

@@ -11,12 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Calculator;
 
-use Chill\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
 
 interface CalculatorInterface
 {
     /**
-     * @param AbstractElement[] $elements
+     * @param array<Charge|Resource> $elements
      */
     public function calculate(array $elements): ?CalculatorResult;
 

src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php

@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Calculator;
 
 use Chill\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
 use OutOfBoundsException;
 
 use function array_key_exists;
@@ -21,11 +23,14 @@ use function implode;
 class CalculatorManager
 {
     /**
-     * @var CalculatorInterface[]
+     * @var array<string, CalculatorInterface>
      */
-    protected $calculators = [];
+    private array $calculators = [];
 
-    protected $defaultCalculator = [];
+    /**
+     * @var string[]
+     */
+    private array $defaultCalculator = [];
 
     public function addCalculator(CalculatorInterface $calculator, bool $default)
     {
@@ -37,7 +42,7 @@ class CalculatorManager
     }
 
     /**
-     * @param AbstractElement[] $elements
+     * @param array<Resource|Charge> $elements
      *
      * @return CalculatorResult[]
      */
@@ -46,23 +51,17 @@ class CalculatorManager
         $results = [];
 
         foreach ($this->defaultCalculator as $alias) {
-            $calculator = $this->calculators[$alias];
-            $result = $calculator->calculate($elements);
+            $result = $this->getCalculator($alias)->calculate($elements);
 
             if (null !== $result) {
-                $results[$calculator->getAlias()] = $result;
+                $results[$alias] = $result;
             }
         }
 
         return $results;
     }
 
-    /**
-     * @param string $alias
-     *
-     * @return CalculatorInterface
-     */
-    public function getCalculator($alias)
+    public function getCalculator(string $alias): CalculatorInterface
     {
         if (false === array_key_exists($alias, $this->calculators)) {
             throw new OutOfBoundsException("The calculator with alias '{$alias}' does "

src/Bundle/ChillBudgetBundle/Controller/ElementController.php

@@ -14,6 +14,8 @@ namespace Chill\BudgetBundle\Controller;
 use Chill\BudgetBundle\Calculator\CalculatorManager;
 use Chill\BudgetBundle\Entity\Charge;
 use Chill\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Repository\ChargeRepository;
+use Chill\BudgetBundle\Repository\ResourceRepository;
 use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
@@ -29,24 +31,32 @@ use function count;
 
 class ElementController extends AbstractController
 {
-    protected CalculatorManager $calculator;
+    private CalculatorManager $calculator;
 
-    protected LoggerInterface $chillMainLogger;
+    private LoggerInterface $chillMainLogger;
 
-    protected EntityManagerInterface $em;
+    private EntityManagerInterface $em;
 
-    protected TranslatorInterface $translator;
+    private ResourceRepository $resourceRepository;
+
+    private ChargeRepository $chargeRepository;
+
+    private TranslatorInterface $translator;
 
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
         LoggerInterface $chillMainLogger,
-        CalculatorManager $calculator
+        CalculatorManager $calculator,
+        ResourceRepository $resourceRepository,
+        ChargeRepository $chargeRepository,
     ) {
         $this->em = $em;
         $this->translator = $translator;
         $this->chillMainLogger = $chillMainLogger;
         $this->calculator = $calculator;
+        $this->resourceRepository = $resourceRepository;
+        $this->chargeRepository = $chargeRepository;
     }
 
     /**
@@ -59,24 +69,10 @@ class ElementController extends AbstractController
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $person);
 
-        $charges = $this->em
-            ->getRepository(Charge::class)
-            ->findByPerson($person);
+        $charges = $this->chargeRepository->findAllByEntity($person);
+        $resources = $this->resourceRepository->findAllByEntity($person);
 
-        $ressources = $this->em
-            ->getRepository(Resource::class)
-            ->findByPerson($person);
-
-        $now = new DateTime('now');
-
-        $actualCharges = $this->em
-            ->getRepository(Charge::class)
-            ->findByEntityAndDate($person, $now);
-        $actualResources = $this->em
-            ->getRepository(Resource::class)
-            ->findByEntityAndDate($person, $now);
-
-        $elements = array_merge($actualCharges, $actualResources);
+        $elements = array_merge($charges, $resources);
 
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
@@ -85,7 +81,7 @@ class ElementController extends AbstractController
         return $this->render('ChillBudgetBundle:Person:index.html.twig', [
             'person' => $person,
             'charges' => $charges,
-            'resources' => $ressources,
+            'resources' => $resources,
             'results' => $results ?? [],
         ]);
     }
@@ -100,60 +96,19 @@ class ElementController extends AbstractController
     {
         $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $household);
 
-        $charges = $this->em
-            ->getRepository(Charge::class)
-            ->findByHousehold($household);
+        $charges = $this->chargeRepository->findAllByEntity($household);
+        $resources = $this->resourceRepository->findAllByEntity($household);
 
-        $ressources = $this->em
-            ->getRepository(Resource::class)
-            ->findByHousehold($household);
-
-        $now = new DateTime('now');
-
-        $actualCharges = $this->em
-            ->getRepository(Charge::class)
-            ->findByEntityAndDate($household, $now);
-        $actualResources = $this->em
-            ->getRepository(Resource::class)
-            ->findByEntityAndDate($household, $now);
-
-        $elements = array_merge($actualCharges, $actualResources);
+        $elements = array_merge($charges, $resources);
 
         if (count($elements) > 0) {
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        // quick solution to calculate the sum, difference and amount from
-        // controller. This should be done from the calculators
-        // TODO replace this by calculators
-        $wholeCharges = $actualCharges;
-        $wholeResources = $actualResources;
-
-        foreach ($household->getCurrentPersons() as $person) {
-            $wholeCharges = array_merge(
-                $wholeCharges,
-                $this->em
-                    ->getRepository(Charge::class)
-                    ->findByEntityAndDate($person, $now)
-            );
-            $wholeResources = array_merge(
-                $wholeResources,
-                $this->em
-                    ->getRepository(Resource::class)
-                    ->findByEntityAndDate($person, $now)
-            );
-        }
-
         return $this->render('ChillBudgetBundle:Household:index.html.twig', [
             'household' => $household,
             'charges' => $charges,
-            'resources' => $ressources,
-            'wholeResources' => array_filter($wholeResources, static function (Resource $r) use ($now) {
-                return $r->getStartDate() <= $now && ($r->getEndDate() === null || $r->getEndDate() >= $now);
-            }),
-            'wholeCharges' => array_filter($wholeCharges, static function (Charge $c) use ($now) {
-                return $c->getStartDate() <= $now && ($c->getEndDate() === null || $c->getEndDate() >= $now);
-            }),
+            'resources' => $resources,
             'results' => $results ?? [],
         ]);
     }

src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php

@@ -11,9 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Repository;
 
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
-use Doctrine\ORM\EntityRepository;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * ChargeRepository.
@@ -21,24 +24,44 @@ use Doctrine\ORM\EntityRepository;
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class ChargeRepository extends EntityRepository
+class ChargeRepository extends ServiceEntityRepository
 {
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Charge::class);
+    }
+
+    /**
+     * @return Charge[]
+     */
+    public function findAllByEntity(Person|Household $entity): array
+    {
+        $qb = $this->createQueryBuilder('c');
+
+        $property = $entity instanceof Person ? 'person' : 'household';
+
+        $qb->where("c.{$property} = :entity")
+            ->setParameter('entity', $entity);
+
+        return $qb->getQuery()->getResult();
+    }
+
     public function findByEntityAndDate($entity, DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
         $entityStr = $entity instanceof Person ? 'person' : 'household';
 
-        $qb->where("c.{$entityStr} = :{$entityStr}")
-            ->andWhere('c.startDate < :date')
-            ->andWhere('c.startDate < :date OR c.startDate IS NULL');
+        $qb->where("c.{$entityStr} = :entity")
+            ->andWhere('c.startDate <= :date')
+            ->andWhere('c.endDate > :date OR c.endDate IS NULL');
 
         if (null !== $sort) {
             $qb->orderBy($sort);
         }
 
         $qb->setParameters([
-            $entityStr => $entity,
+            'entity' => $entity,
             'date' => $date,
         ]);
 

src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php

@@ -11,9 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\BudgetBundle\Repository;
 
+use Chill\BudgetBundle\Entity\Resource;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * ResourceRepository.
@@ -21,28 +25,45 @@ use Doctrine\ORM\EntityRepository;
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
-class ResourceRepository extends EntityRepository
+class ResourceRepository extends ServiceEntityRepository
 {
-    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Resource::class);
+    }
+
+    /**
+     * @return Resource[]
+     */
+    public function findAllByEntity(Person|Household $entity): array
+    {
+        $qb = $this->createQueryBuilder('r');
+
+        $property = $entity instanceof Person ? 'person' : 'household';
+
+        $qb->where("r.{$property} = :entity")
+            ->setParameter('entity', $entity);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function findByEntityAndDate(Person|Household $entity, DateTime $date, $sort = null)
     {
         $qb = $this->createQueryBuilder('c');
 
         $entityStr = $entity instanceof Person ? 'person' : 'household';
 
-        $qb->where("c.{$entityStr} = :{$entityStr}")
-            // TODO: in controller, the budget and charges asked are also for future and actual
-            //->andWhere('c.startDate < :date')
-            // TODO: there is a misconception here, the end date must be lower or null. startDate are never null
-            //->andWhere('c.startDate < :date OR c.startDate IS NULL');
-;
+        $qb->where("c.{$entityStr} = :entity")
+            ->andWhere('c.startDate <= :date')
+            ->andWhere('c.endDate > :date OR c.endDate IS NULL');
 
         if (null !== $sort) {
             $qb->orderBy($sort);
         }
 
         $qb->setParameters([
-            $entityStr => $entity,
-            //'date' => $date,
+            'entity' => $entity,
+            'date' => $date,
         ]);
 
         return $qb->getQuery()->getResult();

src/Bundle/ChillBudgetBundle/migrations/Version20230328155010.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Budget;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230328155010 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'budget elements: restore the previous type to resource/charge kind if applicable';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            WITH type_to_id AS (
+                SELECT DISTINCT charge.charge_id AS id, charge.type
+                FROM chill_budget.charge
+                WHERE type <> ''
+            )
+            UPDATE chill_budget.charge_type
+                SET kind = type_to_id.type
+                FROM type_to_id
+                WHERE type_to_id.type <> '' AND type_to_id.id = charge_type.id
+        SQL);
+
+        $this->addSql(<<<'SQL'
+            WITH type_to_id AS (
+                SELECT DISTINCT resource.resource_id AS id, resource.type
+                FROM chill_budget. resource
+                WHERE type <> ''
+            )
+            UPDATE chill_budget.resource_type
+                SET kind = type_to_id.type
+                FROM type_to_id
+                WHERE type_to_id.type <> '' AND type_to_id.id = resource_type.id
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("UPDATE chill_budget.resource_type SET kind=md5(random()::text) WHERE kind = ''");
+        $this->addSql("UPDATE chill_budget.charge_type SET kind=md5(random()::text) WHERE kind = ''");
+    }
+}

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -92,6 +92,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod", inversedBy="calendars")
+     * @Serializer\Groups({"calendar:read", "read"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue

@@ -15,6 +15,7 @@
           :picked="null !== this.$store.getters.getMainUser ? [this.$store.getters.getMainUser] : []"
           :removableIfSet="false"
           :displayPicked="false"
+          :suggested="this.suggestedUsers"
           @addNewEntity="setMainUser"
         ></pick-entity>
       </div>
@@ -143,6 +144,7 @@ export default {
       slotMinTime: '09:00:00',
       slotMaxTime: '18:00:00',
       hideWeekEnds: true,
+      previousUser: [],
     }
   },
   computed: {
@@ -188,11 +190,23 @@ export default {
         users.push(this.$store.getters.getUserDataById(id).user);
       }
       return users;
-    }
+    },
+    suggestedUsers() {
+      const suggested = [];
+
+      this.$data.previousUser.forEach(u => {
+        if (u.id !== this.$store.getters.getMainUser.id) {
+          suggested.push(u)
+        }
+      });
+
+      return suggested;
+    },
   },
   methods: {
-    setMainUser(user) {
-      console.log('setMainUser APP', user);
+    setMainUser({entity}) {
+      const user = entity;
+      console.log('setMainUser APP', entity);
 
       if (user.id !== this.$store.getters.getMainUser && (
           this.$store.state.activity.calendarRange !== null
@@ -205,6 +219,14 @@ export default {
         }
       }
 
+      // add the previous user, if any, in the previous user list (in use for suggestion)
+      if (null !== this.$store.getters.getMainUser) {
+        const suggestedUids = new Set(this.$data.previousUser.map(u => u.id));
+        if (!suggestedUids.has(this.$store.getters.getMainUser.id)){
+          this.$data.previousUser.push(this.$store.getters.getMainUser);
+        }
+      }
+
       this.$store.dispatch('setMainUser', user);
       this.$store.commit('showUserOnCalendar', {user, ranges: true, remotes: true});
     },

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/actions.js

@@ -202,6 +202,8 @@ export default {
 
     return dispatch('associateCalendarToRange', { range: null }).then(() => {
       commit('setMainUser', mainUser);
+
+      return dispatch('fetchCalendarEvents');
     });
   },
 

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts

@@ -54,7 +54,7 @@ export const mapEntity = (entity: EventInput): EventInput => {
 
 export const createUserData = (user: User, colorIndex: number): UserData  => {
   const colorId = colorIndex % COLORS.length;
-  console.log('colorId', colorId);
+
   return {
     user: user,
     calendarRanges: [],

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig

@@ -9,13 +9,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_answer') }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_answer') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

src/Bundle/ChillDocGeneratorBundle/Service/Generator/Generator.php

@@ -91,10 +91,10 @@ class Generator implements GeneratorInterface
 
         $contextGenerationDataNormalized = array_merge(
             $contextGenerationDataNormalized,
-                ['creator' => $creator],
-                $context instanceof DocGeneratorContextWithPublicFormInterface ?
-                    $context->contextGenerationDataDenormalize($template, $entity, $contextGenerationDataNormalized)
-                    : []
+            ['creator' => $creator],
+            $context instanceof DocGeneratorContextWithPublicFormInterface ?
+                $context->contextGenerationDataDenormalize($template, $entity, $contextGenerationDataNormalized)
+                : []
         );
 
         $data = $context->getData($template, $entity, $contextGenerationDataNormalized);

src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationMessage.php

@@ -27,7 +27,7 @@ class RequestGenerationMessage
 
     private array $contextGenerationData;
 
-   private \DateTimeImmutable $createdAt;
+    private \DateTimeImmutable $createdAt;
 
     public function __construct(
         User $creator,

src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php

@@ -64,7 +64,6 @@ class SocialWorkTypeFilter implements FilterInterface
 
             $orX = $qb->expr()->orX();
             foreach ($data['goal'] as $goal) {
-
                 /** @var Goal $goal */
                 $andX = $qb->expr()->andX();
                 $andX->add($qb->expr()->eq('acpw_goal.goal', $goalId = ':goal_'.uniqid()));
@@ -73,7 +72,6 @@ class SocialWorkTypeFilter implements FilterInterface
                 if (count($data['result']) > 0) {
                     $orXResult = $qb->expr()->orX();
                     foreach ($data['result'] as $result) {
-
                         /** @var Result $result */
                         $orXResult->add($qb->expr()->isMemberOf($resultId = ':result_'.uniqid(), 'acpw_goal.results'));
                         $qb->setParameter($resultId, $result);

src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php

@@ -80,7 +80,7 @@ class SimilarPersonMatcher
             ->where('SIMILARITY(p.fullnameCanonical, UNACCENT(LOWER(:fullName))) >= :precision')
             ->andWhere($qb->expr()->in('center_history.center', ':centers'))
             ->andWhere($qb->expr()->andX(
-               $qb->expr()->lte('center_history.startDate', 'CURRENT_DATE()'),
+                $qb->expr()->lte('center_history.startDate', 'CURRENT_DATE()'),
                 $qb->expr()->orX(
                     $qb->expr()->isNull('center_history.endDate'),
                     $qb->expr()->gt('center_history.endDate', 'CURRENT_DATE()')

src/Bundle/ChillPersonBundle/migrations/Version20230210104424.php

@@ -2,6 +2,13 @@
 
 declare(strict_types=1);
 
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\Migrations\Person;
 
 use Doctrine\DBAL\Schema\Schema;