Merge branch '139_demandeur' of gitlab.com:Chill-Projet/chill-bundles into 139_demandeur

2025-06-07 18:44:08 +00:00 · 2021-05-20 09:53:33 +02:00 · 2021-05-20 09:53:33 +02:00 · 5e0d869d9b
commit 5e0d869d9b
parent 9da4c1ebeb 32b8de8997
9 changed files with 136 additions and 30 deletions
--- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
@ -2,6 +2,7 @@

 namespace Chill\MainBundle\Doctrine\Event;

+use Chill\MainBundle\Entity\User;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Events;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
@ -37,7 +38,8 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
    {
        $object = $args->getObject();

-        if ($object instanceof TrackCreationInterface) {
+        if ($object instanceof TrackCreationInterface
+            && $this->security->getUser() instanceof User) {
            $object->setCreatedBy($this->security->getUser());
            $object->setCreatedAt(new \DateTimeImmutable('now'));
        }
@ -54,7 +56,8 @@ class TrackCreateUpdateSubscriber implements EventSubscriber

    protected function onUpdate(object $object): void
    {
-        if ($object instanceof TrackUpdateInterface) {
+        if ($object instanceof TrackUpdateInterface 
+            && $this->security->getUser() instanceof User) {
            $object->setUpdatedBy($this->security->getUser());
            $object->setUpdatedAt(new \DateTimeImmutable('now'));
        }
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@ -22,6 +22,8 @@

 namespace Chill\PersonBundle\Entity;

+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
@ -29,6 +31,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Resource;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@ -46,7 +49,7 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 *  "accompanying_period"=AccompanyingPeriod::class
 *  })
 */
-class AccompanyingPeriod
+class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface
 {
    /**
     * Mark an accompanying period as "occasional"
@ -260,6 +263,23 @@ class AccompanyingPeriod
     */
    private Collection $socialIssues;

+    /**
+     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     */
+    private \DateTimeInterface $createdAt;
+
+    /**
+     * @ORM\ManyToOne(
+     *    targetEntity=User::class
+     * )
+     */
+    private User $updatedBy;
+    
+    /**
+     * @ORM\Column(type="datetime", nullable=true, options={"default": NULL})
+     */
+    private \DateTimeInterface $updatedAt;
+
    /**
     * AccompanyingPeriod constructor.
     *
@ -789,4 +809,25 @@ class AccompanyingPeriod
            }
        );
    }
+
+    public function setCreatedAt(\DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(\DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
 }
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@ -3,6 +3,7 @@
 namespace Chill\PersonBundle\Menu;

 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
 use Symfony\Contracts\Translation\TranslatorInterface;

@ -32,24 +33,31 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
    
    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
    {
+        $period = $parameters['accompanyingCourse'];
+
        $menu->addChild($this->translator->trans('Resume Accompanying Course'), [
            'route' => 'chill_person_accompanying_course_index',
            'routeParameters' => [
-                'accompanying_period_id' => $parameters['accompanyingCourse']->getId()
+                'accompanying_period_id' => $period->getId()
        ]])
        ->setExtras(['order' => 10]);
        
        $menu->addChild($this->translator->trans('Edit Accompanying Course'), [
            'route' => 'chill_person_accompanying_course_show',
            'routeParameters' => [
-                'accompanying_period_id' => $parameters['accompanyingCourse']->getId()
+                'accompanying_period_id' => $period->getId()
        ]])
        ->setExtras(['order' => 20]);

+        if (AccompanyingPeriod::STEP_DRAFT === $period->getStep()) {
+            // no more menu items if the period is draft
+            return;
+        }
+
        $menu->addChild($this->translator->trans('Accompanying Course Details'), [
            'route' => 'chill_person_accompanying_course_history',
            'routeParameters' => [
-                'accompanying_period_id' => $parameters['accompanyingCourse']->getId()
+                'accompanying_period_id' => $period->getId()
        ]])
        ->setExtras(['order' => 30]);
    }
--- a/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
@ -71,6 +71,14 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                    'icons' => [ 'plus' ]
                ]);
        }
+
+        $menu->addChild($this->translator->trans('Create an accompanying course'), [
+                'route' => 'chill_person_accompanying_course_new'
+            ])
+            ->setExtras([
+                'order' => 11,
+                'icons' => [ 'plus' ]
+            ]);
    }
    
    /**
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig
@ -12,19 +12,17 @@
            </div>

            <div class="grid-4">
-                <ul class="record_actions">
-                    <li>ponctuel <i class="fa fa-toggle-on fa-fw"></i> régulier</li>
-                    <li>ouvert</li>
-                    <li>en file active</li>
-                    <li>urgent</li>
-                </ul>
            </div>

            <div class="grid-3">
                <p style="text-align: right;">
-                <i>{{ 'Started on %date%'|trans({'%date%': accompanyingCourse.openingDate|format_date('short') } ) }}</i><br>
-                {% if accompanyingCourse.user is not null %}
-                par <b>{{ accompanyingCourse.user.usernameCanonical }}</b>
+                {% if 'DRAFT' == accompanyingCourse.getStep() %}
+                  Brouillon
+                {% else %}
+                  <i>{{ 'Started on %date%'|trans({'%date%': accompanyingCourse.openingDate|format_date('short') } ) }}</i><br>
+                  {% if accompanyingCourse.user is not null %}
+                    par <b>{{ accompanyingCourse.user.username }}</b>
+                  {% endif %}
                {% endif %}
                </p>
            </div>
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@ -6,21 +6,23 @@

 {% block content %}

-    <h1>{{ block('title') }}</h1>
+  {% if 'DRAFT' == accompanyingCourse.step %}
+  <div class="grid-8 centered error flash_message">
+      <span>
+        {{ 'This accompanying course is still a draft'|trans }} 
+        <a href="{{ path('chill_person_accompanying_course_show', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
+        {{ 'Edit & activate accompanying course'|trans }}
+        </a>
+      </span>
+  </div>
+  {% endif %}

-    <pre>
-{{ accompanyingCourse.id }}
-{{ accompanyingCourse.openingDate|format_date('short') }}
-{{ accompanyingCourse.closingDate|format_date('short') }}
-{{ accompanyingCourse.closingMotive|chill_entity_render_box }}
-{{ accompanyingCourse.remark|raw }}
-{{ accompanyingCourse.user }}
-usagers:
-{% for p in accompanyingCourse.participations %}
-    {{ p.person.id }} | <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">{{ p.person.fullnamecanonical }}</a> | {{ p.startdate|format_date('short') }} | {{ p.enddate|format_date('short') }}
-{% endfor %}
-    </pre>
+  <h1>{{ 'Associated peoples'|trans }}</h1>

-    {{ dump() }}
+  <h1>{{ 'Resources'|trans }}</h1>
+
+  <h1>{{ 'Social actions'|trans }}</h1>
+  
+  <h1>{{ 'Last events on accompanying course'|trans }}</h1>

 {% endblock %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig
@ -1,7 +1,9 @@
 {% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}

+{% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
+
 {% block title %}
-    {{ 'Edit Accompanying Course'|trans }}
+    {{ title|trans }}
 {% endblock %}

 {% block content %}
--- a/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20210519204938.php
@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add updatedAt, updatedBy, createdAt on accompanying period
+ */
+final class Version20210519204938 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add updatedAt, updatedBy, createdAt on accompanying period';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD updatedBy_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period ADD CONSTRAINT FK_E260A86865FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_E260A86865FF1AEC ON chill_person_accompanying_period (updatedBy_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP createdAt');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP updatedAt');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period DROP updatedBy_id');
+    }
+}
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@ -153,6 +153,7 @@ Update accompanying period: Mettre à jour une période d'accompagnement
 Any accompanying periods are open: Aucune période d'accompagnement ouverte
 An accompanying period is open: Une période d'accompagnement est ouverte
 Accompanying period list: Périodes d'accompagnement
+New accompanying course: Nouveau parcours d'accompagnement
 Choose a motive: Motif de fermeture
 Re-open accompanying period: Ré-ouvrir
 Re-Open a period: Ré-ouvrir
@ -162,6 +163,14 @@ Pediod closing form is not valid: Le formulaire n'est pas valide
 Accompanying user: Accompagnant
 No accompanying user: Aucun accompagnant
 No data given: Pas d'information
+Create an accompanying course: Créer un parcours
+This accompanying course is still a draft: Ce parcours est à l'état brouillon
+Associated peoples: Usagers concernés
+Resources: Interlocuteurs privilégiés
+Social actions: Actions d'accompagnement
+Last events on accompanying course: Dernières actions de suivi
+Edit & activate accompanying course: Modifier et valider
+
 # pickAPersonType
 Pick a person: Choisir une personne