exports: add new modifiers declarations to split filter/aggregators between activities linked to person <> acp

This commit is contained in:
Mathieu Jaumotte 2022-08-17 14:18:39 +02:00
parent df9a5071c7
commit c09c7a9615
15 changed files with 24 additions and 13 deletions

View File

@ -107,7 +107,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
public function applyOn(): string
{
return Declarations::ACTIVITY;
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)

View File

@ -54,7 +54,7 @@ class ActivityTypeAggregator implements AggregatorInterface
public function applyOn(): string
{
return Declarations::ACTIVITY;
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)

View File

@ -48,7 +48,7 @@ class ActivityUserAggregator implements AggregatorInterface
public function applyOn(): string
{
return Declarations::ACTIVITY;
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)

View File

@ -17,4 +17,8 @@ namespace Chill\ActivityBundle\Export;
abstract class Declarations
{
public const ACTIVITY = 'activity';
public const ACTIVITY_ACP = "activity_linked_to_acp";
public const ACTIVITY_PERSON = "activity_linked_to_person";
}

View File

@ -67,6 +67,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
//PersonDeclarations::ACP_TYPE,
];
}

View File

@ -67,6 +67,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
//PersonDeclarations::ACP_TYPE,
];
}

View File

@ -101,7 +101,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
{
return [
Declarations::ACTIVITY,
//PersonDeclarations::PERSON_TYPE,
Declarations::ACTIVITY_ACP,
//PersonDeclarations::ACP_TYPE,
];
}

View File

@ -67,6 +67,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
//PersonDeclarations::ACP_TYPE,
];
}

View File

@ -67,6 +67,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_ACP,
//PersonDeclarations::ACP_TYPE,
];
}

View File

@ -71,9 +71,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface
return 'Count activities linked to a person';
}
public function getType()
public function getType(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@ -102,6 +102,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_PERSON,
//PersonDeclarations::PERSON_TYPE,
];
}

View File

@ -186,9 +186,9 @@ class ListActivity implements ListInterface, GroupedExportInterface
return 'List activities linked to a person';
}
public function getType()
public function getType(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@ -279,6 +279,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_PERSON,
//PersonDeclarations::PERSON_TYPE,
];
}

View File

@ -95,9 +95,9 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
}
}
public function getType()
public function getType(): string
{
return 'activity';
return Declarations::ACTIVITY;
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@ -131,6 +131,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
{
return [
Declarations::ACTIVITY,
Declarations::ACTIVITY_PERSON,
//PersonDeclarations::PERSON_TYPE,
];
}

View File

@ -60,7 +60,7 @@ class ActivityDateFilter implements FilterInterface
public function applyOn(): string
{
return Declarations::ACTIVITY;
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)

View File

@ -82,7 +82,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
public function applyOn(): string
{
return Declarations::ACTIVITY;
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)

View File

@ -64,7 +64,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
public function applyOn(): string
{
return Declarations::ACTIVITY;
return Declarations::ACTIVITY_PERSON;
}
public function buildForm(FormBuilderInterface $builder)