Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal

Browse Source
This commit is contained in:
Julie Lenaerts
2022-03-24 10:56:51 +01:00
parent dc3d88a1ef cba6394823
commit 287ea80be9
7 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
View File

@@ -40,7 +40,7 @@
{% endif %}
</div>
</div>
<div class="item-col">
<div class="item-col" style="justify-content: flex-end;">
<div class="box">
<ul class="list-content fa-ul">
<li>
@@ -79,7 +79,7 @@
{{ chill_pagination(paginator) }}
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li>
<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
{{ 'Create'|trans }}

13
src/Bundle/ChillMainBundle/Search/SearchApi.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Search;
use Chill\MainBundle\Pagination\Paginator;
use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\MainBundle\Serializer\Model\Collection;
use Doctrine\DBAL\Types\Types;
@@ -102,9 +103,9 @@ class SearchApi
return $items;
}
private function buildUnionQuery(array $queries, $types, $parameters)
private function buildUnionQuery(array $queries, $types, $parameters, Paginator $paginator)
{
$query = '{unions} ORDER BY pertinence DESC';
$query = '{unions} ORDER BY pertinence DESC LIMIT ? OFFSET ?';
$unions = [];
$parameters = [];
@@ -113,6 +114,10 @@ class SearchApi
$parameters = array_merge($parameters, $q->buildParameters());
}
// add pagination limit
$parameters[] = $paginator->getItemsPerPage();
$parameters[] = $paginator->getCurrentPageFirstItemNumber();
$union = implode(' UNION ', $unions);
return [
@@ -132,9 +137,9 @@ class SearchApi
return (int) $countNq->getSingleScalarResult();
}
private function fetchRawResult($queries, $types, $parameters, $paginator): array
private function fetchRawResult($queries, $types, $parameters, Paginator $paginator): array
{
[$union, $parameters] = $this->buildUnionQuery($queries, $types, $parameters);
[$union, $parameters] = $this->buildUnionQuery($queries, $types, $parameters, $paginator);
$rsm = new ResultSetMappingBuilder($this->em);
$rsm->addScalarResult('key', 'key', Types::STRING)
->addScalarResult('metadata', 'metadata', Types::JSON)

5
src/Bundle/ChillMainBundle/config/services/menu.yaml
View File

@@ -13,9 +13,8 @@ services:
- { name: 'chill.menu_builder' }
Chill\MainBundle\Routing\MenuBuilder\SectionMenuBuilder:
arguments:
$authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
$translator: '@Symfony\Contracts\Translation\TranslatorInterface'
autowire: true
autoconfigure: true
tags:
- { name: 'chill.menu_builder' }

3
src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
View File

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Menu;
use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Doctrine\ORM\Query\Parameter;
use Knp\Menu\MenuItem;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -27,6 +28,8 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
protected TranslatorInterface $translator;
protected ParameterBagInterface $parameterBag;
/**
* SectionMenuBuilder constructor.
*/

4
src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
View File

@@ -116,7 +116,7 @@ class PersonDocGenNormalizer implements
'memo' => $person->getMemo(),
'numberOfChildren' => (string) $person->getNumberOfChildren(),
'address' => $this->normalizer->normalize($person->getCurrentPersonAddress(), $format, $addressContext),
'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext),
//'resources' => $this->normalizer->normalize($person->getResources(), $format, $personResourceContext),
];
if ($context['docgen:person:with-household'] ?? false) {
@@ -193,7 +193,7 @@ class PersonDocGenNormalizer implements
$data = $normalizer->normalize($attributes, $format, $context);
$data['resources'] = [];
//$data['resources'] = [];
if ($context['docgen:person:with-relations'] ?? false) {
$data['relations'] = [];