From fc172fdb1f4dfca6b1cda5dc6c03411a89fa45b3 Mon Sep 17 00:00:00 2001
From: Jean-Francois Monfort <jean-francois@monfort.me>
Date: Thu, 6 May 2021 13:40:25 +0200
Subject: [PATCH] Add documents to Activity Form

---
 .../ChillActivityBundle/Entity/Activity.php   |  2 +-
 .../ChillActivityBundle/Form/ActivityType.php | 13 +++++-
 .../Resources/views/Activity/edit.html.twig   | 14 +++++--
 .../Resources/views/Activity/new.html.twig    | 15 +++++--
 .../migrations/Version20210506112500.php      | 42 +++++++++++++++++++
 5 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index cd00e503a..d66737ff6 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -119,7 +119,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
     private Collection $thirdParties;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\Document")
+     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject")
      */
     private Collection $documents;
 
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 05a3cac36..c4f918396 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -5,6 +5,8 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\CommentType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -12,6 +14,7 @@ use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -183,8 +186,14 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        // TODO : documents
-        //$documents
+        if ($activityType->isVisible('documents')) {
+            $builder->add('documents', ChillCollectionType::class, [
+                'entry_type' => StoredObjectType::class,
+                'label' => $activityType->getLabel('documents'),
+                'required' => $activityType->isRequired('documents'),
+                'allow_add' => true,
+            ]);
+        }
 
         if ($activityType->isVisible('users')) {
             $builder->add('users', EntityType::class, [
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index e4db4d943..fb84ae725 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -63,6 +63,9 @@
     {%- if form.sentReceived is defined -%}
         {{ form_row(form.sentReceived) }}
     {% endif %}
+    {%- if form.documents is defined -%}
+        {{ form_row(form.documents) }}
+    {% endif %}
 
     {{ form_widget(edit_form) }}
         <ul class="record_actions sticky-form-buttons">
@@ -81,7 +84,12 @@
 {% endblock %}
 
 {% block js %}
-<script type="text/javascript">
-    chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-</script>
+    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    <script type="text/javascript">
+        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+    </script>
+{% endblock %}
+
+{% block css %}
+    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 1c88f9494..5323815fd 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -65,6 +65,10 @@
         {{ form_row(form.sentReceived) }}
     {% endif %}
 
+    {%- if form.documents is defined -%}
+        {{ form_row(form.documents) }}
+    {% endif %}
+
     <div class="grid-12 centered sticky-form-buttons">
         <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
     </div>
@@ -72,7 +76,12 @@
 {% endblock %}
 
 {% block js %}
-<script type="text/javascript">
-    chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-</script>
+    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    <script type="text/javascript">
+        chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+    </script>
+{% endblock %}
+
+{% block css %}
+    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php b/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
new file mode 100644
index 000000000..ca80d7720
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20210506112500 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('CREATE TABLE activity_storedobject (activity_id INT NOT NULL, storedobject_id INT NOT NULL, PRIMARY KEY(activity_id, storedobject_id))');
+        $this->addSql('CREATE INDEX IDX_6F660E9381C06096 ON activity_storedobject (activity_id)');
+        $this->addSql('CREATE INDEX IDX_6F660E93EE684399 ON activity_storedobject (storedobject_id)');
+        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E9381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E93EE684399 FOREIGN KEY (storedobject_id) REFERENCES chill_doc.stored_object (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('DROP TABLE activity_document');
+
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('CREATE TABLE activity_document (activity_id INT NOT NULL, document_id INT NOT NULL, PRIMARY KEY(activity_id, document_id))');
+        $this->addSql('CREATE INDEX idx_78633a78c33f7837 ON activity_document (document_id)');
+        $this->addSql('CREATE INDEX idx_78633a7881c06096 ON activity_document (activity_id)');
+        $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT fk_78633a7881c06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('DROP TABLE activity_storedobject');
+    }
+}