manage polls

src/Controller/FediPlanController.php

@@ -14,8 +14,10 @@ use App\Services\Mastodon_api;
 use App\SocialEntity\Client;
 use App\SocialEntity\Compose;
 use App\SocialEntity\MastodonAccount;
+use App\SocialEntity\PollOption;
 use DateTime;
 use DateTimeZone;
+use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -152,6 +154,13 @@ class FediPlanController extends AbstractController
     {
 
         $compose = new Compose();
+
+        $pollOption1 = new PollOption();
+        $pollOption1->setTitle("");
+        $compose->getPollOptions()->add($pollOption1);
+        $pollOption2 = new PollOption();
+        $pollOption2->setTitle("");
+        $compose->getPollOptions()->add($pollOption2);
         $form = $this->createForm(ComposeType::class, $compose, ['user' => $this->getUser()]);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {

src/Form/ComposeType.php

@@ -84,18 +84,14 @@ class ComposeType extends AbstractType {
             "data" => new DateTime(),
             'label' => 'page.schedule.form.scheduled_at',
             'translation_domain' => 'fediplan']);
-        $builder->add('Send', SubmitType::class,
-            ['attr' => ['class' => "btn btn-primary "],
-                'label' => 'page.schedule.form.send',
-                'translation_domain' => 'fediplan']);
 
-        $builder->add('poll_option_1', TextType::class, ['required' => false]);
-        $builder->add('poll_option_2', TextType::class, ['required' => false]);
         $builder->add('poll_options', CollectionType::class,
             [
                 'entry_type'   => PollOptionType::class,
+                'by_reference' => false,
                 'allow_add' => true,
                 'prototype' => true,
+                'entry_options' => ['label' => false],
                 'allow_delete' => true,
                 'required' => false,
             ]);
@@ -114,9 +110,14 @@ class ComposeType extends AbstractType {
                     $this->translator->trans('poll.duration_d', ['days' => 7], 'fediplan') => 7*24*60*60,
 
                 ],
+                'data' => 24*60*60,
                 'required' => false,
                 'label' => 'page.schedule.form.end_in',
                 'translation_domain' => 'fediplan']);
+        $builder->add('Send', SubmitType::class,
+            ['attr' => ['class' => "btn btn-primary "],
+                'label' => 'page.schedule.form.send',
+                'translation_domain' => 'fediplan']);
     }
 
 

src/Form/PollOptionType.php

@@ -26,10 +26,11 @@ class PollOptionType extends AbstractType {
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('option', TextType::class,
+        $builder->add('title', TextType::class,
             [
                 'required' => false,
-                'attr'=> ['class'=>'form-control']
+                'attr'=> ['class'=>'form-control'],
+                'label' => 'page.schedule.form.poll_item',
             ]);
     }
 

src/SocialEntity/Compose.php

@@ -5,6 +5,7 @@ namespace App\SocialEntity;
 use DateTime;
 use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 
 
 class Compose
@@ -30,20 +31,16 @@ class Compose
 
     private $timeZone;
 
-    /** @var PollOption[] */
     private $poll_options;
     /** @var int */
     private $poll_expires_at;
     /** @var bool */
     private $poll_multiple;
-    /** @var PollOption */
-    private $poll_option_1;
-    /** @var PollOption */
-    private $poll_option_2;
 
     public function __construct()
     {
         $this->attachments = new ArrayCollection();
+        $this->poll_options = new ArrayCollection();
     }
 
     /**
@@ -167,17 +164,17 @@ class Compose
     }
 
     /**
-     * @return PollOption[]
+     * @return ArrayCollection|null
      */
-    public function getPollOptions(): ?array
+    public function getPollOptions(): ?ArrayCollection
     {
         return $this->poll_options;
     }
 
     /**
-     * @param PollOption[] $poll_options
+     * @param ArrayCollection $poll_options
      */
-    public function setPollOptions(?array $poll_options): void
+    public function setPollOptions(?ArrayCollection $poll_options): void
     {
         $this->poll_options = $poll_options;
     }
@@ -214,37 +211,4 @@ class Compose
         $this->poll_multiple = $poll_multiple;
     }
 
-    /**
-     * @return PollOption
-     */
-    public function getPollOption1(): ?PollOption
-    {
-        return $this->poll_option_1;
-    }
-
-    /**
-     * @param PollOption $poll_option_1
-     */
-    public function setPollOption1(?PollOption $poll_option_1): void
-    {
-        $this->poll_option_1 = $poll_option_1;
-    }
-
-    /**
-     * @return PollOption
-     */
-    public function getPollOption2(): ?PollOption
-    {
-        return $this->poll_option_2;
-    }
-
-    /**
-     * @param PollOption $poll_option_2
-     */
-    public function setPollOption2(?PollOption $poll_option_2): void
-    {
-        $this->poll_option_2 = $poll_option_2;
-    }
-
-
 }

src/SocialEntity/PollOption.php

@@ -44,4 +44,8 @@ class PollOption
     }
 
 
+    public function __toString()
+    {
+        return $this->title;
+    }
 }

templates/fediplan/schedule.html.twig

@@ -112,34 +112,26 @@
                         {% endif %}
                     </div>
                 </div>
-                <div class=" col-md-3"></div>
+                <div class="col-md-2">
+                    <label for="count">{{ 'common.poll'|trans }}</label>&nbsp;&nbsp;
+                    <span id="poll_switch" class="form-control" style="text-align: center;cursor:pointer;" >  <i class="fa fa-tasks fa-fw"></i></span>
+
+                </div>
             </div>
 
-
+            <div id="poll_container" class="d-none">
             <ul class="options"
-                data-prototype="{{ form_widget(form.poll_options.vars.prototype.option)|e('html_attr') }}">
+                data-prototype="{{ form_widget(form.poll_options.vars.prototype)|e('html_attr') }}">
-                <div class="form-group has-feedback">
+                {% for option in form.poll_options %}
-                    {{ form_label(form.poll_option_1) }}
+                    {{ form_widget(option) }}
-                    {{ form_widget(form.poll_option_1, {'attr': {'class': 'form-control'}}) }}
+                    {% if not option.vars.errors is empty %}
-                    {% if not form.poll_option_1.vars.errors is empty %}
                         <span class="badge badge-danger">
-                                {% for errorItem in form.poll_option_1.vars.errors %}
+                            {% for errorItem in option.vars.errors %}
-                                    {{ errorItem.message }}
+                                {{ errorItem.message }}
-                                {% endfor %}
+                            {% endfor %}
-                            </span>
+                        </span>
                     {% endif %}
-                </div>
+                {%  endfor %}
-                <div class="form-group has-feedback">
-                    {{ form_label(form.poll_option_2) }}
-                    {{ form_widget(form.poll_option_2, {'attr': {'class': 'form-control'}}) }}
-                    {% if not form.poll_option_2.vars.errors is empty %}
-                        <span class="badge badge-danger">
-                                {% for errorItem in form.poll_option_2.vars.errors %}
-                                    {{ errorItem.message }}
-                                {% endfor %}
-                            </span>
-                    {% endif %}
-                </div>
             </ul>
             <div class="row">
                 <div class=" col-md-12">
@@ -168,9 +160,11 @@
                             {% endif %}
                             </div>
                         </div>
+
                     </div>
                 </div>
             </div>
+            </div>
         </div>
 
 
@@ -477,11 +471,17 @@
 
         $(document).ready(function() {
 
-
+            $('#poll_switch').click(function (e) {
+                if($('#poll_container').hasClass("d-none") ){
+                    $('#poll_container').removeClass("d-none");
+                }else{
+                    $('#poll_container').addClass("d-none");
+                }
+            });
             var $collectionHolder;
 
             // setup an "add a tag" link
-            var $addTagButton = $('<button type="button" style="margin-top:20px;" class="add_tag_link btn btn-secondary">Add an option</button>');
+            var $addTagButton = $('<button type="button" style="margin-top:20px;" class="add_tag_link btn btn-secondary">{{ "page.schedule.form.add_poll_item"|trans }}</button>');
             var $newLinkLi = $('<li></li>').append($addTagButton);
 
             jQuery(document).ready(function() {
@@ -505,7 +505,7 @@
             }
 
             function addOptionFormDeleteLink($tagFormLi) {
-                var $removeFormButton = $('<button type="button" style="margin-top: 5px;" class="btn btn-danger btn-sm">Delete this option</button>');
+                var $removeFormButton = $('<button type="button" style="margin-top: 5px;" class="btn btn-danger btn-sm">{{ "page.schedule.form.remove_poll_item"|trans }}</button>');
                 $tagFormLi.append($removeFormButton);
                 $removeFormButton.on('click', function(e) {
                     $tagFormLi.remove();

translations/fediplan.en.yaml

@@ -26,6 +26,7 @@ common:
   error: Error
   no: "No"
   yes: "Yes"
+  poll: Poll
 status:
   visibility:
     public: Public
@@ -66,4 +67,7 @@ page:
       send: Send
       add_files: Add files...
       multiple: Multiple
-      end_in: End in
+      end_in: End in
+      poll_item: Poll choice
+      add_poll_item: Add a choice
+      remove_poll_item: Remove this choice