Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

rector and cs-fixer

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-11-14 14:33:50 +01:00
parent 83c3621c26
commit 3e39c0ced7
8 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.changes/unreleased/Feature-20231114-143558.yaml Normal file
View File

@ -0,0 +1,7 @@
kind: Feature
body: |+
Add 3 new filters and 3 new aggregators for work action creator (with jobs and scopes)
time: 2023-11-14T14:35:58.099418749+01:00
custom:
Issue: "204"

4
src/Bundle/ChillActivityBundle/Controller/ActivityController.php
View File

@ -673,8 +673,8 @@ final class ActivityController extends AbstractController
throw $this->createNotFoundException('Accompanying Period not found');
}
// TODO Add permission
// $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
// TODO Add permission
// $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
} else {
throw $this->createNotFoundException('Person or Accompanying Period not found');
}

6
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CreatorAggregator.php
View File

@ -23,8 +23,8 @@ class CreatorAggregator implements AggregatorInterface
private const PREFIX = 'acpw_aggr_creator';
public function __construct(
private UserRepository $userRepository,
private UserRender $userRender
private readonly UserRepository $userRepository,
private readonly UserRender $userRender
) {}
public function addRole(): ?string
@ -58,7 +58,7 @@ class CreatorAggregator implements AggregatorInterface
return function ($value): string {
if ('_header' === $value) {
return 'export.aggregator.course_work.by_creator.Creator';
};
}
if (null === $value || '' === $value) {
return '';

6
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CreatorJobAggregator.php
View File

@ -44,12 +44,12 @@ class CreatorJobAggregator implements AggregatorInterface
"{$p}_history",
Join::WITH,
$qb->expr()->andX(
$qb->expr()->eq("{$p}_history.user", "acpw.createdBy"),
$qb->expr()->eq("{$p}_history.user", 'acpw.createdBy'),
$qb->expr()->andX(
$qb->expr()->lte("{$p}_history.startDate", "acpw.createdAt"),
$qb->expr()->lte("{$p}_history.startDate", 'acpw.createdAt'),
$qb->expr()->orX(
$qb->expr()->isNull("{$p}_history.endDate"),
$qb->expr()->gt("{$p}_history.endDate", "acpw.createdAt")
$qb->expr()->gt("{$p}_history.endDate", 'acpw.createdAt')
)
)
)

6
src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CreatorScopeAggregator.php
View File

@ -44,12 +44,12 @@ class CreatorScopeAggregator implements AggregatorInterface
"{$p}_history",
Join::WITH,
$qb->expr()->andX(
$qb->expr()->eq("{$p}_history.user", "acpw.createdBy"),
$qb->expr()->eq("{$p}_history.user", 'acpw.createdBy'),
$qb->expr()->andX(
$qb->expr()->lte("{$p}_history.startDate", "acpw.createdAt"),
$qb->expr()->lte("{$p}_history.startDate", 'acpw.createdAt'),
$qb->expr()->orX(
$qb->expr()->isNull("{$p}_history.endDate"),
$qb->expr()->gt("{$p}_history.endDate", "acpw.createdAt")
$qb->expr()->gt("{$p}_history.endDate", 'acpw.createdAt')
)
)
)

6
src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorJobFilter.php
View File

@ -46,12 +46,12 @@ class CreatorJobFilter implements FilterInterface
"{$p}_history",
Join::WITH,
$qb->expr()->andX(
$qb->expr()->eq("{$p}_history.user", "acpw.createdBy"),
$qb->expr()->eq("{$p}_history.user", 'acpw.createdBy'),
$qb->expr()->andX(
$qb->expr()->lte("{$p}_history.startDate", "acpw.createdAt"),
$qb->expr()->lte("{$p}_history.startDate", 'acpw.createdAt'),
$qb->expr()->orX(
$qb->expr()->isNull("{$p}_history.endDate"),
$qb->expr()->gt("{$p}_history.endDate", "acpw.createdAt")
$qb->expr()->gt("{$p}_history.endDate", 'acpw.createdAt')
)
)
)

6
src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CreatorScopeFilter.php
View File

@ -46,12 +46,12 @@ class CreatorScopeFilter implements FilterInterface
"{$p}_history",
Join::WITH,
$qb->expr()->andX(
$qb->expr()->eq("{$p}_history.user", "acpw.createdBy"),
$qb->expr()->eq("{$p}_history.user", 'acpw.createdBy'),
$qb->expr()->andX(
$qb->expr()->lte("{$p}_history.startDate", "acpw.createdAt"),
$qb->expr()->lte("{$p}_history.startDate", 'acpw.createdAt'),
$qb->expr()->orX(
$qb->expr()->isNull("{$p}_history.endDate"),
$qb->expr()->gt("{$p}_history.endDate", "acpw.createdAt")
$qb->expr()->gt("{$p}_history.endDate", 'acpw.createdAt')
)
)
)

2
src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyType.php
View File

@ -100,7 +100,7 @@ class ThirdPartyType extends AbstractType
'label' => 'thirdparty.Contact data are confidential',
]);
// Institutional ThirdParty (parent)
// Institutional ThirdParty (parent)
} else {
$builder
->add('nameCompany', TextType::class, [