Merge branch 'Xbird/AddLastWish' into 'main'

Add Last Wish on directories medical's informations

See merge request gamexperience/vision!33

composer.json

@@ -73,7 +73,11 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/flex": true,
+            "symfony/runtime": true
+        }
     },
     "autoload": {
         "psr-4": {

migrations/Version20220717151252.php

@@ -0,0 +1,31 @@
+<?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 Version20220717151252 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 directory ADD medical_last_wish 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 directory DROP medical_last_wish');
+    }
+}

package.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.2.2"
+  "version": "0.2.3"
 }

src/Entity/Directory.php

@@ -477,6 +477,11 @@ class Directory
      */
     private $medicaltrusted;
 
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $medicalLastWish;
+
 
     public function __construct()
     {
@@ -1506,4 +1511,16 @@ class Directory
 
         return $this;
     }
+
+    public function getMedicalLastWish(): ?string
+    {
+        return $this->medicalLastWish;
+    }
+
+    public function setMedicalLastWish(?string $medicalLastWish): self
+    {
+        $this->medicalLastWish = $medicalLastWish;
+
+        return $this;
+    }
 }

src/Form/DirectoryType.php

@@ -82,6 +82,15 @@ class DirectoryType extends AbstractType
                 'attr' => ['style' => 'height: 400px;']
                 ]
             )
+            ->add(
+                'medicalLastWish',
+                ContentType::class,
+                ['label' => 'form_label_medical_lastwish',
+                'help' => 'form_help_medical_lastwish',
+                'required' => false,
+                'attr' => ['style' => 'height: 400px;']
+                ]
+            )
             ->add(
                 'medicalTrusted',
                 ContentType::class,

templates/_cells/directoryCardMedical.html.twig

@@ -10,6 +10,10 @@
             <p>{% trans %}title_medical_contact{% endtrans %}</p><hr>
             {{ directory.medicalContact | raw }}
         </div>
+        <div class=" mb-2 p-2 border">
+            <p>{% trans %}title_medical_lastwish{% endtrans %}</p><hr>
+            {{ directory.medicalLastWish | raw }}
+        </div>
         <div class=" mb-2 p-2 border">
             <p>{% trans %}title_medical_trusted{% endtrans %}</p><hr>
             {{ directory.medicalTrusted | raw }}

translations/messages+intl-icu.en.yaml

@@ -317,6 +317,7 @@ form_label_medical_contact: Emergency contact
 form_label_medical_drugs: Drugs
 form_label_medical_family_history: Family history
 form_label_medical_history: Medical background
+form_label_medical_lastwish: Last wish
 form_label_medical_treatment: Ongoing treatments
 form_label_medical_trusted: Trusted people
 form_label_model: Template
@@ -751,6 +752,7 @@ title_medical_drugs: Drugs
 title_medical_family_history: Family history
 title_medical_history: Medical history
 title_medical_informations: Medical Informations
+title_medical_lastwish: Last Wish
 title_medical_treatment: Medical Treatment
 title_medical_trusted: Trusted people
 title_medicals: Medical visits

translations/messages+intl-icu.fr.yaml

@@ -317,6 +317,7 @@ form_label_medical_contact: Contact en cas d'urgence
 form_label_medical_drugs: Drogues
 form_label_medical_family_history: Antécédents Familiaux
 form_label_medical_history: Antécédents Médicaux
+form_label_medical_lastwish: Dernières volontés
 form_label_medical_treatment: Traitements en cours
 form_label_medical_trusted: Personnes de confiance
 form_label_model: Modèle
@@ -750,6 +751,7 @@ title_medical_drugs: Drogues
 title_medical_family_history: Antécédents Familiaux
 title_medical_history: Antécédents Médicaux
 title_medical_informations: Informations médicales
+title_medical_lastwish: Dernières volontés
 title_medical_treatment: Traitements
 title_medical_trusted: Personnes de confiance
 title_medicals: Visites médicales