Merge branch '111_exports' into social_action_exports

This commit is contained in:
Julie Lenaerts 2022-08-10 10:05:26 +02:00
commit 20949fdb5c
11 changed files with 200 additions and 29 deletions

View File

@ -99,7 +99,11 @@ class CountActivityLinkedToACP implements ExportInterface, GroupedExportInterfac
public function supportsModifiers()
{
return [ExportDeclarations::PERSON_TYPE, Declarations::ACTIVITY, ExportDeclarations::ACP_SHARED];
return [
ExportDeclarations::PERSON_TYPE,
Declarations::ACTIVITY,
ExportDeclarations::ACP_SHARED
];
}
public function getGroup(): string

View File

@ -17,6 +17,8 @@ use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Export\Declarations as Person_Declarations;
use Chill\ActivityBundle\Export\Declarations as Activity_Declarations;
use Doctrine\ORM\Query;
use LogicException;
use Symfony\Component\Form\FormBuilderInterface;
@ -127,7 +129,10 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
public function supportsModifiers()
{
return ['person', 'activity'];
return [
Person_Declarations::PERSON_TYPE,
Activity_Declarations::ACTIVITY
];
}
public function getGroup(): string

View File

@ -3,6 +3,7 @@ services:
autowire: true
autoconfigure: true
## Indicators
chill.activity.export.count_activity:
class: Chill\ActivityBundle\Export\Export\CountActivity
tags:
@ -13,16 +14,17 @@ services:
tags:
- { name: chill.export, alias: 'count_activity_linked_to_acp' }
# chill.activity.export.sum_activity_duration:
# class: Chill\ActivityBundle\Export\Export\StatActivityDuration
# tags:
# - { name: chill.export, alias: 'sum_activity_duration' }
chill.activity.export.sum_activity_duration:
class: Chill\ActivityBundle\Export\Export\StatActivityDuration
tags:
- { name: chill.export, alias: 'sum_activity_duration' }
# chill.activity.export.list_activity:
# class: Chill\ActivityBundle\Export\Export\ListActivity
# tags:
# - { name: chill.export, alias: 'list_activity' }
chill.activity.export.list_activity:
class: Chill\ActivityBundle\Export\Export\ListActivity
tags:
- { name: chill.export, alias: 'list_activity' }
## Filters
chill.activity.export.reason_filter:
class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter
tags:
@ -45,6 +47,7 @@ services:
name: chill.export_filter
alias: 'activity_person_having_ac_bw_date_filter'
## Aggregators
chill.activity.export.reason_aggregator:
class: Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
tags:

View File

@ -240,9 +240,9 @@ By reason: Par sujet
By category of reason: Par catégorie de sujet
Reason's level: Niveau du sujet
Group by reasons: Sujet d'activité
Aggregate by activity user: Aggréger par utilisateur lié à l'activité
Aggregate by activity type: Aggréger par type d'activité
Aggregate by activity reason: Aggréger par sujet de l'activité
Aggregate by activity user: Grouper par utilisateur lié à l'activité
Aggregate by activity type: Grouper par type d'activité
Aggregate by activity reason: Grouper par sujet de l'activité
Last activities: Les dernières activités

View File

@ -217,9 +217,9 @@ By reason: Par sujet
By category of reason: Par catégorie de sujet
Reason's level: Niveau du sujet
Group by reasons: Sujet d'activité
Aggregate by activity user: Aggréger par utilisateur lié à l'activité
Aggregate by activity type: Aggréger par type d'activité
Aggregate by activity reason: Aggréger par sujet de l'activité
Aggregate by activity user: Grouper par utilisateur lié à l'activité
Aggregate by activity type: Grouper par type d'activité
Aggregate by activity reason: Grouper par sujet de l'activité
Last activities: Les dernières activités

View File

@ -100,6 +100,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
}
$loader->load('services/exports_accompanying_course.yaml');
$loader->load('services/exports_social_actions.yaml');
$loader->load('services/exports_evaluation.yaml');
}
/**

View File

@ -22,7 +22,9 @@ abstract class Declarations
public const ACP_TYPE = 'accompanying_period';
public const SOCIAL_WORK_ACTION_TYPE = 'social_actions';
public const ACP_SHARED = 'accompanying_period_shared';
public const SOCIAL_WORK_ACTION_TYPE = 'social_actions';
public const EVAL_TYPE = 'evaluation';
}

View File

@ -0,0 +1,135 @@
<?php
namespace Chill\PersonBundle\Export\Export;
use Chill\MainBundle\Export\ExportInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\GroupedExportInterface;
use Chill\PersonBundle\Entity\SocialWork\Evaluation;
use Chill\PersonBundle\Export\Declarations;
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\Query;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
class CountEvaluation implements ExportInterface, GroupedExportInterface
{
private EntityRepository $evaluationRepository;
public function __construct(
EntityManagerInterface $em
) {
$this->evaluationRepository = $em->getRepository(Evaluation::class);
}
/**
* @inheritDoc
*/
public function buildForm(FormBuilderInterface $builder)
{
// TODO: Implement buildForm() method.
}
/**
* @inheritDoc
*/
public function getTitle(): string
{
return 'Count evaluations';
}
/**
* @inheritDoc
*/
public function getAllowedFormattersTypes(): array
{
return [FormatterInterface::TYPE_TABULAR];
}
/**
* @inheritDoc
*/
public function getDescription(): string
{
return 'Count evaluation by various parameters.';
}
/**
* @inheritDoc
*/
public function getLabels($key, array $values, $data)
{
if ('export_result' !== $key) {
throw new LogicException("the key {$key} is not used by this export");
}
$labels = array_combine($values, $values);
$labels['_header'] = $this->getTitle();
return static function ($value) use ($labels) {
return $labels[$value];
};
}
/**
* @inheritDoc
*/
public function getQueryKeys($data): array
{
return ['export_result'];
}
/**
* @inheritDoc
*/
public function getResult($qb, $data)
{
return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
}
/**
* @inheritDoc
*/
public function getType(): string
{
return Declarations::EVAL_TYPE;
}
/**
* @inheritDoc
*/
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
{
$qb = $this->evaluationRepository->createQueryBuilder('eval');
$qb->select('COUNT(eval.id) AS export_result');
return $qb;
}
/**
* @inheritDoc
*/
public function requiredRole()
{
return new Role(AccompanyingPeriodVoter::STATS);
}
/**
* @inheritDoc
*/
public function supportsModifiers(): array
{
return [
Declarations::EVAL_TYPE,
];
}
public function getGroup(): string
{
return 'Exports of evaluations';
}
}

View File

@ -111,7 +111,11 @@ class CountPerson implements ExportInterface, GroupedExportInterface
public function supportsModifiers()
{
return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN, Declarations::ACP_SHARED];
return [
Declarations::PERSON_TYPE,
Declarations::PERSON_IMPLIED_IN,
Declarations::ACP_SHARED
];
}
public function getGroup(): string

View File

@ -0,0 +1,13 @@
services:
## Indicators
chill.person.export.count_evaluation:
class: Chill\PersonBundle\Export\Export\CountEvaluation
autowire: true
autoconfigure: true
tags:
- { name: chill.export, alias: count_evaluation }
## Filters
## Aggregators

View File

@ -351,6 +351,10 @@ Exports of social work actions: Exports des actions d'accompangement
Count social work actions: Nombre d'actions d'accompagnement
Count social work actions by various parameters: Compte le nombre d'actions d'accompagnement en fonction de différents filtres.
Exports of evaluations: Exports des évaluations
Count evaluations: Nombre d'évaluations
Count evaluation by various parameters.: Compte le nombre d'évaluations selon différents filtres.
## filters
Filter by person gender: Filtrer par genre de la personne
Accepted genders: Genres acceptés
@ -390,11 +394,11 @@ Filtered by person\'s who have a residential address located at a thirdparty of
Family composition: Composition familiale
Family composition at this time: Composition familiale à cette date.
Filtered by entrusted child status: Uniquement les personnes qui sont "enfant confié"
Filter by entrusted child status: Uniquement les personnes qui sont "enfant confié"
Filter by entrusted child status: Filtrer les usagers qui sont "enfant confié"
Filtered by entrusted child status: Uniquement les usagers qui sont "enfant confié"
Filtered by nomadic status: Uniquement les personnes qui sont "gens de voyage"
Filter by nomadic status: Uniquement les personnes qui sont "gens de voyage"
Filter by nomadic status: Filtrer les usagers qui sont "gens de voyage"
Filtered by nomadic status: Uniquement les usagers qui sont "gens de voyage"
Filtered by person's who have a residential address located at another user: Uniquement les usagers qui ont une addresse de résidence chez un autre usager
@ -522,19 +526,19 @@ Date to: Date de fin
"Filtered by opening dates: between %datefrom% and %dateto%": "Filtrer les parcours ouverts entre deux dates: entre le %datefrom% et le %dateto%"
## aggregators
Group people by nationality: Aggréger les personnes par nationalités
Group people by nationality: Grouper les personnes par nationalités
Group by level: Grouper par niveau
Group by continents: Grouper par continent
Group by country: Grouper par pays
Group people by gender: Aggréger les personnes par genre
Group people by their professional situation: Aggréger les personnes par situation professionelle
Group people by marital status: Aggréger les personnes par état matrimonial
Group people by gender: Grouper les personnes par genre
Group people by their professional situation: Grouper les personnes par situation professionelle
Group people by marital status: Grouper les personnes par état matrimonial
Aggregate by age: Aggréger par âge
Aggregate by age: Grouper par âge
Calculate age in relation to this date: Calculer l'âge par rapport à cette date
Group people by country of birth: Aggréger les personnes par pays de naissance
Group people by country of birth: Grouper les personnes par pays de naissance
Similar persons: Personnes similaires
crud: