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

Merge branch 'master' into VSR-issues

Browse Source
This commit is contained in:
Julien Fastré
2023-01-24 15:36:22 +01:00
parent 2deed644b6 de5f818c5a
commit 6b90a7d2a7
201 changed files with 2768 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
View File

@@ -45,6 +45,7 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class CalendarController extends AbstractController
{
@@ -68,6 +69,8 @@ class CalendarController extends AbstractController
private TranslatableStringHelperInterface $translatableStringHelper;
private TranslatorInterface $translator;
private UserRepositoryInterface $userRepository;
public function __construct(
@@ -81,7 +84,8 @@ class CalendarController extends AbstractController
TranslatableStringHelperInterface $translatableStringHelper,
PersonRepository $personRepository,
AccompanyingPeriodRepository $accompanyingPeriodRepository,
UserRepositoryInterface $userRepository
UserRepositoryInterface $userRepository,
TranslatorInterface $translator
) {
$this->calendarACLAwareRepository = $calendarACLAwareRepository;
$this->docGeneratorTemplateRepository = $docGeneratorTemplateRepository;
@@ -94,6 +98,7 @@ class CalendarController extends AbstractController
$this->personRepository = $personRepository;
$this->accompanyingPeriodRepository = $accompanyingPeriodRepository;
$this->userRepository = $userRepository;
$this->translator = $translator;
}
/**
@@ -131,7 +136,7 @@ class CalendarController extends AbstractController
$em->remove($entity);
$em->flush();
$this->addFlash('success', $this->get('translator')
$this->addFlash('success', $this->translator
->trans('The calendar item has been successfully removed.'));
return new RedirectResponse($redirectRoute);
@@ -190,7 +195,7 @@ class CalendarController extends AbstractController
if ($form->isSubmitted() && $form->isValid()) {
$em->flush();
$this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
$this->addFlash('success', $this->translator->trans('Success : calendar item updated!'));
if ($form->get('save_and_upload_doc')->isClicked()) {
return $this->redirectToRoute('chill_calendar_calendardoc_new', ['id' => $entity->getId()]);
@@ -210,7 +215,7 @@ class CalendarController extends AbstractController
}
if ($form->isSubmitted() && !$form->isValid()) {
$this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
$this->addFlash('error', $this->translator->trans('This form contains errors'));
}
$entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
@@ -369,7 +374,7 @@ class CalendarController extends AbstractController
$em->persist($entity);
$em->flush();
$this->addFlash('success', $this->get('translator')->trans('Success : calendar item created!'));
$this->addFlash('success', $this->translator->trans('Success : calendar item created!'));
if ($form->get('save_and_upload_doc')->isClicked()) {
return $this->redirectToRoute('chill_calendar_calendardoc_new', ['id' => $entity->getId()]);
@@ -393,7 +398,7 @@ class CalendarController extends AbstractController
}
if ($form->isSubmitted() && !$form->isValid()) {
$this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
$this->addFlash('error', $this->translator->trans('This form contains errors'));
}
if (null === $view) {

4
src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
View File

@@ -66,6 +66,10 @@ final class AgentAggregator implements AggregatorInterface
return 'Agent';
}
if (null === $value || '' === $value) {
return '';
}
$r = $this->userRepository->find($value);
return $this->userRender->renderString($r, []);

4
src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
View File

@@ -67,6 +67,10 @@ class CancelReasonAggregator implements AggregatorInterface
return 'Cancel reason';
}
if (null === $value || '' === $value) {
return '';
}
$j = $this->cancelReasonRepository->find($value);
return $this->translatableStringHelper->localize(

4
src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
View File

@@ -66,6 +66,10 @@ final class JobAggregator implements AggregatorInterface
return 'Job';
}
if (null === $value || '' === $value) {
return '';
}
$j = $this->jobRepository->find($value);
return $this->translatableStringHelper->localize(

4
src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
View File

@@ -60,6 +60,10 @@ final class LocationAggregator implements AggregatorInterface
return 'Location';
}
if (null === $value || '' === $value) {
return '';
}
$l = $this->locationRepository->find($value);
return $l->getName();

8
src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
View File

@@ -66,7 +66,13 @@ final class LocationTypeAggregator implements AggregatorInterface
return 'Location type';
}
$j = $this->locationTypeRepository->find($value);
if (null === $value || '' === $value) {
return '';
}
if (null === $j = $this->locationTypeRepository->find($value)) {
return '';
}
return $this->translatableStringHelper->localize(
$j->getTitle()

4
src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
View File

@@ -66,6 +66,10 @@ final class ScopeAggregator implements AggregatorInterface
return 'Scope';
}
if (null === $value || '' === $value) {
return '';
}
$s = $this->scopeRepository->find($value);
return $this->translatableStringHelper->localize(