WIP: Implement profile editing

This commit is contained in:
Björn Fromme
2023-10-02 15:07:02 +02:00
parent 953aa9c8e0
commit d3a0021b7d
12 changed files with 311 additions and 47 deletions
@@ -10,6 +10,7 @@ use App\Model\AjaxModalResponseDto;
use App\Model\UploadSessionDto;
use App\Service\Upload\UploadHandler;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -20,7 +21,8 @@ class AddController extends AbstractController
{
public function __construct(
private readonly EntityManagerInterface $entityManager,
private readonly UploadHandler $uploadHandler
private readonly UploadHandler $uploadHandler,
private readonly LoggerInterface $logger
) {
}
@@ -52,6 +54,11 @@ class AddController extends AbstractController
$this->entityManager->persist($license);
$this->entityManager->flush();
$this->addFlash('success', 'Die Lizenz wurde hinzugefügt.');
$this->logger->info('Add license', [
'user' => $user->getUserIdentifier(),
]);
$redirectUrl = $this->generateUrl('app_teamer_profile_skills');
$response->setCloseAndRedirect($redirectUrl);
} else {
@@ -0,0 +1,35 @@
<?php
namespace App\Controller\Teamer\Profile\License;
use App\Entity\License;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
class DeleteController extends AbstractController
{
public function __construct(
private readonly EntityManagerInterface $entityManager,
private readonly LoggerInterface $logger
) {
}
#[Route('//teamer/profile/license/delete/{uuid}', name: 'app_teamer_profile_license_delete')]
#[IsGranted('DELETE', subject: 'license')]
public function index(License $license): Response
{
$this->entityManager->remove($license);
$this->entityManager->flush();
$this->addFlash('success', 'Die Lizenz wurde gelöscht.');
$this->logger->info('Delete license', [
'user' => $this->getUser()->getUserIdentifier(),
]);
return $this->redirectToRoute('app_teamer_profile_skills');
}
}
@@ -3,6 +3,10 @@
namespace App\Controller\Teamer\Profile;
use App\Entity\User;
use App\Form\TeamerJobProfileType;
use App\Repository\JobProfileRepository;
use Doctrine\ORM\EntityManagerInterface;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -11,6 +15,13 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
class SkillsController extends AbstractController
{
public function __construct(
private readonly JobProfileRepository $jobProfileRepository,
private readonly EntityManagerInterface $entityManager,
private readonly LoggerInterface $logger
) {
}
#[Route('/teamer/profile/skills', name: 'app_teamer_profile_skills')]
#[IsGranted('ROLE_TEAMER')]
public function index(Request $request): Response
@@ -19,8 +30,38 @@ class SkillsController extends AbstractController
$user = $this->getUser();
$teamer = $user->getTeamer();
$jobProfiles = $this->jobProfileRepository->getList();
$selectableJobProfiles = [];
foreach ($jobProfiles as $profile) {
$selectableJobProfiles[$profile->getId()] = true;
if (null !== $profile->getRequiredTraining() && false === $teamer->hasTraining($profile->getRequiredTraining())) {
$selectableJobProfiles[$profile->getId()] = false;
}
foreach ($profile->getRequiredLicenses() as $license) {
if (false === $teamer->hasLicenseOfType($license)) {
$selectableJobProfiles[$profile->getId()] = false;
}
}
}
$form = $this->createForm(TeamerJobProfileType::class, $teamer, ['job_profiles' => $jobProfiles, 'selectable_job_profiles' => $selectableJobProfiles]);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->entityManager->flush();
$this->addFlash('success', 'Dein Profil wurde aktualisiert.');
$this->logger->info('Update teamer profile', [
'user' => $user->getUserIdentifier(),
]);
return $this->redirectToRoute('app_teamer_profile_skills');
}
return $this->render('teamer/profile/skills.html.twig', [
'teamer' => $teamer,
'form' => $form,
]);
}
}
+12 -1
View File
@@ -86,7 +86,7 @@ class Teamer implements TimestampableEntityInterface
#[ORM\OneToMany(mappedBy: 'owner', targetEntity: Availability::class)]
private Collection $availabilities;
#[ORM\OneToOne(cascade: ['persist', 'remove'])]
#[ORM\OneToOne(cascade: ['persist', 'remove'], fetch: 'EAGER')]
#[Assert\NotNull(message: 'Bitte lade ein Foto von dir hoch', groups: ['profile', 'profile_preflight'])]
private ?Upload $photo = null;
@@ -465,6 +465,17 @@ class Teamer implements TimestampableEntityInterface
return $this;
}
public function hasTraining(Training $training): bool
{
foreach ($this->getTrainingAttendances() as $attendance) {
if ($attendance->getTraining() === $training) {
return true;
}
}
return false;
}
/**
* @return Collection<int, License>
*/
+78
View File
@@ -0,0 +1,78 @@
<?php
namespace App\Form;
use App\Entity\JobProfile;
use App\Entity\Teamer;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatableMessage;
class TeamerJobProfileType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$selectableProfiles = $options['selectable_job_profiles'];
$builder
->add('jobProfiles', EntityType::class, [
'label' => false,
'class' => JobProfile::class,
// Append potential training or license requirements to profile labels
'choice_label' => function($choice, string $key, mixed $value): TranslatableMessage|string {
$label = $choice->getName();
$requirements = [];
if (null !== $training = $choice->getRequiredTraining()) {
$requirements[].= $training->getName();
}
foreach ($choice->getRequiredLicenses() as $license) {
$requirements[] = sprintf('Offizielle %slehrer*innenlizenz', ucfirst($license));
}
if ($requirements) {
$label .= sprintf(' (%s: %s)', 1 === count($requirements) ?
'Voraussetzung' : 'Voraussetzungen', implode(', ', $requirements));
}
return $label;
},
// Set disabled attribute on profiles that require a training or licenses the teamer doesnt have
'choice_attr' => function($choice, string $key, mixed $value) use ($selectableProfiles) {
if (true === $selectableProfiles[$choice->getId()]) {
return [];
}
return ['disabled' => 'disabled'];
},
'expanded' => true,
'multiple' => true,
])
->add('status', ChoiceType::class, [
'label' => 'Status',
'choices' => [
'Neuteamer' => Teamer::STATUS_NEW,
'Bestandsteamer' => Teamer::STATUS_EXISTING,
],
])
->add('remarks', TextareaType::class, [
'label' => 'Wünsche/Anmerkungen',
'required' => false,
'attr' => [
'rows' => 3,
],
])
;
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'data_class' => Teamer::class,
'job_profiles' => [],
'selectable_job_profiles' => [],
]);
}
}
-14
View File
@@ -63,13 +63,6 @@ class TeamerProfileType extends AbstractType
'label' => 'Krankenversicherung',
'required' => false,
])
->add('remarks', TextareaType::class, [
'label' => 'Wünsche/Anmerkungen',
'required' => false,
'attr' => [
'rows' => 3,
],
])
->add('address', AddressType::class, [
'label' => false,
])
@@ -99,13 +92,6 @@ class TeamerProfileType extends AbstractType
'XXL' => 'XXL',
],
])
->add('status', ChoiceType::class, [
'label' => 'Status',
'choices' => [
'Neuteamer' => Teamer::STATUS_NEW,
'Bestandsteamer' => Teamer::STATUS_EXISTING,
],
])
;
}
+41
View File
@@ -0,0 +1,41 @@
<?php
namespace App\Security\Voter;
use App\Entity\License;
use App\Entity\User;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
class LicenseVoter extends Voter
{
public const VIEW = 'VIEW';
public const DELETE = 'DELETE';
public function __construct(private readonly Security $security)
{}
protected function supports(string $attribute, mixed $subject): bool
{
if (!$subject instanceof License) {
return false;
}
return in_array($attribute, [static::VIEW, static::DELETE]);
}
protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
{
if (true === $this->security->isGranted('ROLE_ADMINISTRATIVE')) {
return true;
}
/** @var License $license */
$license = $subject;
/** @var User $user */
$user = $this->security->getUser();
return $license->getTeamer() === $user->getTeamer();
}
}