Task: Misc adjustments

migrations/Version20231025131443.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231025131443 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE application DROP FOREIGN KEY FK_A45BDDC1DF01D017');
+        $this->addSql('DROP INDEX IDX_A45BDDC1DF01D017 ON application');
+        $this->addSql('ALTER TABLE application ADD comment_visible TINYINT(1) NOT NULL, DROP remarks_by_id, CHANGE remarks comment LONGTEXT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE application ADD remarks_by_id INT DEFAULT NULL, DROP comment_visible, CHANGE comment remarks LONGTEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE application ADD CONSTRAINT FK_A45BDDC1DF01D017 FOREIGN KEY (remarks_by_id) REFERENCES user (id)');
+        $this->addSql('CREATE INDEX IDX_A45BDDC1DF01D017 ON application (remarks_by_id)');
+    }
+}

src/Controller/Admin/Application/StatusController.php

@@ -4,9 +4,9 @@ namespace App\Controller\Admin\Application;
 
 use App\Entity\Application;
 use App\Event\ApplicationStatusEvent;
-use App\Form\ApplicationCheckType;
+use App\Form\ApplicationStatusType;
 use App\Model\AjaxModalResponseDto;
-use App\Model\ApplicationCheckDto;
+use App\Model\ApplicationStatusDto;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -32,20 +32,24 @@ class StatusController extends AbstractController
     {
         $response = new AjaxModalResponseDto();
         $formAction = $this->generateUrl('app_admin_application_status', ['uuid' => $application->getUuid()]);
-        $formData = new ApplicationCheckDto($application);
+        $statusDto = new ApplicationStatusDto($application);
-        $form = $this->createForm(ApplicationCheckType::class, $formData, ['action' => $formAction, 'ajax_submit' => true]);
+        $form = $this->createForm(ApplicationStatusType::class, $statusDto, ['action' => $formAction, 'ajax_submit' => true]);
 
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $this->eventDispatcher->dispatch(new ApplicationStatusEvent($formData), ApplicationStatusEvent::NAME);
+            $this->eventDispatcher->dispatch(new ApplicationStatusEvent($statusDto), ApplicationStatusEvent::NAME);
-            $application->setStatus($formData->getStatus());
+            $application
+                ->setStatus($statusDto->getStatus())
+                ->setComment($statusDto->getComment())
+                ->setCommentVisible($statusDto->isCommentVisible())
+            ;
             $this->entityManager->flush();
 
             $this->addFlash('success', 'Der Status der Bewerbung wurde aktualisiert');
             $this->logger->info('Update application status', [
                 'application_id' => $application->getId(),
-                'status_new' => $formData->getStatus(),
+                'status_new' => $statusDto->getStatus(),
                 'teamer' => (string) $application->getTeamer(),
             ]);
 

src/Entity/Application.php

@@ -38,10 +38,10 @@ class Application implements TimestampableEntityInterface
     private ?string $status;
 
     #[ORM\Column(type: Types::TEXT, nullable: true)]
-    private ?string $remarks = null;
+    private ?string $comment = null;
 
-    #[ORM\ManyToOne]
+    #[ORM\Column]
-    private ?User $remarksBy = null;
+    private ?bool $commentVisible = false;
 
     public function __construct(Assignment $assignment, Teamer $teamer)
     {
@@ -109,18 +109,6 @@ class Application implements TimestampableEntityInterface
         return $this;
     }
 
-    public function getRemarks(): ?string
-    {
-        return $this->remarks;
-    }
-
-    public function setRemarks(?string $remarks): static
-    {
-        $this->remarks = $remarks;
-
-        return $this;
-    }
-
     public function matchesPickup(): bool
     {
         if (0 === $pickupId = (int) $this->getAssignment()->getPickup()) {
@@ -147,14 +135,26 @@ class Application implements TimestampableEntityInterface
         return $count === $requiredTrainings->count();
     }
 
-    public function getRemarksBy(): ?User
+    public function getComment(): ?string
     {
-        return $this->remarksBy;
+        return $this->comment;
     }
 
-    public function setRemarksBy(?User $remarksBy): static
+    public function setComment(?string $comment): static
     {
-        $this->remarksBy = $remarksBy;
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function isCommentVisible(): ?bool
+    {
+        return $this->commentVisible;
+    }
+
+    public function setCommentVisible(bool $commentVisible): static
+    {
+        $this->commentVisible = $commentVisible;
 
         return $this;
     }

src/Entity/Disposition.php

@@ -54,7 +54,6 @@ class Disposition implements BlameableEntityInterface, TimestampableEntityInterf
         $this->status = static::STATUS_NEW;
         $this->assignment = $application->getAssignment();
         $this->teamer = $application->getTeamer();
-        $this->remarks = $application->getRemarks();
         $this->documents = new ArrayCollection();
     }
 

src/Event/ApplicationStatusEvent.php

@@ -3,7 +3,7 @@
 namespace App\Event;
 
 use App\Entity\Application;
-use App\Model\ApplicationCheckDto;
+use App\Model\ApplicationStatusDto;
 use Symfony\Contracts\EventDispatcher\Event;
 
 class ApplicationStatusEvent extends Event
@@ -13,7 +13,7 @@ class ApplicationStatusEvent extends Event
     private Application $application;
     private ?string $comment;
 
-    public function __construct(ApplicationCheckDto $applicationCheckDto)
+    public function __construct(ApplicationStatusDto $applicationCheckDto)
     {
         $this->application = $applicationCheckDto->getApplication();
         $this->comment = $applicationCheckDto->getComment();

src/Form/ApplicationStatusType.php

@@ -3,14 +3,15 @@
 namespace App\Form;
 
 use App\Entity\Application;
-use App\Model\ApplicationCheckDto;
+use App\Model\ApplicationStatusDto;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 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;
 
-class ApplicationCheckType extends AbstractType
+class ApplicationStatusType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
@@ -29,13 +30,17 @@ class ApplicationCheckType extends AbstractType
                     'rows' => 3,
                 ],
             ])
+            ->add('commentVisible', CheckboxType::class, [
+                'label' => 'Kommentar/Begründung sichtbar für Teamer:in',
+                'required' => false,
+            ])
         ;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => ApplicationCheckDto::class,
+            'data_class' => ApplicationStatusDto::class,
         ]);
     }
 }

src/Form/AssignmentType.php

@@ -86,7 +86,7 @@ class AssignmentType extends AbstractType
                 'expanded' => true,
             ])
             ->add('contact', EntityType::class, [
-                'label' => 'Ansprechpartner RM',
+                'label' => 'Ansprechperson für den Einsatz',
                 'class' => User::class,
                 'choice_label' => 'fullName',
                 'query_builder' => function (EntityRepository $repository) {

src/Menu/AbstractMenuBuilder.php

@@ -92,8 +92,8 @@ abstract class AbstractMenuBuilder
     {
         if ($this->security->isGranted('ROLE_TEAMER')) {
             $menu
-                ->addChild('zum Teamerbereich', ['route' => 'app_teamer_index'])
+                ->addChild('zum Teamer:innenbereich', ['route' => 'app_teamer_index'])
-                ->setChildrenAttribute('title', 'zum Teamerbereich')
+                ->setChildrenAttribute('title', 'zum Teamer:innenbereich')
                 ->setExtra('icon', 'user')
             ;
         }

src/Menu/AdminMenuBuilder.php

@@ -39,7 +39,7 @@ class AdminMenuBuilder extends AbstractMenuBuilder
             ],
             [
                 'route' => 'app_admin_teamer_index',
-                'title' => 'Teamerübersicht',
+                'title' => 'Teamer:innenübersicht',
                 'icon' => 'users',
                 'hideChildren' => true,
                 'children' => $this->getTeamerMenuItems(),

src/Model/ApplicationStatusDto.php

@@ -4,16 +4,19 @@ namespace App\Model;
 
 use App\Entity\Application;
 
-class ApplicationCheckDto
+class ApplicationStatusDto
 {
     private Application $application;
     private string $status;
-    private ?string $comment = null;
+    private ?string $comment;
+    private bool $commentVisible;
 
     public function __construct(Application $application)
     {
         $this->application = $application;
         $this->status = $application->getStatus();
+        $this->comment = $application->getComment();
+        $this->commentVisible = $application->isCommentVisible();
     }
 
     public function getApplication(): Application
@@ -44,4 +47,16 @@ class ApplicationCheckDto
 
         return $this;
     }
+
+    public function isCommentVisible(): bool
+    {
+        return $this->commentVisible;
+    }
+
+    public function setCommentVisible(bool $commentVisible): static
+    {
+        $this->commentVisible = $commentVisible;
+
+        return $this;
+    }
 }

src/Twig/AppRuntime.php

@@ -28,10 +28,10 @@ class AppRuntime implements RuntimeExtensionInterface
     public function teamerStatusLabel(string $status): string
     {
         if (Teamer::STATUS_NEW === $status) {
-            return 'Neuteamer';
+            return 'Neuteamer:in';
         }
 
-        return 'Bestandsteamer';
+        return 'Bestandsteamer:in';
     }
 
     public function licenseLabel(string $type): string

templates/admin/application/index.html.twig

@@ -24,7 +24,7 @@
                             {{ knp_pagination_sortable(pagination, 'Bus', 'destination.pickup') }}
                         </th>
                         <th>
-                            {{ knp_pagination_sortable(pagination, 'Bewerber*in', 'teamer.lastName') }}
+                            {{ knp_pagination_sortable(pagination, 'Bewerber:in', 'teamer.lastName') }}
                         </th>
                         <th></th>
                     </tr>
@@ -74,7 +74,7 @@
                                          aria-label="Bewerber:innen-Info anzeigen"
                                          {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
                                          {{ stimulus_action('modal-button', 'ajax', 'click', {
-                                             'title': 'Teeamer-Info ' ~ application.teamer,
+                                             'title': 'Teamer:innen-Info ' ~ application.teamer,
                                              'url': path('app_admin_application_info', { 'uuid': application.uuid })
                                          }) }}>
                                         {% if assignment.pickup %}

templates/admin/application/status.html.twig

@@ -2,6 +2,7 @@
 <div class="flex flex-col space-y-4 pb-4">
     {{ form_row(form.status) }}
     {{ form_row(form.comment) }}
+    {{ form_row(form.commentVisible) }}
 </div>
 <button type="submit" class="btn">
     Aktualisieren

templates/admin/assignment/detail.html.twig

@@ -38,7 +38,7 @@
                                         class="flex items-center space-x-1"
                                         {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
                                         {{ stimulus_action('modal-button', 'ajax', null, {
-                                            'title': 'Teamerinfo ' ~ application.teamer,
+                                            'title': 'Teamer:inneninfo ' ~ application.teamer,
                                             'url': path('app_admin_teamer_info', { 'uuid': application.teamer.uuid })
                                         }) }}>
                                     <span>{{ application.teamer }}</span>
@@ -59,7 +59,7 @@
                                                 {{ stimulus_controller('modal-button', [], [], {'confirmation-modal': '#confirmation-modal'}) }}
                                                 {{ stimulus_action('modal-button', 'confirmation', null, {
                                                     'title': 'Bist du sicher?',
-                                                    'content': 'Möchtest du den Teamer ' ~ application.teamer ~ ' wirklich einteilen?',
+                                                    'content': 'Möchtest du den/die Teamer:in ' ~ application.teamer ~ ' wirklich einteilen?',
                                                     'target-url': path('app_admin_application_dispose', { 'uuid': application.uuid })
                                                 }) }}>
                                             einteilen
@@ -128,7 +128,7 @@
                                         class="flex items-center space-x-1"
                                         {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
                                         {{ stimulus_action('modal-button', 'ajax', null, {
-                                            'title': 'Teamerinfo ' ~ disposition.teamer,
+                                            'title': 'Teamer:inneninfo ' ~ disposition.teamer,
                                             'url': path('app_admin_teamer_info', { 'uuid': disposition.teamer.uuid })
                                         }) }}>
                                     <span>{{ disposition.teamer }}</span>

templates/admin/document/index.html.twig

@@ -24,7 +24,7 @@
                             {{ knp_pagination_sortable(pagination, 'Dokument', 'upload.type') }}
                         </th>
                         <th>
-                            {{ knp_pagination_sortable(pagination, 'Teamer', 'teamer.lastName') }}
+                            {{ knp_pagination_sortable(pagination, 'Teamer:in', 'teamer.lastName') }}
                         </th>
                         <th>
                             {{ knp_pagination_sortable(pagination, 'Status', 'disposition.status') }}

templates/admin/index.html.twig

@@ -25,6 +25,8 @@
                             {{ _self.dot() }}
                             <span class="whitespace-nowrap">{{ assignment.effectivePeriod.start|date('d.m.y') }} - {{ assignment.effectivePeriod.end|date('d.m.y') }}</span>
                             {{ _self.dot() }}
+                            <span class="whitespace-nowrap">{{ assignment.destination.hotel }}</span>
+                            {{ _self.dot() }}
                             <span class="whitespace-nowrap">{{ assignment.jobProfile.name }}</span>
                         </a>
                     </li>

templates/admin/teamer/index.html.twig

@@ -1,18 +1,18 @@
 {% extends 'admin/layout.html.twig' %}
 
-{% block title %}Teamerübersicht{% endblock %}
+{% block title %}Teamer:innenübersicht{% endblock %}
 
 {% block content %}
     <div class="flex items-start justify-between pb-4">
         <h1 class="text-2xl font-bold">
-            Teamerübersicht
+            Teamer:innenübersicht
         </h1>
         <div class="flex flex-col items-end space-y-2 md:flex-row md:items-center md:space-x-2 md:space-y-0">
             <button type="button"
                     class="{{ html_classes('btn btn--small', { 'btn--secondary': filterDto.active }) }}"
                     {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
                     {{ stimulus_action('modal-button', 'ajax', null, {
-                        'title': 'Teamer filtern',
+                        'title': 'Teamer:innen filtern',
                         'url': path('app_common_teamer_filter', { 'r': return_url() })
                     }) }}>
                 <div class="flex items-center space-x-1">
@@ -94,7 +94,7 @@
                         </td>
                         <td>
                             <div class="flex items-center space-x-1 justify-end">
-                                <a href="{{ path('app_admin_teamer_profile', { 'uuid': teamer.uuid }) }}" title="Teamerprofil {{ teamer }}">
+                                <a href="{{ path('app_admin_teamer_profile', { 'uuid': teamer.uuid }) }}" title="Teamer:innenprofil {{ teamer }}">
                                     {{ icon('user') }}
                                 </a>
                             </div>

templates/teamer/assignment/index.html.twig

@@ -23,8 +23,15 @@
                         {% include '_partials/_errorbox.html.twig' with {
                             'message': 'Deine Bewerbung wurde leider abgelehnt.'
                         } %}
-                        {% if application.remarks %}
+                        {% if application.comment and application.commentVisible %}
-                            <strong>Begründung:</strong> {{ application.remarks|nl2br}}
+                            <strong>Begründung:</strong> {{ application.comment|nl2br}}
+                        {% endif %}
+                    {% elseif application.status == constant('App\\Entity\\Application::STATUS_PENDING') %}
+                        {% include '_partials/_infobox.html.twig' with {
+                            'message': 'Deine Bewerbung befindet sich in Bearbeitung.'
+                        } %}
+                        {% if application.comment and application.commentVisible %}
+                            <strong>Begründung:</strong> {{ application.comment|nl2br}}
                         {% endif %}
                     {% else %}
                         {% include '_partials/_infobox.html.twig' with {

templates/teamer/contact/index.html.twig

@@ -41,8 +41,8 @@
         Kontakt
     </h1>
     <p class="pb-4">
-        Hast du allgemeine Fragen zum Teamer-sein bei E&amp;P Reisen, zur Benutzung von MyE&amp;P Team, zur Abrechnung
+        Hast du allgemeine Fragen zum Teamer:innen-sein bei E&amp;P Reisen, zur Benutzung von MyE&amp;P Team, zur
-        oder Sonstigem? Hast du schon geschaut, ob deine Frage in den FAQs beantwortet wird?
+        Abrechnung oder Sonstigem? Hast du schon geschaut, ob deine Frage in den FAQs beantwortet wird?
     </p>
     <p>
         Dann melde dich gerne beim Team Personalplanung!

templates/teamer/profile/availability/index.html.twig

@@ -4,7 +4,7 @@
 
 {% block content %}
     <h1 class="text-2xl font-bold pb-4">
-        Meine Vergfügbarkeit
+        Meine Verfügbarkeit
     </h1>
     <p class="pb-8">
         Hier kannst du angeben, wann du allgemein Zeit und Lust hättest, Einsätze zu absolvieren. Wenn wir in diesem
@@ -28,7 +28,7 @@
                             </h4>
                             {% for availability in availabilities %}
                                 <div class="flex items-center space-x-2">
-                                    <span>{{ availability }}</span>
+                                    <span>{{ availability }}{% if availability.description %} ({{ availability.description }}){% endif %}</span>
                                     {% if is_granted('DELETE', availability) %}
                                         <button type="button"
                                                 title="Zeitraum entfernen/löschen"
@@ -70,7 +70,7 @@
                             </h4>
                             {% for availability in availabilities %}
                                 <div class="flex items-center space-x-2">
-                                    <span>{{ availability }}</span>
+                                    <span>{{ availability }}{% if availability.description %} ({{ availability.description }}){% endif %}</span>
                                     <a href="{{ path('app_teamer_profile_availability_add', { 'id': availability.id }) }}"
                                        title="Zeitraum hinzufügen">
                                         {{ icon('plus', 'w-5 h-5') }}