mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-13 05:44:24 +00:00
Merge branch 'docgen/improve-normalizer' into issue321_layout_improvements_actionForm
This commit is contained in:
commit
edaad844aa
@ -18,6 +18,7 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
|
|||||||
use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
|
use Chill\DocGeneratorBundle\Context\Exception\ContextNotFoundException;
|
||||||
use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
|
use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
|
||||||
use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
|
use Chill\DocGeneratorBundle\GeneratorDriver\DriverInterface;
|
||||||
|
use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
|
||||||
use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
|
use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
|
||||||
use Chill\DocStoreBundle\Entity\StoredObject;
|
use Chill\DocStoreBundle\Entity\StoredObject;
|
||||||
use Chill\MainBundle\Pagination\PaginatorFactory;
|
use Chill\MainBundle\Pagination\PaginatorFactory;
|
||||||
@ -28,10 +29,15 @@ use GuzzleHttp\Exception\TransferException;
|
|||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
|
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\FileType;
|
||||||
|
use Symfony\Component\HttpFoundation\File\File;
|
||||||
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
// TODO à mettre dans services
|
// TODO à mettre dans services
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
use Symfony\Component\HttpKernel\Exception\HttpException;
|
use Symfony\Component\HttpKernel\Exception\HttpException;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
use Symfony\Component\HttpKernel\KernelInterface;
|
use Symfony\Component\HttpKernel\KernelInterface;
|
||||||
@ -78,6 +84,27 @@ final class DocGeneratorTemplateController extends AbstractController
|
|||||||
$this->client = $client;
|
$this->client = $client;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Route(
|
||||||
|
* "{_locale}/admin/doc/gen/generate/test/from/{template}/for/{entityClassName}/{entityId}",
|
||||||
|
* name="chill_docgenerator_test_generate_from_template"
|
||||||
|
* )
|
||||||
|
*/
|
||||||
|
public function adminTestGenerateDocFromTemplateAction(
|
||||||
|
DocGeneratorTemplate $template,
|
||||||
|
string $entityClassName,
|
||||||
|
int $entityId,
|
||||||
|
Request $request
|
||||||
|
): Response {
|
||||||
|
return $this->generateDocFromTemplate(
|
||||||
|
$template,
|
||||||
|
$entityClassName,
|
||||||
|
$entityId,
|
||||||
|
$request,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Route(
|
* @Route(
|
||||||
* "{_locale}/doc/gen/generate/from/{template}/for/{entityClassName}/{entityId}",
|
* "{_locale}/doc/gen/generate/from/{template}/for/{entityClassName}/{entityId}",
|
||||||
@ -89,6 +116,81 @@ final class DocGeneratorTemplateController extends AbstractController
|
|||||||
string $entityClassName,
|
string $entityClassName,
|
||||||
int $entityId,
|
int $entityId,
|
||||||
Request $request
|
Request $request
|
||||||
|
): Response {
|
||||||
|
return $this->generateDocFromTemplate(
|
||||||
|
$template,
|
||||||
|
$entityClassName,
|
||||||
|
$entityId,
|
||||||
|
$request,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Route(
|
||||||
|
* "/api/1.0/docgen/templates/by-entity/{entityClassName}",
|
||||||
|
* name="chill_docgenerator_templates_for_entity_api"
|
||||||
|
* )
|
||||||
|
*/
|
||||||
|
public function listTemplateApiAction(string $entityClassName): Response
|
||||||
|
{
|
||||||
|
$nb = $this->docGeneratorTemplateRepository->countByEntity($entityClassName);
|
||||||
|
$paginator = $this->paginatorFactory->create($nb);
|
||||||
|
$entities = $this->docGeneratorTemplateRepository->findByEntity(
|
||||||
|
$entityClassName,
|
||||||
|
$paginator->getCurrentPageFirstItemNumber(),
|
||||||
|
$paginator->getItemsPerPage()
|
||||||
|
);
|
||||||
|
|
||||||
|
return $this->json(
|
||||||
|
new Collection($entities, $paginator),
|
||||||
|
Response::HTTP_OK,
|
||||||
|
[],
|
||||||
|
[AbstractNormalizer::GROUPS => ['read']]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Route(
|
||||||
|
* "{_locale}/admin/doc/gen/generate/test/redirect",
|
||||||
|
* name="chill_docgenerator_test_generate_redirect"
|
||||||
|
* )
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function redirectToTestGenerate(Request $request): RedirectResponse
|
||||||
|
{
|
||||||
|
$template = $request->query->getInt('template');
|
||||||
|
|
||||||
|
if (null === $template) {
|
||||||
|
throw new BadRequestHttpException('template parameter is missing');
|
||||||
|
}
|
||||||
|
|
||||||
|
$entityClassName = $request->query->get('entityClassName');
|
||||||
|
|
||||||
|
if (null === $entityClassName) {
|
||||||
|
throw new BadRequestHttpException('entityClassName is missing');
|
||||||
|
}
|
||||||
|
|
||||||
|
$entityId = $request->query->get('entityId');
|
||||||
|
|
||||||
|
if (null === $entityId) {
|
||||||
|
throw new BadRequestHttpException('entityId is missing');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->redirectToRoute(
|
||||||
|
'chill_docgenerator_test_generate_from_template',
|
||||||
|
['template' => $template, 'entityClassName' => $entityClassName, 'entityId' => $entityId,
|
||||||
|
'returnPath' => $request->query->get('returnPath', '/'), ]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function generateDocFromTemplate(
|
||||||
|
DocGeneratorTemplate $template,
|
||||||
|
string $entityClassName,
|
||||||
|
int $entityId,
|
||||||
|
Request $request,
|
||||||
|
bool $isTest
|
||||||
): Response {
|
): Response {
|
||||||
try {
|
try {
|
||||||
$context = $this->contextManager->getContextByDocGeneratorTemplate($template);
|
$context = $this->contextManager->getContextByDocGeneratorTemplate($template);
|
||||||
@ -105,9 +207,25 @@ final class DocGeneratorTemplateController extends AbstractController
|
|||||||
$contextGenerationData = [];
|
$contextGenerationData = [];
|
||||||
|
|
||||||
if ($context instanceof DocGeneratorContextWithPublicFormInterface
|
if ($context instanceof DocGeneratorContextWithPublicFormInterface
|
||||||
&& $context->hasPublicForm($template, $entity)) {
|
&& $context->hasPublicForm($template, $entity) || $isTest) {
|
||||||
$builder = $this->createFormBuilder($context->getFormData($template, $entity));
|
if ($context instanceof DocGeneratorContextWithPublicFormInterface) {
|
||||||
|
$builder = $this->createFormBuilder(
|
||||||
|
array_merge(
|
||||||
|
$context->getFormData($template, $entity),
|
||||||
|
$isTest ? ['test_file' => null] : []
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$context->buildPublicForm($builder, $template, $entity);
|
$context->buildPublicForm($builder, $template, $entity);
|
||||||
|
|
||||||
|
if ($isTest) {
|
||||||
|
$builder->add('test_file', FileType::class, [
|
||||||
|
'label' => 'Template file',
|
||||||
|
'required' => false,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$form = $builder->getForm()->handleRequest($request);
|
$form = $builder->getForm()->handleRequest($request);
|
||||||
|
|
||||||
if ($form->isSubmitted() && $form->isValid()) {
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
@ -121,43 +239,72 @@ final class DocGeneratorTemplateController extends AbstractController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$getUrlGen = $this->tempUrlGenerator->generate(
|
if ($isTest && null !== $contextGenerationData['test_file']) {
|
||||||
'GET',
|
/** @var File $file */
|
||||||
$template->getFile()->getFilename()
|
$file = $contextGenerationData['test_file'];
|
||||||
);
|
$templateResource = fopen($file->getPathname(), 'rb');
|
||||||
|
} else {
|
||||||
|
$getUrlGen = $this->tempUrlGenerator->generate(
|
||||||
|
'GET',
|
||||||
|
$template->getFile()->getFilename()
|
||||||
|
);
|
||||||
|
|
||||||
$data = $this->client->request('GET', $getUrlGen->url);
|
$data = $this->client->request('GET', $getUrlGen->url);
|
||||||
|
|
||||||
$iv = $template->getFile()->getIv(); // iv as an Array
|
$iv = $template->getFile()->getIv(); // iv as an Array
|
||||||
$ivGoodFormat = pack('C*', ...$iv); // iv as a String (ok for openssl_decrypt)
|
$ivGoodFormat = pack('C*', ...$iv); // iv as a String (ok for openssl_decrypt)
|
||||||
|
|
||||||
$method = 'AES-256-CBC';
|
$method = 'AES-256-CBC';
|
||||||
|
|
||||||
$key = $template->getFile()->getKeyInfos()['k'];
|
$key = $template->getFile()->getKeyInfos()['k'];
|
||||||
$keyGoodFormat = Base64Url::decode($key);
|
$keyGoodFormat = Base64Url::decode($key);
|
||||||
|
|
||||||
$dataDecrypted = openssl_decrypt($data->getContent(), $method, $keyGoodFormat, 1, $ivGoodFormat);
|
$dataDecrypted = openssl_decrypt($data->getContent(), $method, $keyGoodFormat, 1, $ivGoodFormat);
|
||||||
|
|
||||||
if (false === $dataDecrypted) {
|
if (false === $dataDecrypted) {
|
||||||
throw new Exception('Error during Decrypt ', 1);
|
throw new Exception('Error during Decrypt ', 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (false === $templateResource = fopen('php://memory', 'r+b')) {
|
||||||
|
$this->logger->error('Could not write data to memory');
|
||||||
|
|
||||||
|
throw new HttpException(500);
|
||||||
|
}
|
||||||
|
fwrite($templateResource, $dataDecrypted);
|
||||||
|
rewind($templateResource);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (false === $templateResource = fopen('php://memory', 'r+b')) {
|
|
||||||
$this->logger->error('Could not write data to memory');
|
|
||||||
|
|
||||||
throw new HttpException(500);
|
|
||||||
}
|
|
||||||
|
|
||||||
fwrite($templateResource, $dataDecrypted);
|
|
||||||
rewind($templateResource);
|
|
||||||
|
|
||||||
$datas = $context->getData($template, $entity, $contextGenerationData);
|
$datas = $context->getData($template, $entity, $contextGenerationData);
|
||||||
dump('datas compiled', $datas);
|
dump('datas compiled', $datas);
|
||||||
|
|
||||||
$generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename());
|
try {
|
||||||
|
$generatedResource = $this->driver->generateFromResource($templateResource, $template->getFile()->getType(), $datas, $template->getFile()->getFilename());
|
||||||
|
} catch (TemplateException $e) {
|
||||||
|
$msg = implode("\n", $e->getErrors());
|
||||||
|
|
||||||
|
return new Response($msg, 400, [
|
||||||
|
'Content-Type' => 'text/plain',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
fclose($templateResource);
|
fclose($templateResource);
|
||||||
|
|
||||||
|
if ($isTest) {
|
||||||
|
return new StreamedResponse(
|
||||||
|
static function () use ($generatedResource) {
|
||||||
|
fpassthru($generatedResource);
|
||||||
|
fclose($generatedResource);
|
||||||
|
},
|
||||||
|
Response::HTTP_OK,
|
||||||
|
[
|
||||||
|
'Content-Transfer-Encoding', 'binary',
|
||||||
|
'Content-Type' => 'application/vnd.oasis.opendocument.text',
|
||||||
|
'Content-Disposition' => sprintf('attachment; filename="%s.odt"', 'generated'),
|
||||||
|
'Content-Length' => fstat($generatedResource)['size'],
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$genDocName = 'doc_' . sprintf('%010d', mt_rand()) . 'odt';
|
$genDocName = 'doc_' . sprintf('%010d', mt_rand()) . 'odt';
|
||||||
|
|
||||||
$getUrlGen = $this->tempUrlGenerator->generate(
|
$getUrlGen = $this->tempUrlGenerator->generate(
|
||||||
@ -206,28 +353,4 @@ final class DocGeneratorTemplateController extends AbstractController
|
|||||||
|
|
||||||
throw new Exception('Unable to generate document.');
|
throw new Exception('Unable to generate document.');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @Route(
|
|
||||||
* "/api/1.0/docgen/templates/by-entity/{entityClassName}",
|
|
||||||
* name="chill_docgenerator_templates_for_entity_api"
|
|
||||||
* )
|
|
||||||
*/
|
|
||||||
public function listTemplateApiAction(string $entityClassName): Response
|
|
||||||
{
|
|
||||||
$nb = $this->docGeneratorTemplateRepository->countByEntity($entityClassName);
|
|
||||||
$paginator = $this->paginatorFactory->create($nb);
|
|
||||||
$entities = $this->docGeneratorTemplateRepository->findByEntity(
|
|
||||||
$entityClassName,
|
|
||||||
$paginator->getCurrentPageFirstItemNumber(),
|
|
||||||
$paginator->getItemsPerPage()
|
|
||||||
);
|
|
||||||
|
|
||||||
return $this->json(
|
|
||||||
new Collection($entities, $paginator),
|
|
||||||
Response::HTTP_OK,
|
|
||||||
[],
|
|
||||||
[AbstractNormalizer::GROUPS => ['read']]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Chill\DocGeneratorBundle\GeneratorDriver\Exception;
|
||||||
|
|
||||||
|
use RuntimeException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A exception to throw when there are syntax errors in the
|
||||||
|
* template file.
|
||||||
|
*/
|
||||||
|
class TemplateException extends RuntimeException
|
||||||
|
{
|
||||||
|
private array $errors;
|
||||||
|
|
||||||
|
public function __construct(array $errors, $code = 0, ?Throwable $previous = null)
|
||||||
|
{
|
||||||
|
parent::__construct('Error while generating document from template', $code, $previous);
|
||||||
|
$this->errors = $errors;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getErrors(): array
|
||||||
|
{
|
||||||
|
return $this->errors;
|
||||||
|
}
|
||||||
|
}
|
@ -11,6 +11,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\DocGeneratorBundle\GeneratorDriver;
|
namespace Chill\DocGeneratorBundle\GeneratorDriver;
|
||||||
|
|
||||||
|
use Chill\DocGeneratorBundle\GeneratorDriver\Exception\TemplateException;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
|
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
|
||||||
use Symfony\Component\Mime\Part\DataPart;
|
use Symfony\Component\Mime\Part\DataPart;
|
||||||
@ -45,7 +46,7 @@ class RelatorioDriver implements DriverInterface
|
|||||||
'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType),
|
'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType),
|
||||||
];
|
];
|
||||||
$form = new FormDataPart($formFields);
|
$form = new FormDataPart($formFields);
|
||||||
|
dump(json_encode($data));
|
||||||
try {
|
try {
|
||||||
$response = $this->relatorioClient->request('POST', $this->url, [
|
$response = $this->relatorioClient->request('POST', $this->url, [
|
||||||
'headers' => $form->getPreparedHeaders()->toArray(),
|
'headers' => $form->getPreparedHeaders()->toArray(),
|
||||||
@ -54,10 +55,21 @@ class RelatorioDriver implements DriverInterface
|
|||||||
|
|
||||||
return $response->toStream();
|
return $response->toStream();
|
||||||
} catch (HttpExceptionInterface $e) {
|
} catch (HttpExceptionInterface $e) {
|
||||||
|
$content = $e->getResponse()->getContent(false);
|
||||||
|
|
||||||
|
if (400 === $e->getResponse()->getStatusCode()) {
|
||||||
|
$content = json_decode($content, true);
|
||||||
|
$this->logger->error('relatorio: template error', [
|
||||||
|
'error' => $content['message'] ?? '_not defined',
|
||||||
|
]);
|
||||||
|
|
||||||
|
throw new TemplateException([$content['message']]);
|
||||||
|
}
|
||||||
|
|
||||||
$this->logger->error('relatorio: error while generating document', [
|
$this->logger->error('relatorio: error while generating document', [
|
||||||
'msg' => $e->getMessage(),
|
'msg' => $e->getMessage(),
|
||||||
'response' => $e->getResponse()->getStatusCode(),
|
'response' => $e->getResponse()->getStatusCode(),
|
||||||
'content' => $e->getResponse()->getContent(false),
|
'content' => $content,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
throw $e;
|
throw $e;
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
<th></th>
|
<th></th>
|
||||||
<th>{{ 'Title'|trans }}</th>
|
<th>{{ 'Title'|trans }}</th>
|
||||||
<th>{{ 'docgen.Context'|trans }}</th>
|
<th>{{ 'docgen.Context'|trans }}</th>
|
||||||
|
<th>{{ 'docgen.test generate'|trans }}</th>
|
||||||
<th>{{ 'Edit'|trans }}</th>
|
<th>{{ 'Edit'|trans }}</th>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
@ -13,8 +14,22 @@
|
|||||||
{% for entity in entities %}
|
{% for entity in entities %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ entity.id }}</td>
|
<td>{{ entity.id }}</td>
|
||||||
<td>{{ entity.name | localize_translatable_string }}</td>
|
<td>{{ entity.name|localize_translatable_string}}</td>
|
||||||
<td>{{ contextManager.getContextByKey(entity.context).name|trans }}</td>
|
<td>{{ contextManager.getContextByKey(entity.context).name|trans }}</td>
|
||||||
|
<td>
|
||||||
|
<form method="get" action="{{ path('chill_docgenerator_test_generate_redirect') }}">
|
||||||
|
<input type="hidden" name="returnPath" value="{{ app.request.query.get('returnPath', '/')|e('html_attr') }}" />
|
||||||
|
<input type="hidden" name="template" value="{{ entity.id|e('html_attr') }}" />
|
||||||
|
<input type="hidden" name="entityClassName" value="{{ contextManager.getContextByKey(entity.context).entityClass|e('html_attr') }}" />
|
||||||
|
<input type="text" name="entityId" />
|
||||||
|
|
||||||
|
<ul class="record_actions">
|
||||||
|
<li>
|
||||||
|
<button type="submit" class="btn btn-mini btn-neutral">{{ 'docgen.test generate'|trans }}</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</form>
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="{{ chill_path_add_return_path('chill_crud_docgen_template_edit', { 'id': entity.id }) }}" class="btn btn-edit">
|
<a href="{{ chill_path_add_return_path('chill_crud_docgen_template_edit', { 'id': entity.id }) }}" class="btn btn-edit">
|
||||||
{{ 'Edit'|trans }}
|
{{ 'Edit'|trans }}
|
||||||
|
@ -98,8 +98,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
|
|||||||
if ($reflection->hasProperty($attribute->getName())) {
|
if ($reflection->hasProperty($attribute->getName())) {
|
||||||
if (!$reflection->getProperty($attribute->getName())->hasType()) {
|
if (!$reflection->getProperty($attribute->getName())->hasType()) {
|
||||||
throw new \LogicException(sprintf(
|
throw new \LogicException(sprintf(
|
||||||
'Could not determine how the content is determined for the attribute %s. Add a type on this property',
|
'Could not determine how the content is determined for the attribute %s on class %s. Add a type on this property',
|
||||||
$attribute->getName()
|
$attribute->getName(),
|
||||||
|
$reflection->getName()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,8 +108,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
|
|||||||
} elseif ($reflection->hasMethod($method = 'get' . ucfirst($attribute->getName()))) {
|
} elseif ($reflection->hasMethod($method = 'get' . ucfirst($attribute->getName()))) {
|
||||||
if (!$reflection->getMethod($method)->hasReturnType()) {
|
if (!$reflection->getMethod($method)->hasReturnType()) {
|
||||||
throw new \LogicException(sprintf(
|
throw new \LogicException(sprintf(
|
||||||
'Could not determine how the content is determined for the attribute %s. Add a return type on the method',
|
'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
|
||||||
$attribute->getName()
|
$attribute->getName(),
|
||||||
|
$reflection->getName()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,8 +118,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
|
|||||||
} elseif ($reflection->hasMethod($method = 'is' . ucfirst($attribute->getName()))) {
|
} elseif ($reflection->hasMethod($method = 'is' . ucfirst($attribute->getName()))) {
|
||||||
if (!$reflection->getMethod($method)->hasReturnType()) {
|
if (!$reflection->getMethod($method)->hasReturnType()) {
|
||||||
throw new \LogicException(sprintf(
|
throw new \LogicException(sprintf(
|
||||||
'Could not determine how the content is determined for the attribute %s. Add a return type on the method',
|
'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
|
||||||
$attribute->getName()
|
$attribute->getName(),
|
||||||
|
$reflection->getName()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -125,8 +128,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
|
|||||||
} elseif ($reflection->hasMethod($attribute->getName())) {
|
} elseif ($reflection->hasMethod($attribute->getName())) {
|
||||||
if (!$reflection->getMethod($attribute->getName())->hasReturnType()) {
|
if (!$reflection->getMethod($attribute->getName())->hasReturnType()) {
|
||||||
throw new \LogicException(sprintf(
|
throw new \LogicException(sprintf(
|
||||||
'Could not determine how the content is determined for the attribute %s. Add a return type on the method',
|
'Could not determine how the content is determined for the attribute %s on class %s. Add a return type on the method',
|
||||||
$attribute->getName()
|
$attribute->getName(),
|
||||||
|
$reflection->getName()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,8 +11,9 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\DocStoreBundle\Form;
|
namespace Chill\DocStoreBundle\Form;
|
||||||
|
|
||||||
|
use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
|
||||||
use Chill\DocStoreBundle\Entity\Document;
|
use Chill\DocStoreBundle\Entity\Document;
|
||||||
use Chill\DocStoreBundle\Entity\PersonDocument;
|
use Chill\DocStoreBundle\Entity\DocumentCategory;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Form\Type\ChillDateType;
|
use Chill\MainBundle\Form\Type\ChillDateType;
|
||||||
use Chill\MainBundle\Form\Type\ChillTextareaType;
|
use Chill\MainBundle\Form\Type\ChillTextareaType;
|
||||||
@ -70,11 +71,11 @@ class AccompanyingCourseDocumentType extends AbstractType
|
|||||||
//TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
|
//TODO : adapt to using AccompanyingCourseDocument categories. Currently there are none...
|
||||||
->add('category', EntityType::class, [
|
->add('category', EntityType::class, [
|
||||||
'placeholder' => 'Choose a document category',
|
'placeholder' => 'Choose a document category',
|
||||||
'class' => 'ChillDocStoreBundle:DocumentCategory',
|
'class' => DocumentCategory::class,
|
||||||
'query_builder' => static function (EntityRepository $er) {
|
'query_builder' => static function (EntityRepository $er) {
|
||||||
return $er->createQueryBuilder('c')
|
return $er->createQueryBuilder('c')
|
||||||
->where('c.documentClass = :docClass')
|
->where('c.documentClass = :docClass')
|
||||||
->setParameter('docClass', PersonDocument::class);
|
->setParameter('docClass', AccompanyingCourseDocument::class);
|
||||||
},
|
},
|
||||||
'choice_label' => function ($entity = null) {
|
'choice_label' => function ($entity = null) {
|
||||||
return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
|
return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
|
||||||
|
@ -41,5 +41,6 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block css %}
|
{% block css %}
|
||||||
|
{{ parent() }}
|
||||||
{{ encore_entry_link_tags('mod_async_upload') }}
|
{{ encore_entry_link_tags('mod_async_upload') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -42,5 +42,6 @@
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block css %}
|
{% block css %}
|
||||||
|
{{ parent() }}
|
||||||
{{ encore_entry_link_tags('mod_async_upload') }}
|
{{ encore_entry_link_tags('mod_async_upload') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -14,6 +14,11 @@
|
|||||||
{{ encore_entry_script_tags('mod_async_upload') }}
|
{{ encore_entry_script_tags('mod_async_upload') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block css %}
|
||||||
|
{{ parent() }}
|
||||||
|
{{ encore_entry_link_tags('mod_async_upload') }}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
|
<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
|
||||||
|
@ -38,8 +38,9 @@ class Center implements HasCenterInterface
|
|||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\Column(name="id", type="integer")
|
* @ORM\Column(name="id", type="integer")
|
||||||
* @ORM\GeneratedValue(strategy="AUTO")
|
* @ORM\GeneratedValue(strategy="AUTO")
|
||||||
|
* @Serializer\Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="string", length=255)
|
* @ORM\Column(type="string", length=255)
|
||||||
|
@ -22,7 +22,7 @@ class Civility
|
|||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
* @Serializer\Groups({"read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private array $abbreviation = [];
|
private array $abbreviation = [];
|
||||||
|
|
||||||
@ -35,13 +35,13 @@ class Civility
|
|||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\GeneratedValue
|
* @ORM\GeneratedValue
|
||||||
* @ORM\Column(type="integer")
|
* @ORM\Column(type="integer")
|
||||||
* @Serializer\Groups({"read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
* @Serializer\Groups({"read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private array $name = [];
|
private array $name = [];
|
||||||
|
|
||||||
|
@ -28,24 +28,20 @@ use Symfony\Component\Serializer\Annotation\Groups;
|
|||||||
class Scope
|
class Scope
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var int
|
|
||||||
*
|
|
||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\Column(name="id", type="integer")
|
* @ORM\Column(name="id", type="integer")
|
||||||
* @ORM\GeneratedValue(strategy="AUTO")
|
* @ORM\GeneratedValue(strategy="AUTO")
|
||||||
* @Groups({"read", "docgen:read"})
|
* @Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* translatable names.
|
* translatable names.
|
||||||
*
|
*
|
||||||
* @var array
|
|
||||||
*
|
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
* @Groups({"read", "docgen:read"})
|
* @Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $name = [];
|
private array $name = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var Collection
|
* @var Collection
|
||||||
|
@ -55,7 +55,6 @@ class User implements AdvancedUserInterface
|
|||||||
* @var string
|
* @var string
|
||||||
*
|
*
|
||||||
* @ORM\Column(type="string", length=150, nullable=true)
|
* @ORM\Column(type="string", length=150, nullable=true)
|
||||||
* @Serializer\Groups({"docgen:read"})
|
|
||||||
*/
|
*/
|
||||||
private ?string $email = null;
|
private ?string $email = null;
|
||||||
|
|
||||||
@ -83,7 +82,6 @@ class User implements AdvancedUserInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="string", length=200)
|
* @ORM\Column(type="string", length=200)
|
||||||
* @Serializer\Groups({"docgen:read"})
|
|
||||||
*/
|
*/
|
||||||
private string $label = '';
|
private string $label = '';
|
||||||
|
|
||||||
@ -95,7 +93,6 @@ class User implements AdvancedUserInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\ManyToOne(targetEntity=Center::class)
|
* @ORM\ManyToOne(targetEntity=Center::class)
|
||||||
* @Serializer\Groups({"docgen:read"})
|
|
||||||
*/
|
*/
|
||||||
private ?Center $mainCenter = null;
|
private ?Center $mainCenter = null;
|
||||||
|
|
||||||
|
@ -32,14 +32,14 @@ class UserJob
|
|||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\Column(name="id", type="integer")
|
* @ORM\Column(name="id", type="integer")
|
||||||
* @ORM\GeneratedValue(strategy="AUTO")
|
* @ORM\GeneratedValue(strategy="AUTO")
|
||||||
* @Serializer\Groups({"read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
protected ?int $id = null;
|
protected ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var array|string[]A
|
* @var array|string[]A
|
||||||
* @ORM\Column(name="label", type="json")
|
* @ORM\Column(name="label", type="json")
|
||||||
* @Serializer\Groups({"read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
protected array $label = [];
|
protected array $label = [];
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ class PhonenumberHelper
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$validation = json_decode($response->getBody())->carrier->type;
|
$validation = json_decode($response->getBody()->getContents())->carrier->type;
|
||||||
|
|
||||||
$item
|
$item
|
||||||
->set($validation)
|
->set($validation)
|
||||||
|
@ -11,18 +11,31 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\MainBundle\Serializer\Normalizer;
|
namespace Chill\MainBundle\Serializer\Normalizer;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Entity\Center;
|
||||||
|
use Chill\MainBundle\Entity\Scope;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
|
use Chill\MainBundle\Entity\UserJob;
|
||||||
use Chill\MainBundle\Templating\Entity\UserRender;
|
use Chill\MainBundle\Templating\Entity\UserRender;
|
||||||
|
use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
|
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
|
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
||||||
|
|
||||||
class UserNormalizer implements NormalizerAwareInterface, NormalizerInterface
|
class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
|
||||||
{
|
{
|
||||||
use NormalizerAwareTrait;
|
use NormalizerAwareTrait;
|
||||||
|
|
||||||
private UserRender $userRender;
|
private UserRender $userRender;
|
||||||
|
|
||||||
|
const NULL_USER = [
|
||||||
|
'type' => 'user',
|
||||||
|
'id' => '',
|
||||||
|
'username' => '',
|
||||||
|
'text' => '',
|
||||||
|
'label' => '',
|
||||||
|
'email' => '',
|
||||||
|
];
|
||||||
|
|
||||||
public function __construct(UserRender $userRender)
|
public function __construct(UserRender $userRender)
|
||||||
{
|
{
|
||||||
$this->userRender = $userRender;
|
$this->userRender = $userRender;
|
||||||
@ -31,20 +44,42 @@ class UserNormalizer implements NormalizerAwareInterface, NormalizerInterface
|
|||||||
public function normalize($user, ?string $format = null, array $context = [])
|
public function normalize($user, ?string $format = null, array $context = [])
|
||||||
{
|
{
|
||||||
/** @var User $user */
|
/** @var User $user */
|
||||||
|
$userJobContext = array_merge(
|
||||||
|
$context, ['docgen:expects' => UserJob::class, 'groups' => 'docgen:read']);
|
||||||
|
$scopeContext = array_merge(
|
||||||
|
$context, ['docgen:expects' => Scope::class, 'groups' => 'docgen:read']);
|
||||||
|
$centerContext = array_merge(
|
||||||
|
$context, ['docgen:expects' => Center::class, 'groups' => 'docgen:read']);
|
||||||
|
|
||||||
|
if (null === $user && 'docgen' === $format) {
|
||||||
|
return array_merge(self::NULL_USER, [
|
||||||
|
'user_job' => $this->normalizer->normalize(null, $format, $userJobContext),
|
||||||
|
'main_center' => $this->normalizer->normalize(null, $format, $centerContext),
|
||||||
|
'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext),
|
||||||
|
]);
|
||||||
|
}
|
||||||
return [
|
return [
|
||||||
'type' => 'user',
|
'type' => 'user',
|
||||||
'id' => $user->getId(),
|
'id' => $user->getId(),
|
||||||
'username' => $user->getUsername(),
|
'username' => $user->getUsername(),
|
||||||
'text' => $this->userRender->renderString($user, []),
|
'text' => $this->userRender->renderString($user, []),
|
||||||
'label' => $user->getLabel(),
|
'label' => $user->getLabel(),
|
||||||
'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $context),
|
'email' => $user->getEmail(),
|
||||||
'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $context),
|
'user_job' => $this->normalizer->normalize($user->getUserJob(), $format, $userJobContext),
|
||||||
'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $context),
|
'main_center' => $this->normalizer->normalize($user->getMainCenter(), $format, $centerContext),
|
||||||
|
'main_scope' => $this->normalizer->normalize($user->getMainScope(), $format, $scopeContext),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function supportsNormalization($data, ?string $format = null): bool
|
public function supportsNormalization($data, ?string $format = null, array $context = []): bool
|
||||||
{
|
{
|
||||||
return $data instanceof User && ('json' === $format || 'docgen' === $format);
|
if ($data instanceof User && ('json' === $format || 'docgen' === $format)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (null === $data && 'docgen' === $format && User::class === ($context['docgen:expects'] ?? null)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,10 +14,10 @@ namespace Chill\PersonBundle\Controller;
|
|||||||
use Chill\MainBundle\CRUD\Controller\ApiController;
|
use Chill\MainBundle\CRUD\Controller\ApiController;
|
||||||
use Chill\PersonBundle\Entity\Person;
|
use Chill\PersonBundle\Entity\Person;
|
||||||
use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
|
use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
|
||||||
|
use Chill\PersonBundle\Security\Authorization\PersonVoter;
|
||||||
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
|
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||||
use function array_values;
|
|
||||||
|
|
||||||
class RelationshipApiController extends ApiController
|
class RelationshipApiController extends ApiController
|
||||||
{
|
{
|
||||||
@ -36,9 +36,10 @@ class RelationshipApiController extends ApiController
|
|||||||
*/
|
*/
|
||||||
public function getRelationshipsByPerson(Person $person)
|
public function getRelationshipsByPerson(Person $person)
|
||||||
{
|
{
|
||||||
//TODO: add permissions? (voter?)
|
$this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
|
||||||
|
|
||||||
$relationships = $this->repository->findByPerson($person);
|
$relationships = $this->repository->findByPerson($person);
|
||||||
|
|
||||||
return $this->json(array_values($relationships), Response::HTTP_OK, [], ['groups' => ['read']]);
|
return $this->json($relationships, Response::HTTP_OK, [], ['groups' => ['read']]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ class HouseholdMember
|
|||||||
* @ORM\Column(type="integer")
|
* @ORM\Column(type="integer")
|
||||||
* @Serializer\Groups({"read", "docgen:read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var Person
|
* @var Person
|
||||||
@ -73,6 +73,7 @@ class HouseholdMember
|
|||||||
* targetEntity="\Chill\PersonBundle\Entity\Person"
|
* targetEntity="\Chill\PersonBundle\Entity\Person"
|
||||||
* )
|
* )
|
||||||
* @Serializer\Groups({"read", "docgen:read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
|
* @Serializer\Context({"docgen:person:with-household": false})
|
||||||
* @Assert\Valid(groups={"household_memberships"})
|
* @Assert\Valid(groups={"household_memberships"})
|
||||||
* @Assert\NotNull(groups={"household_memberships"})
|
* @Assert\NotNull(groups={"household_memberships"})
|
||||||
*/
|
*/
|
||||||
|
@ -35,7 +35,7 @@ class Position
|
|||||||
* @ORM\Column(type="integer")
|
* @ORM\Column(type="integer")
|
||||||
* @Serializer\Groups({"read", "docgen:read"})
|
* @Serializer\Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?int $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
|
@ -588,8 +588,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// a period opened and another one after it
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function used for validation that check if the accompanying periods of
|
* Function used for validation that check if the accompanying periods of
|
||||||
* the person are not collapsing (i.e. have not shared days) or having
|
* the person are not collapsing (i.e. have not shared days) or having
|
||||||
|
@ -19,6 +19,7 @@ use DateTimeImmutable;
|
|||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Doctrine\ORM\Mapping\DiscriminatorColumn;
|
use Doctrine\ORM\Mapping\DiscriminatorColumn;
|
||||||
|
use RuntimeException;
|
||||||
use Symfony\Component\Serializer\Annotation as Serializer;
|
use Symfony\Component\Serializer\Annotation as Serializer;
|
||||||
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
|
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
|
||||||
use Symfony\Component\Validator\Constraints as Assert;
|
use Symfony\Component\Validator\Constraints as Assert;
|
||||||
@ -116,6 +117,27 @@ class Relationship implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
return $this->id;
|
return $this->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the opposite person of the @see{counterpart} person.
|
||||||
|
*
|
||||||
|
* this is the from person if the given is associated to the To,
|
||||||
|
* or the To person otherwise.
|
||||||
|
*
|
||||||
|
* @throw RuntimeException if the counterpart is neither in the from or to person
|
||||||
|
*/
|
||||||
|
public function getOpposite(Person $counterpart): Person
|
||||||
|
{
|
||||||
|
if ($this->fromPerson !== $counterpart && $this->toPerson !== $counterpart) {
|
||||||
|
throw new RuntimeException('the counterpart is neither the from nor to person for this relationship');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->fromPerson === $counterpart) {
|
||||||
|
return $this->toPerson;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->fromPerson;
|
||||||
|
}
|
||||||
|
|
||||||
public function getRelation(): ?Relation
|
public function getRelation(): ?Relation
|
||||||
{
|
{
|
||||||
return $this->relation;
|
return $this->relation;
|
||||||
|
@ -11,18 +11,31 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\PersonBundle\Repository\Relationships;
|
namespace Chill\PersonBundle\Repository\Relationships;
|
||||||
|
|
||||||
|
use Chill\PersonBundle\Entity\Person;
|
||||||
use Chill\PersonBundle\Entity\Relationships\Relationship;
|
use Chill\PersonBundle\Entity\Relationships\Relationship;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
|
use Doctrine\ORM\QueryBuilder;
|
||||||
use Doctrine\Persistence\ObjectRepository;
|
use Doctrine\Persistence\ObjectRepository;
|
||||||
|
|
||||||
class RelationshipRepository implements ObjectRepository
|
class RelationshipRepository implements ObjectRepository
|
||||||
{
|
{
|
||||||
|
private EntityManagerInterface $em;
|
||||||
|
|
||||||
private EntityRepository $repository;
|
private EntityRepository $repository;
|
||||||
|
|
||||||
public function __construct(EntityManagerInterface $em)
|
public function __construct(EntityManagerInterface $em)
|
||||||
{
|
{
|
||||||
$this->repository = $em->getRepository(Relationship::class);
|
$this->repository = $em->getRepository(Relationship::class);
|
||||||
|
$this->em = $em;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function countByPerson(Person $person): int
|
||||||
|
{
|
||||||
|
return $this->buildQueryByPerson($person)
|
||||||
|
->select('COUNT(p)')
|
||||||
|
->getQuery()
|
||||||
|
->getSingleScalarResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find($id): ?Relationship
|
public function find($id): ?Relationship
|
||||||
@ -40,15 +53,13 @@ class RelationshipRepository implements ObjectRepository
|
|||||||
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
|
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findByPerson($personId): array
|
/**
|
||||||
|
* @return array|Relationship[]
|
||||||
|
*/
|
||||||
|
public function findByPerson(Person $person): array
|
||||||
{
|
{
|
||||||
// return all relationships of which person is part? or only where person is the fromPerson?
|
return $this->buildQueryByPerson($person)
|
||||||
return $this->repository->createQueryBuilder('r')
|
->select('r')
|
||||||
->select('r, t') // entity Relationship
|
|
||||||
->join('r.relation', 't')
|
|
||||||
->where('r.fromPerson = :val')
|
|
||||||
->orWhere('r.toPerson = :val')
|
|
||||||
->setParameter('val', $personId)
|
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getResult();
|
->getResult();
|
||||||
}
|
}
|
||||||
@ -62,4 +73,20 @@ class RelationshipRepository implements ObjectRepository
|
|||||||
{
|
{
|
||||||
return Relationship::class;
|
return Relationship::class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function buildQueryByPerson(Person $person): QueryBuilder
|
||||||
|
{
|
||||||
|
$qb = $this->em->createQueryBuilder();
|
||||||
|
$qb
|
||||||
|
->from(Relationship::class, 'r')
|
||||||
|
->where(
|
||||||
|
$qb->expr()->orX(
|
||||||
|
$qb->expr()->eq('r.fromPerson', ':person'),
|
||||||
|
$qb->expr()->eq('r.toPerson', ':person')
|
||||||
|
)
|
||||||
|
)
|
||||||
|
->setParameter('person', $person);
|
||||||
|
|
||||||
|
return $qb;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,8 @@ use Chill\MainBundle\Entity\User;
|
|||||||
use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
|
use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
||||||
use Chill\PersonBundle\Entity\AccompanyingPeriod;
|
use Chill\PersonBundle\Entity\AccompanyingPeriod;
|
||||||
|
use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
|
||||||
|
use Chill\PersonBundle\Entity\Person;
|
||||||
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
|
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
|
||||||
use Chill\PersonBundle\Templating\Entity\ClosingMotiveRender;
|
use Chill\PersonBundle\Templating\Entity\ClosingMotiveRender;
|
||||||
use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
|
use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
|
||||||
@ -89,17 +91,6 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
|
|||||||
public function normalize($period, ?string $format = null, array $context = [])
|
public function normalize($period, ?string $format = null, array $context = [])
|
||||||
{
|
{
|
||||||
if ($period instanceof AccompanyingPeriod) {
|
if ($period instanceof AccompanyingPeriod) {
|
||||||
$ignored = $context[self::IGNORE_FIRST_PASS_KEY] ?? [];
|
|
||||||
$ignored[] = spl_object_hash($period);
|
|
||||||
$initial =
|
|
||||||
$this->normalizer->normalize($period, $format, array_merge(
|
|
||||||
$context,
|
|
||||||
[self::IGNORE_FIRST_PASS_KEY => $ignored, AbstractNormalizer::GROUPS => 'docgen:read']
|
|
||||||
));
|
|
||||||
|
|
||||||
// some transformation
|
|
||||||
$user = $initial['user'];
|
|
||||||
unset($initial['user']);
|
|
||||||
|
|
||||||
$scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : [];
|
$scopes = $this->scopeResolverDispatcher->isConcerned($period) ? $this->scopeResolverDispatcher->resolveScope($period) : [];
|
||||||
|
|
||||||
@ -107,28 +98,45 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
|
|||||||
$scopes = [$scopes];
|
$scopes = [$scopes];
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_merge(
|
$dateContext = array_merge($context, ['docgen:expects' => DateTime::class, 'groups' => 'docgen:read']);
|
||||||
// get a first default data
|
$userContext = array_merge($context, ['docgen:expects' => User::class, 'groups' => 'docgen:read']);
|
||||||
$initial,
|
$participationContext = array_merge($context, ['docgen:expects' => AccompanyingPeriodParticipation::class, 'groups' => 'docgen:read']);
|
||||||
// and add data custom
|
|
||||||
[
|
return [
|
||||||
'intensity' => $this->translator->trans($period->getIntensity()),
|
'id' => $period->getId(),
|
||||||
'step' => $this->translator->trans('accompanying_period.' . $period->getStep()),
|
'closingDate' => $this->normalizer->normalize($period->getClosingDate(), $format, $dateContext),
|
||||||
'emergencyText' => $period->isEmergency() ? $this->translator->trans('accompanying_period.emergency') : '',
|
'confidential' => $period->isConfidential(),
|
||||||
'confidentialText' => $period->isConfidential() ? $this->translator->trans('confidential') : '',
|
'createdAt' => $this->normalizer->normalize($period->getCreatedAt(), $format, $dateContext),
|
||||||
//'originText' => null !== $period->getOrigin() ? $this->translatableStringHelper->localize($period->getOrigin()->getLabel()) : '',
|
'createdBy' => $this->normalizer->normalize($period->getCreatedBy(), $format, $userContext),
|
||||||
'closingMotiveText' => null !== $period->getClosingMotive() ?
|
'emergency' => $period->isEmergency(),
|
||||||
$this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '',
|
'openingDate' => $this->normalizer->normalize($period->getOpeningDate(), $format, $dateContext),
|
||||||
'ref' => $user,
|
'origin' => $this->normalizer->normalize($period->getOrigin(), $format, array_merge($context, ['docgen:expects' => AccompanyingPeriod\Origin::class])),
|
||||||
'socialIssuesText' => implode(', ', array_map(function (SocialIssue $s) {
|
'participations' => $this->normalizer->normalize($period->getParticipations(), $format, $participationContext),
|
||||||
return $this->socialIssueRender->renderString($s, []);
|
'currentParticipations' => $this->normalizer->normalize($period->getCurrentParticipations(), $format, $participationContext),
|
||||||
}, $period->getSocialIssues()->toArray())),
|
'requestorAnonymous' => $period->isRequestorAnonymous(),
|
||||||
'scopesText' => implode(', ', array_map(function (Scope $s) {
|
'requestor' => $this->normalizer->normalize($period->getRequestor(), $format, array_merge($context, ['docgen:expects' => Person::class])),
|
||||||
return $this->translatableStringHelper->localize($s->getName());
|
'resources' => $this->normalizer->normalize($period->getResources(), $format, $context),
|
||||||
}, $scopes)),
|
'scopes' => $this->normalizer->normalize($period->getScopes(), $format, array_merge($context, ['docgen:expects' => Scope::class, 'groups' => 'docgen:read'])),
|
||||||
'scopes' => $scopes,
|
'socialIssues' => $this->normalizer->normalize($period->getSocialIssues(), $format, $context),
|
||||||
]
|
'intensity' => $this->translator->trans($period->getIntensity()),
|
||||||
);
|
'step' => $this->translator->trans('accompanying_period.' . $period->getStep()),
|
||||||
|
'emergencyText' => $period->isEmergency() ? $this->translator->trans('accompanying_period.emergency') : '',
|
||||||
|
'confidentialText' => $period->isConfidential() ? $this->translator->trans('confidential') : '',
|
||||||
|
//'originText' => null !== $period->getOrigin() ? $this->translatableStringHelper->localize($period->getOrigin()->getLabel()) : '',
|
||||||
|
'isClosed' => $period->getClosingDate() !== null,
|
||||||
|
'closingMotiveText' => null !== $period->getClosingMotive() ?
|
||||||
|
$this->closingMotiveRender->renderString($period->getClosingMotive(), []) : '',
|
||||||
|
'ref' => $this->normalizer->normalize($period->getUser(), $format, $userContext),
|
||||||
|
'hasRef' => $period->getUser() !== null,
|
||||||
|
'socialIssuesText' => implode(', ', array_map(function (SocialIssue $s) {
|
||||||
|
return $this->socialIssueRender->renderString($s, []);
|
||||||
|
}, $period->getSocialIssues()->toArray())),
|
||||||
|
'scopesText' => implode(', ', array_map(function (Scope $s) {
|
||||||
|
return $this->translatableStringHelper->localize($s->getName());
|
||||||
|
}, $scopes)),
|
||||||
|
//'scopes' => $scopes,
|
||||||
|
'hasRequestor' => $period->getRequestor() !== null,
|
||||||
|
];
|
||||||
} elseif (null === $period) {
|
} elseif (null === $period) {
|
||||||
return self::PERIOD_NULL;
|
return self::PERIOD_NULL;
|
||||||
}
|
}
|
||||||
@ -143,10 +151,10 @@ class AccompanyingPeriodDocGenNormalizer implements ContextAwareNormalizerInterf
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($data instanceof AccompanyingPeriod) {
|
if ($data instanceof AccompanyingPeriod) {
|
||||||
if (array_key_exists(self::IGNORE_FIRST_PASS_KEY, $context)
|
/*if (array_key_exists(self::IGNORE_FIRST_PASS_KEY, $context)
|
||||||
&& in_array(spl_object_hash($data), $context[self::IGNORE_FIRST_PASS_KEY], true)) {
|
&& in_array(spl_object_hash($data), $context[self::IGNORE_FIRST_PASS_KEY], true)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -13,8 +13,10 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
|
|||||||
|
|
||||||
use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
|
use Chill\DocGeneratorBundle\Serializer\Helper\NormalizeNullValueHelper;
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
||||||
|
use Chill\PersonBundle\Entity\Household\Household;
|
||||||
use Chill\PersonBundle\Entity\Person;
|
use Chill\PersonBundle\Entity\Person;
|
||||||
use Chill\PersonBundle\Entity\PersonAltName;
|
use Chill\PersonBundle\Entity\PersonAltName;
|
||||||
|
use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
|
||||||
use Chill\PersonBundle\Templating\Entity\PersonRender;
|
use Chill\PersonBundle\Templating\Entity\PersonRender;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
|
use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
|
||||||
@ -33,16 +35,20 @@ class PersonDocGenNormalizer implements
|
|||||||
|
|
||||||
private PersonRender $personRender;
|
private PersonRender $personRender;
|
||||||
|
|
||||||
|
private RelationshipRepository $relationshipRepository;
|
||||||
|
|
||||||
private TranslatableStringHelper $translatableStringHelper;
|
private TranslatableStringHelper $translatableStringHelper;
|
||||||
|
|
||||||
private TranslatorInterface $translator;
|
private TranslatorInterface $translator;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
PersonRender $personRender,
|
PersonRender $personRender,
|
||||||
|
RelationshipRepository $relationshipRepository,
|
||||||
TranslatorInterface $translator,
|
TranslatorInterface $translator,
|
||||||
TranslatableStringHelper $translatableStringHelper
|
TranslatableStringHelper $translatableStringHelper
|
||||||
) {
|
) {
|
||||||
$this->personRender = $personRender;
|
$this->personRender = $personRender;
|
||||||
|
$this->relationshipRepository = $relationshipRepository;
|
||||||
$this->translator = $translator;
|
$this->translator = $translator;
|
||||||
$this->translatableStringHelper = $translatableStringHelper;
|
$this->translatableStringHelper = $translatableStringHelper;
|
||||||
}
|
}
|
||||||
@ -57,7 +63,8 @@ class PersonDocGenNormalizer implements
|
|||||||
return $this->normalizeNullValue($format, $context);
|
return $this->normalizeNullValue($format, $context);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
$data = [
|
||||||
|
'kind' => 'person',
|
||||||
'firstname' => $person->getFirstName(),
|
'firstname' => $person->getFirstName(),
|
||||||
'lastname' => $person->getLastName(),
|
'lastname' => $person->getLastName(),
|
||||||
'altNames' => implode(
|
'altNames' => implode(
|
||||||
@ -84,6 +91,28 @@ class PersonDocGenNormalizer implements
|
|||||||
'memo' => $person->getMemo(),
|
'memo' => $person->getMemo(),
|
||||||
'numberOfChildren' => (string) $person->getNumberOfChildren(),
|
'numberOfChildren' => (string) $person->getNumberOfChildren(),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if ($context['docgen:person:with-household'] ?? false) {
|
||||||
|
$data['household'] = $this->normalizer->normalize(
|
||||||
|
$person->getCurrentHousehold(),
|
||||||
|
$format,
|
||||||
|
array_merge($context, ['docgen:expects' => Household::class])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($context['docgen:person:with-relations'] ?? false) {
|
||||||
|
$data['relations'] = $this->normalizer->normalize(
|
||||||
|
$this->relationshipRepository->findByPerson($person),
|
||||||
|
$format,
|
||||||
|
array_merge($context, [
|
||||||
|
'docgen:person:with-household' => false,
|
||||||
|
'docgen:person:with-relation' => false,
|
||||||
|
'docgen:relationship:counterpart' => $person,
|
||||||
|
])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function supportsNormalization($data, ?string $format = null, array $context = [])
|
public function supportsNormalization($data, ?string $format = null, array $context = [])
|
||||||
|
@ -0,0 +1,90 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Chill\PersonBundle\Serializer\Normalizer;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
||||||
|
use Chill\PersonBundle\Entity\Person;
|
||||||
|
use Chill\PersonBundle\Entity\Relationships\Relationship;
|
||||||
|
use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
|
||||||
|
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
|
||||||
|
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
|
||||||
|
|
||||||
|
class RelationshipDocGenNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
|
||||||
|
{
|
||||||
|
use NormalizerAwareTrait;
|
||||||
|
|
||||||
|
private TranslatableStringHelperInterface $translatableStringHelper;
|
||||||
|
|
||||||
|
public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
|
||||||
|
{
|
||||||
|
$this->translatableStringHelper = $translatableStringHelper;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Relationship $relation
|
||||||
|
*/
|
||||||
|
public function normalize($relation, ?string $format = null, array $context = [])
|
||||||
|
{
|
||||||
|
$counterpart = $context['docgen:relationship:counterpart'] ?? null;
|
||||||
|
$contextPerson = array_merge($context, [
|
||||||
|
'docgen:person:with-relation' => false,
|
||||||
|
'docgen:relationship:counterpart' => null,
|
||||||
|
'docgen:expects' => Person::class,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (null !== $counterpart) {
|
||||||
|
$opposite = $relation->getOpposite($counterpart);
|
||||||
|
} else {
|
||||||
|
$opposite = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null === $relation) {
|
||||||
|
return [
|
||||||
|
'id' => '',
|
||||||
|
'fromPerson' => $nullPerson = $this->normalizer->normalize(null, $format, $contextPerson),
|
||||||
|
'toPerson' => $nullPerson,
|
||||||
|
'opposite' => $nullPerson,
|
||||||
|
'text' => '',
|
||||||
|
'relationId' => '',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $relation->getId(),
|
||||||
|
'fromPerson' => $this->normalizer->normalize(
|
||||||
|
$relation->getFromPerson(),
|
||||||
|
$format,
|
||||||
|
$contextPerson
|
||||||
|
),
|
||||||
|
'toPerson' => $this->normalizer->normalize(
|
||||||
|
$relation->getToPerson(),
|
||||||
|
$format,
|
||||||
|
$contextPerson
|
||||||
|
),
|
||||||
|
'text' => $relation->getReverse() ?
|
||||||
|
$this->translatableStringHelper->localize($relation->getRelation()->getReverseTitle()) :
|
||||||
|
$this->translatableStringHelper->localize($relation->getRelation()->getTitle()),
|
||||||
|
'opposite' => $this->normalizer->normalize($opposite, $format, $contextPerson),
|
||||||
|
'relationId' => $relation->getRelation()->getId(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function supportsNormalization($data, ?string $format = null, array $context = [])
|
||||||
|
{
|
||||||
|
if ('docgen' !== $format) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data instanceof Relationship || (null === $data
|
||||||
|
&& Relationship::class === ($context['docgen:expects'] ?? null));
|
||||||
|
}
|
||||||
|
}
|
@ -36,8 +36,8 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte
|
|||||||
'id' => $socialAction->getId(),
|
'id' => $socialAction->getId(),
|
||||||
'type' => 'social_work_social_action',
|
'type' => 'social_work_social_action',
|
||||||
'text' => $this->render->renderString($socialAction, []),
|
'text' => $this->render->renderString($socialAction, []),
|
||||||
'parent' => $this->normalizer->normalize($socialAction->getParent()),
|
'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, $context),
|
||||||
'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate()),
|
'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate(), $format, $context),
|
||||||
'title' => $socialAction->getTitle(),
|
'title' => $socialAction->getTitle(),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -68,6 +68,8 @@ class AccompanyingPeriodContext implements
|
|||||||
|
|
||||||
public function adminFormReverseTransform(array $data): array
|
public function adminFormReverseTransform(array $data): array
|
||||||
{
|
{
|
||||||
|
dump($data);
|
||||||
|
|
||||||
if (array_key_exists('category', $data)) {
|
if (array_key_exists('category', $data)) {
|
||||||
$data['category'] = [
|
$data['category'] = [
|
||||||
'idInsideBundle' => $data['category']->getIdInsideBundle(),
|
'idInsideBundle' => $data['category']->getIdInsideBundle(),
|
||||||
@ -80,7 +82,7 @@ class AccompanyingPeriodContext implements
|
|||||||
|
|
||||||
public function adminFormTransform(array $data): array
|
public function adminFormTransform(array $data): array
|
||||||
{
|
{
|
||||||
$data = [
|
$r = [
|
||||||
'mainPerson' => $data['mainPerson'] ?? false,
|
'mainPerson' => $data['mainPerson'] ?? false,
|
||||||
'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
|
'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
|
||||||
'person1' => $data['person1'] ?? false,
|
'person1' => $data['person1'] ?? false,
|
||||||
@ -90,11 +92,11 @@ class AccompanyingPeriodContext implements
|
|||||||
];
|
];
|
||||||
|
|
||||||
if (array_key_exists('category', $data)) {
|
if (array_key_exists('category', $data)) {
|
||||||
$data['category'] = array_key_exists('category', $data) ?
|
$r['category'] = array_key_exists('category', $data) ?
|
||||||
$this->documentCategoryRepository->find($data['category']) : null;
|
$this->documentCategoryRepository->find($data['category']) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $data;
|
return $r;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buildAdminForm(FormBuilderInterface $builder): void
|
public function buildAdminForm(FormBuilderInterface $builder): void
|
||||||
@ -169,11 +171,11 @@ class AccompanyingPeriodContext implements
|
|||||||
$options = $template->getOptions();
|
$options = $template->getOptions();
|
||||||
|
|
||||||
$data = [];
|
$data = [];
|
||||||
$data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class]);
|
$data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
|
||||||
|
|
||||||
foreach (['mainPerson', 'person1', 'person2'] as $k) {
|
foreach (['mainPerson', 'person1', 'person2'] as $k) {
|
||||||
if ($options[$k]) {
|
if ($options[$k]) {
|
||||||
$data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', ['docgen:expects' => Person::class]);
|
$data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', ['docgen:expects' => Person::class, 'groups' => 'docgen:read']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,7 +206,7 @@ class AccompanyingPeriodContext implements
|
|||||||
|
|
||||||
public function getName(): string
|
public function getName(): string
|
||||||
{
|
{
|
||||||
return 'Accompanying Period basic';
|
return 'docgen.Accompanying Period basic';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasAdminForm(): bool
|
public function hasAdminForm(): bool
|
||||||
@ -231,7 +233,7 @@ class AccompanyingPeriodContext implements
|
|||||||
->setCourse($entity)
|
->setCourse($entity)
|
||||||
->setObject($storedObject);
|
->setObject($storedObject);
|
||||||
|
|
||||||
if (array_key_exists('category', $template->getOptions()['category'])) {
|
if (array_key_exists('category', $template->getOptions())) {
|
||||||
$doc
|
$doc
|
||||||
->setCategory(
|
->setCategory(
|
||||||
$this->documentCategoryRepository->find(
|
$this->documentCategoryRepository->find(
|
||||||
|
@ -102,7 +102,7 @@ class AccompanyingPeriodWorkContext implements
|
|||||||
|
|
||||||
public function getName(): string
|
public function getName(): string
|
||||||
{
|
{
|
||||||
return 'Accompanying period work';
|
return 'docgen.Accompanying period work';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasAdminForm(): bool
|
public function hasAdminForm(): bool
|
||||||
|
@ -153,7 +153,7 @@ class AccompanyingPeriodWorkEvaluationContext implements
|
|||||||
|
|
||||||
public function getName(): string
|
public function getName(): string
|
||||||
{
|
{
|
||||||
return 'Accompanying period work context';
|
return 'docgen.Accompanying period work context';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasAdminForm(): bool
|
public function hasAdminForm(): bool
|
||||||
|
@ -388,7 +388,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
|
|||||||
|
|
||||||
$this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
|
$this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
|
||||||
|
|
||||||
if ($response->getStatusCode() === 422) {
|
if ($this->client->getResponse()->getStatusCode() === 422) {
|
||||||
$this->markTestSkipped('the next tests should appears only on valid accompanying period');
|
$this->markTestSkipped('the next tests should appears only on valid accompanying period');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -522,7 +522,7 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
|
|||||||
|
|
||||||
$this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
|
$this->assertTrue(in_array($this->client->getResponse()->getStatusCode(), [200, 422], true));
|
||||||
|
|
||||||
if ($response->getStatusCode() === 422) {
|
if ($this->client->getResponse()->getStatusCode() === 422) {
|
||||||
$this->markTestSkipped('the next tests should appears only on valid accompanying period');
|
$this->markTestSkipped('the next tests should appears only on valid accompanying period');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,9 +11,21 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Serializer\Normalizer;
|
namespace Serializer\Normalizer;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
||||||
|
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
||||||
|
use Chill\PersonBundle\Entity\Household\Household;
|
||||||
|
use Chill\PersonBundle\Entity\Household\HouseholdMember;
|
||||||
|
use Chill\PersonBundle\Entity\Household\Position;
|
||||||
use Chill\PersonBundle\Entity\Person;
|
use Chill\PersonBundle\Entity\Person;
|
||||||
|
use Chill\PersonBundle\Entity\Relationships\Relation;
|
||||||
|
use Chill\PersonBundle\Entity\Relationships\Relationship;
|
||||||
|
use Chill\PersonBundle\Repository\Relationships\RelationshipRepository;
|
||||||
|
use Chill\PersonBundle\Serializer\Normalizer\PersonDocGenNormalizer;
|
||||||
|
use Chill\PersonBundle\Templating\Entity\PersonRender;
|
||||||
|
use Prophecy\Argument;
|
||||||
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
||||||
|
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||||
use function array_merge;
|
use function array_merge;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -77,8 +89,124 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
|
|||||||
*/
|
*/
|
||||||
public function testNormalize(?Person $person, $expected, $msg)
|
public function testNormalize(?Person $person, $expected, $msg)
|
||||||
{
|
{
|
||||||
$normalized = $this->normalizer->normalize($person, 'docgen', ['docgen:expects' => Person::class]);
|
$normalized = $this->normalizer->normalize($person, 'docgen', [
|
||||||
|
'docgen:expects' => Person::class,
|
||||||
|
'groups' => 'docgen:read',
|
||||||
|
]);
|
||||||
|
|
||||||
$this->assertEquals($expected, $normalized, $msg);
|
$this->assertEquals($expected, $normalized, $msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testNormalizePersonWithHousehold()
|
||||||
|
{
|
||||||
|
$household = new Household();
|
||||||
|
$person = new Person();
|
||||||
|
$person
|
||||||
|
->setFirstName('Renaud')
|
||||||
|
->setLastName('Mégane');
|
||||||
|
$householdMember = new HouseholdMember();
|
||||||
|
$householdMember
|
||||||
|
->setPosition((new Position())->setAllowHolder(true)->setLabel(['fr' => 'position'])
|
||||||
|
->setShareHousehold(true))
|
||||||
|
->setHolder(true);
|
||||||
|
$person->addHouseholdParticipation($householdMember);
|
||||||
|
$household->addMember($householdMember);
|
||||||
|
|
||||||
|
$person = new Person();
|
||||||
|
$person
|
||||||
|
->setFirstName('Citroen')
|
||||||
|
->setLastName('Xsara');
|
||||||
|
$householdMember = new HouseholdMember();
|
||||||
|
$householdMember
|
||||||
|
->setPosition((new Position())->setAllowHolder(true)->setLabel(['fr' => 'position2'])
|
||||||
|
->setShareHousehold(true))
|
||||||
|
->setHolder(false);
|
||||||
|
$person->addHouseholdParticipation($householdMember);
|
||||||
|
$household->addMember($householdMember);
|
||||||
|
|
||||||
|
$actual = $this->normalizer->normalize($person, 'docgen', [
|
||||||
|
'groups' => 'docgen:read',
|
||||||
|
'docgen:expects' => Person::class,
|
||||||
|
'docgen:person:with-household' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertCount(2, $household->getMembers());
|
||||||
|
$this->assertIsArray($actual);
|
||||||
|
$this->assertArrayHasKey('household', $actual);
|
||||||
|
$this->assertCount(2, $actual['household']['currentMembers']);
|
||||||
|
$this->assertCount(2, $actual['household']['members']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testNormalizePersonWithRelationships()
|
||||||
|
{
|
||||||
|
$person = (new Person())->setFirstName('Renaud')->setLastName('megane');
|
||||||
|
$father = (new Person())->setFirstName('Clément')->setLastName('megane');
|
||||||
|
$mother = (new Person())->setFirstName('Mireille')->setLastName('Mathieu');
|
||||||
|
$sister = (new Person())->setFirstName('Callie')->setLastName('megane');
|
||||||
|
|
||||||
|
$relations = [
|
||||||
|
(new Relationship())->setFromPerson($person)->setToPerson($father)
|
||||||
|
->setReverse(false)->setRelation((new Relation())->setTitle(['fr' => 'Père'])
|
||||||
|
->setReverseTitle(['fr' => 'Fils'])),
|
||||||
|
(new Relationship())->setFromPerson($person)->setToPerson($mother)
|
||||||
|
->setReverse(false)->setRelation((new Relation())->setTitle(['fr' => 'Mère'])
|
||||||
|
->setReverseTitle(['fr' => 'Fils'])),
|
||||||
|
(new Relationship())->setFromPerson($person)->setToPerson($sister)
|
||||||
|
->setReverse(true)->setRelation((new Relation())->setTitle(['fr' => 'Frère'])
|
||||||
|
->setReverseTitle(['fr' => 'Soeur'])),
|
||||||
|
];
|
||||||
|
|
||||||
|
$repository = $this->prophesize(RelationshipRepository::class);
|
||||||
|
$repository->findByPerson($person)->willReturn($relations);
|
||||||
|
|
||||||
|
$normalizer = $this->buildPersonNormalizer(null, $repository->reveal(), null, null);
|
||||||
|
|
||||||
|
$actual = $normalizer->normalize($person, 'docgen', [
|
||||||
|
'groups' => 'docgen:read',
|
||||||
|
'docgen:expects' => Person::class,
|
||||||
|
'docgen:person:with-relations' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertIsArray($actual);
|
||||||
|
$this->assertArrayHasKey('relations', $actual);
|
||||||
|
$this->assertCount(3, $actual['relations']);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildPersonNormalizer(
|
||||||
|
?PersonRender $personRender = null,
|
||||||
|
?RelationshipRepository $relationshipRepository = null,
|
||||||
|
?TranslatorInterface $translator = null,
|
||||||
|
?TranslatableStringHelper $translatableStringHelper = null
|
||||||
|
): PersonDocGenNormalizer {
|
||||||
|
$normalizer = new PersonDocGenNormalizer(
|
||||||
|
$personRender ?? self::$container->get(PersonRender::class),
|
||||||
|
$relationshipRepository ?? self::$container->get(RelationshipRepository::class),
|
||||||
|
$translator ?? self::$container->get(TranslatorInterface::class),
|
||||||
|
$translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class)
|
||||||
|
);
|
||||||
|
$normalizerManager = $this->prophesize(NormalizerInterface::class);
|
||||||
|
$normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
|
||||||
|
$normalizerManager->normalize(Argument::type(Person::class), 'docgen', Argument::any())
|
||||||
|
->will(static function ($args) use ($normalizer) {
|
||||||
|
return $normalizer->normalize($args[0], $args[1], $args[2]);
|
||||||
|
});
|
||||||
|
$normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
|
||||||
|
static function ($args) {
|
||||||
|
if (is_iterable($args[0])) {
|
||||||
|
$r = [];
|
||||||
|
|
||||||
|
foreach ($args[0] as $i) {
|
||||||
|
$r[] = ['fake' => true, 'hash' => spl_object_hash($i)];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $r;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
$normalizer->setNormalizer($normalizerManager->reveal());
|
||||||
|
|
||||||
|
return $normalizer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,158 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Serializer\Normalizer;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
|
||||||
|
use Chill\PersonBundle\Entity\Person;
|
||||||
|
use Chill\PersonBundle\Entity\Relationships\Relation;
|
||||||
|
use Chill\PersonBundle\Entity\Relationships\Relationship;
|
||||||
|
use Chill\PersonBundle\Serializer\Normalizer\RelationshipDocGenNormalizer;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Prophecy\Argument;
|
||||||
|
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
||||||
|
use function is_object;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
* @coversNothing
|
||||||
|
*/
|
||||||
|
final class RelationshipDocGenNormalizerTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testNormalizeRelationshipNull()
|
||||||
|
{
|
||||||
|
$relationship = null;
|
||||||
|
|
||||||
|
$normalizer = $this->buildNormalizer();
|
||||||
|
|
||||||
|
$this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', [
|
||||||
|
'docgen:expects' => Relationship::class,
|
||||||
|
]));
|
||||||
|
$this->assertFalse($normalizer->supportsNormalization($relationship, 'docgen', [
|
||||||
|
'docgen:expects' => Person::class,
|
||||||
|
]));
|
||||||
|
|
||||||
|
$actual = $normalizer->normalize($relationship, 'docgen', [
|
||||||
|
'docgen:expects' => Relationship::class,
|
||||||
|
]);
|
||||||
|
$this->assertIsArray($actual);
|
||||||
|
$this->assertEqualsCanonicalizing(
|
||||||
|
['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'],
|
||||||
|
array_keys($actual),
|
||||||
|
'check that the expected keys are present'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testNormalizeRelationshipWithCounterPart()
|
||||||
|
{
|
||||||
|
$relationship = new Relationship();
|
||||||
|
$relationship
|
||||||
|
->setFromPerson($person1 = new Person())
|
||||||
|
->setToPerson($person2 = new Person())
|
||||||
|
->setRelation(
|
||||||
|
(new Relation())->setTitle(['fr' => 'title'])
|
||||||
|
->setReverseTitle(['fr' => 'reverse title'])
|
||||||
|
)
|
||||||
|
->setReverse(false);
|
||||||
|
|
||||||
|
$normalizer = $this->buildNormalizer();
|
||||||
|
|
||||||
|
$this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', []));
|
||||||
|
$this->assertFalse($normalizer->supportsNormalization($person1, 'docgen', []));
|
||||||
|
|
||||||
|
$actual = $normalizer->normalize($relationship, 'docgen', [
|
||||||
|
'docgen:expects' => Relationship::class,
|
||||||
|
'docgen:relationship:counterpart' => $person1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertIsArray($actual);
|
||||||
|
$this->assertEqualsCanonicalizing(
|
||||||
|
['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'],
|
||||||
|
array_keys($actual),
|
||||||
|
'check that the expected keys are present'
|
||||||
|
);
|
||||||
|
$this->assertEquals(spl_object_hash($person2), $actual['opposite']['hash']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testNormalizeRelationshipWithoutCounterPart()
|
||||||
|
{
|
||||||
|
$relationship = new Relationship();
|
||||||
|
$relationship
|
||||||
|
->setFromPerson($person1 = new Person())
|
||||||
|
->setToPerson($person2 = new Person())
|
||||||
|
->setRelation(
|
||||||
|
(new Relation())->setTitle(['fr' => 'title'])
|
||||||
|
->setReverseTitle(['fr' => 'reverse title'])
|
||||||
|
)
|
||||||
|
->setReverse(false);
|
||||||
|
|
||||||
|
$normalizer = $this->buildNormalizer();
|
||||||
|
|
||||||
|
$this->assertTrue($normalizer->supportsNormalization($relationship, 'docgen', []));
|
||||||
|
$this->assertFalse($normalizer->supportsNormalization($person1, 'docgen', []));
|
||||||
|
|
||||||
|
$actual = $normalizer->normalize($relationship, 'docgen', [
|
||||||
|
'docgen:expects' => Relationship::class,
|
||||||
|
]);
|
||||||
|
$this->assertIsArray($actual);
|
||||||
|
$this->assertEqualsCanonicalizing(
|
||||||
|
['fromPerson', 'toPerson', 'id', 'relationId', 'text', 'opposite'],
|
||||||
|
array_keys($actual),
|
||||||
|
'check that the expected keys are present'
|
||||||
|
);
|
||||||
|
$this->assertEquals(null, $actual['opposite']);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildNormalizer(): RelationshipDocGenNormalizer
|
||||||
|
{
|
||||||
|
$translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
|
||||||
|
$translatableStringHelper->localize(Argument::type('array'))->will(
|
||||||
|
static function ($args) { return $args[0][array_keys($args[0])[0]]; }
|
||||||
|
);
|
||||||
|
|
||||||
|
$normalizer = new RelationshipDocGenNormalizer(
|
||||||
|
$translatableStringHelper->reveal()
|
||||||
|
);
|
||||||
|
|
||||||
|
$normalizerManager = $this->prophesize(NormalizerInterface::class);
|
||||||
|
$normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
|
||||||
|
$normalizerManager->normalize(Argument::type(Relationship::class), 'docgen', Argument::any())
|
||||||
|
->will(static function ($args) use ($normalizer) {
|
||||||
|
return $normalizer->normalize($args[0], $args[1], $args[2]);
|
||||||
|
});
|
||||||
|
$normalizerManager->normalize(Argument::any(), 'docgen', Argument::any())->will(
|
||||||
|
static function ($args) {
|
||||||
|
if (null === $args[0]) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_iterable($args[0])) {
|
||||||
|
$r = [];
|
||||||
|
|
||||||
|
foreach ($args[0] as $i) {
|
||||||
|
$r[] = ['fake' => true, 'hash' => spl_object_hash($i)];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $r;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_object($args[0])) {
|
||||||
|
return ['fake' => true, 'hash' => null !== $args[0] ? spl_object_hash($args[0]) : null];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $args[0];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
$normalizer->setNormalizer($normalizerManager->reveal());
|
||||||
|
|
||||||
|
return $normalizer;
|
||||||
|
}
|
||||||
|
}
|
@ -455,13 +455,15 @@ see social issues: Voir les problématiques sociales
|
|||||||
see persons associated: Voir les usagers concernés
|
see persons associated: Voir les usagers concernés
|
||||||
|
|
||||||
docgen:
|
docgen:
|
||||||
|
Accompanying Period basic: "Parcours d'accompagnement (basique)"
|
||||||
|
Accompanying period work: "Action d'accompagnement"
|
||||||
|
Accompanying period work context: "Evaluation des actions d'accompagnement"
|
||||||
Main person: Personne principale
|
Main person: Personne principale
|
||||||
person 1: Première personne
|
person 1: Première personne
|
||||||
person 2: Seconde personne
|
person 2: Seconde personne
|
||||||
Ask for main person: Demander à l'utilisateur de préciser la personne principale
|
Ask for main person: Demander à l'utilisateur de préciser la personne principale
|
||||||
Ask for person 1: Demander à l'utilisateur de préciser la première personne
|
Ask for person 1: Demander à l'utilisateur de préciser la première personne
|
||||||
Ask for person 2: Demander à l'utilisateur de préciser la seconde personne
|
Ask for person 2: Demander à l'utilisateur de préciser la seconde personne
|
||||||
Accompanying period work: Actions
|
|
||||||
A basic context for accompanying period: Contexte pour les parcours
|
A basic context for accompanying period: Contexte pour les parcours
|
||||||
A context for accompanying period work: Contexte pour les actions d'accompagnement
|
A context for accompanying period work: Contexte pour les actions d'accompagnement
|
||||||
A context for accompanying period work evaluation: Contexte pour les évaluations dans les actions d'accompagnement
|
A context for accompanying period work evaluation: Contexte pour les évaluations dans les actions d'accompagnement
|
||||||
|
@ -63,7 +63,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @var string
|
* @var string
|
||||||
* @ORM\Column(name="acronym", type="string", length=64, nullable=true)
|
* @ORM\Column(name="acronym", type="string", length=64, nullable=true)
|
||||||
* @Assert\Length(min="2")
|
* @Assert\Length(min="2")
|
||||||
* @Groups({"read", "write"})
|
* @Groups({"read", "write", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?string $acronym = '';
|
private ?string $acronym = '';
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
|
* @ORM\ManyToOne(targetEntity="\Chill\MainBundle\Entity\Address",
|
||||||
* cascade={"persist", "remove"})
|
* cascade={"persist", "remove"})
|
||||||
* @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
|
* @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
|
||||||
* @Groups({"read", "write"})
|
* @Groups({"read", "write", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?Address $address = null;
|
private ?Address $address = null;
|
||||||
|
|
||||||
@ -97,6 +97,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @ORM\JoinTable(name="chill_3party.thirdparty_category",
|
* @ORM\JoinTable(name="chill_3party.thirdparty_category",
|
||||||
* joinColumns={@ORM\JoinColumn(name="thirdparty_id", referencedColumnName="id")},
|
* joinColumns={@ORM\JoinColumn(name="thirdparty_id", referencedColumnName="id")},
|
||||||
* inverseJoinColumns={@ORM\JoinColumn(name="category_id", referencedColumnName="id")})
|
* inverseJoinColumns={@ORM\JoinColumn(name="category_id", referencedColumnName="id")})
|
||||||
|
* @Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private Collection $categories;
|
private Collection $categories;
|
||||||
|
|
||||||
@ -121,6 +122,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @var Civility
|
* @var Civility
|
||||||
* @ORM\ManyToOne(targetEntity=Civility::class)
|
* @ORM\ManyToOne(targetEntity=Civility::class)
|
||||||
* ORM\JoinColumn(name="civility", referencedColumnName="id", nullable=true)
|
* ORM\JoinColumn(name="civility", referencedColumnName="id", nullable=true)
|
||||||
|
* @Groups({"docgen:read", "read"})
|
||||||
*/
|
*/
|
||||||
private ?Civility $civility = null;
|
private ?Civility $civility = null;
|
||||||
|
|
||||||
@ -131,7 +133,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default": false})
|
* @ORM\Column(name="contact_data_anonymous", type="boolean", options={"default": false})
|
||||||
* @Groups({"read"})
|
* @Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private bool $contactDataAnonymous = false;
|
private bool $contactDataAnonymous = false;
|
||||||
|
|
||||||
@ -149,7 +151,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
/**
|
/**
|
||||||
* @ORM\Column(name="email", type="string", length=255, nullable=true)
|
* @ORM\Column(name="email", type="string", length=255, nullable=true)
|
||||||
* @Assert\Email(checkMX=false)
|
* @Assert\Email(checkMX=false)
|
||||||
* @Groups({"read", "write"})
|
* @Groups({"read", "write", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?string $email = null;
|
private ?string $email = null;
|
||||||
|
|
||||||
@ -158,6 +160,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @ORM\Column(name="id", type="integer")
|
* @ORM\Column(name="id", type="integer")
|
||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\GeneratedValue(strategy="AUTO")
|
* @ORM\GeneratedValue(strategy="AUTO")
|
||||||
|
* @Groups({"read", "write", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
@ -171,7 +174,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @var string
|
* @var string
|
||||||
* @ORM\Column(name="name", type="string", length=255)
|
* @ORM\Column(name="name", type="string", length=255)
|
||||||
* @Assert\Length(min="2")
|
* @Assert\Length(min="2")
|
||||||
* @Groups({"read", "write"})
|
* @Groups({"read", "write", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?string $name = '';
|
private ?string $name = '';
|
||||||
|
|
||||||
@ -181,7 +184,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @var string
|
* @var string
|
||||||
* @ORM\Column(name="name_company", type="string", length=255, nullable=true)
|
* @ORM\Column(name="name_company", type="string", length=255, nullable=true)
|
||||||
* @Assert\Length(min="3")
|
* @Assert\Length(min="3")
|
||||||
* @Groups({"read", "write"})
|
* @Groups({"read", "write", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?string $nameCompany = '';
|
private ?string $nameCompany = '';
|
||||||
|
|
||||||
@ -190,7 +193,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
*
|
*
|
||||||
* @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", inversedBy="children")
|
* @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty", inversedBy="children")
|
||||||
* @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
|
* @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
|
||||||
* @Groups({"read"})
|
* @Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?ThirdParty $parent = null;
|
private ?ThirdParty $parent = null;
|
||||||
|
|
||||||
@ -200,6 +203,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* @var ThirdPartyProfession
|
* @var ThirdPartyProfession
|
||||||
* @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyProfession")
|
* @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdPartyProfession")
|
||||||
* ORM\JoinColumn(name="profession", referencedColumnName="id", nullable=true)
|
* ORM\JoinColumn(name="profession", referencedColumnName="id", nullable=true)
|
||||||
|
* @Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private ?ThirdPartyProfession $profession = null;
|
private ?ThirdPartyProfession $profession = null;
|
||||||
|
|
||||||
@ -209,7 +213,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
* message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
|
* message="Invalid phone number: it should begin with the international prefix starting with ""+"", hold only digits and be smaller than 20 characters. Ex: +33123456789"
|
||||||
* )
|
* )
|
||||||
* @PhonenumberConstraint(type="any")
|
* @PhonenumberConstraint(type="any")
|
||||||
* @Groups({"read", "write"})
|
* @Groups({"read", "write", "dogen:read"})
|
||||||
*/
|
*/
|
||||||
private ?string $telephone = null;
|
private ?string $telephone = null;
|
||||||
|
|
||||||
@ -495,7 +499,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Groups({"read"})
|
* @Groups({"read", "docgen:read"})
|
||||||
*/
|
*/
|
||||||
public function isChild(): bool
|
public function isChild(): bool
|
||||||
{
|
{
|
||||||
|
@ -13,6 +13,7 @@ namespace Chill\ThirdPartyBundle\Entity;
|
|||||||
|
|
||||||
use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository;
|
use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Annotation as Serializer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Table(name="chill_3party.party_category")
|
* @ORM\Table(name="chill_3party.party_category")
|
||||||
@ -23,19 +24,21 @@ class ThirdPartyCategory
|
|||||||
/**
|
/**
|
||||||
* @ORM\Column(type="boolean")
|
* @ORM\Column(type="boolean")
|
||||||
*/
|
*/
|
||||||
private $active = true;
|
private bool $active = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\GeneratedValue
|
* @ORM\GeneratedValue
|
||||||
* @ORM\Column(type="integer")
|
* @ORM\Column(type="integer")
|
||||||
|
* @Serializer\Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
|
* @Serializer\Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $name = [];
|
private array $name = [];
|
||||||
|
|
||||||
public function getActive(): ?bool
|
public function getActive(): ?bool
|
||||||
{
|
{
|
||||||
|
@ -13,6 +13,7 @@ namespace Chill\ThirdPartyBundle\Entity;
|
|||||||
|
|
||||||
use Chill\ThirdPartyBundle\Repository\ThirdPartyProfessionRepository;
|
use Chill\ThirdPartyBundle\Repository\ThirdPartyProfessionRepository;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Annotation as Serializer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Table(name="chill_3party.party_profession")
|
* @ORM\Table(name="chill_3party.party_profession")
|
||||||
@ -23,19 +24,21 @@ class ThirdPartyProfession
|
|||||||
/**
|
/**
|
||||||
* @ORM\Column(type="boolean")
|
* @ORM\Column(type="boolean")
|
||||||
*/
|
*/
|
||||||
private $active = true;
|
private bool $active = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Id
|
* @ORM\Id
|
||||||
* @ORM\GeneratedValue
|
* @ORM\GeneratedValue
|
||||||
* @ORM\Column(type="integer")
|
* @ORM\Column(type="integer")
|
||||||
|
* @Serializer\Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $id;
|
private ?int $id = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ORM\Column(type="json")
|
* @ORM\Column(type="json")
|
||||||
|
* @Serializer\Groups({"docgen:read"})
|
||||||
*/
|
*/
|
||||||
private $name = [];
|
private array $name = [];
|
||||||
|
|
||||||
public function getActive(): ?bool
|
public function getActive(): ?bool
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user