From b8cc61d94b13b059a790e5a5bd2bd32754d7bf82 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 1 May 2020 15:19:30 +0200 Subject: [PATCH] manage polls --- src/Controller/FediPlanController.php | 9 +++++ src/Form/ComposeType.php | 13 +++---- src/Form/PollOptionType.php | 5 +-- src/SocialEntity/Compose.php | 48 ++++--------------------- src/SocialEntity/PollOption.php | 4 +++ templates/fediplan/schedule.html.twig | 52 +++++++++++++-------------- translations/fediplan.en.yaml | 6 +++- 7 files changed, 60 insertions(+), 77 deletions(-) diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php index c943d8a..d6a00c8 100644 --- a/src/Controller/FediPlanController.php +++ b/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()) { diff --git a/src/Form/ComposeType.php b/src/Form/ComposeType.php index 2fc8a02..a4c969d 100644 --- a/src/Form/ComposeType.php +++ b/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']); } diff --git a/src/Form/PollOptionType.php b/src/Form/PollOptionType.php index abf8f80..d5f70a5 100644 --- a/src/Form/PollOptionType.php +++ b/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', ]); } diff --git a/src/SocialEntity/Compose.php b/src/SocialEntity/Compose.php index 6c3d220..fa922c0 100644 --- a/src/SocialEntity/Compose.php +++ b/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; - } - - } diff --git a/src/SocialEntity/PollOption.php b/src/SocialEntity/PollOption.php index db71315..19e8e3a 100644 --- a/src/SocialEntity/PollOption.php +++ b/src/SocialEntity/PollOption.php @@ -44,4 +44,8 @@ class PollOption } + public function __toString() + { + return $this->title; + } } \ No newline at end of file diff --git a/templates/fediplan/schedule.html.twig b/templates/fediplan/schedule.html.twig index bb194be..21b902e 100644 --- a/templates/fediplan/schedule.html.twig +++ b/templates/fediplan/schedule.html.twig @@ -112,34 +112,26 @@ {% endif %} -
+
+    + + +
- +
@@ -168,9 +160,11 @@ {% endif %}
+
+ @@ -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 = $(''); + var $addTagButton = $(''); var $newLinkLi = $('
  • ').append($addTagButton); jQuery(document).ready(function() { @@ -505,7 +505,7 @@ } function addOptionFormDeleteLink($tagFormLi) { - var $removeFormButton = $(''); + var $removeFormButton = $(''); $tagFormLi.append($removeFormButton); $removeFormButton.on('click', function(e) { $tagFormLi.remove(); diff --git a/translations/fediplan.en.yaml b/translations/fediplan.en.yaml index a5a4eff..134cf82 100644 --- a/translations/fediplan.en.yaml +++ b/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 \ No newline at end of file + end_in: End in + poll_item: Poll choice + add_poll_item: Add a choice + remove_poll_item: Remove this choice \ No newline at end of file