forked from GNUsocial/gnu-social
[Poll] Polls now have an associated note, poll templates, start_show_styles event, started css
This commit is contained in:
parent
090c593a61
commit
7a299162e1
@ -88,7 +88,7 @@ class Posting extends Module
|
|||||||
* $actor_id, possibly as a reply to note $reply_to and with flag
|
* $actor_id, possibly as a reply to note $reply_to and with flag
|
||||||
* $is_local. Sanitizes $content and $attachments
|
* $is_local. Sanitizes $content and $attachments
|
||||||
*/
|
*/
|
||||||
public static function storeNote(int $actor_id, string $content, array $attachments, bool $is_local, ?int $reply_to = null, ?int $repeat_of = null)
|
public static function storeNote(int $actor_id, ?string $content, array $attachments, bool $is_local, ?int $reply_to = null, ?int $repeat_of = null)
|
||||||
{
|
{
|
||||||
$note = Note::create([
|
$note = Note::create([
|
||||||
'gsactor_id' => $actor_id,
|
'gsactor_id' => $actor_id,
|
||||||
|
@ -22,12 +22,19 @@
|
|||||||
namespace Plugin\Poll\Controller;
|
namespace Plugin\Poll\Controller;
|
||||||
|
|
||||||
use App\Core\DB\DB;
|
use App\Core\DB\DB;
|
||||||
|
use App\Core\Form;
|
||||||
|
use function App\Core\I18n\_m;
|
||||||
use App\Core\Security;
|
use App\Core\Security;
|
||||||
|
use App\Entity\Note;
|
||||||
use App\Entity\Poll;
|
use App\Entity\Poll;
|
||||||
use App\Util\Common;
|
use App\Util\Common;
|
||||||
use App\Util\Exception\InvalidFormException;
|
use App\Util\Exception\InvalidFormException;
|
||||||
use App\Util\Exception\RedirectException;
|
use App\Util\Exception\RedirectException;
|
||||||
use Plugin\Poll\Forms\NewPollForm;
|
use Plugin\Poll\Forms\NewPollForm;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\FormType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||||
|
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -61,19 +68,43 @@ class NewPoll
|
|||||||
{
|
{
|
||||||
$user = Common::ensureLoggedIn();
|
$user = Common::ensureLoggedIn();
|
||||||
$numOptions = Common::clamp($num,MIN_OPTS,MAX_OPTS);
|
$numOptions = Common::clamp($num,MIN_OPTS,MAX_OPTS);
|
||||||
$form = NewPollForm::make($numOptions);
|
//$form = NewPollForm::make($numOptions);
|
||||||
|
/*
|
||||||
|
$opts =
|
||||||
|
['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'expanded' => true, 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]],
|
||||||
|
// ['to', ChoiceType::class, ['label' => _m('To:'), 'multiple' => true, 'expanded' => true, 'choices' => $to_tags]],
|
||||||
|
['post', SubmitType::class, ['label' => _m('Post')]],
|
||||||
|
];
|
||||||
|
*/
|
||||||
|
$opts[] = ['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'expanded' => true, 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]];
|
||||||
|
$opts[] = ['Question', TextType::class, ['label' => _m(('Question'))]];
|
||||||
|
|
||||||
|
for ($i = 1; $i <= $numOptions; ++$i) {
|
||||||
|
//['Option_i', TextType::class, ['label' => _m('Option i')]],
|
||||||
|
$opts[] = ['Option_' . $i, TextType::class, ['label' => _m(('Option ' . $i))]];
|
||||||
|
}
|
||||||
|
//$subForm = Form::create($subOpts);
|
||||||
|
//$opts[] = ['options',FormType::class,[$subForm]];
|
||||||
|
$opts[] = ['post_poll', SubmitType::class, ['label' => _m('Post')]];
|
||||||
|
|
||||||
|
$form = Form::create($opts);
|
||||||
|
|
||||||
$form->handleRequest($request);
|
$form->handleRequest($request);
|
||||||
$opt = [];
|
$opt = [];
|
||||||
if ($form->isSubmitted()) {
|
if ($form->isSubmitted()) {
|
||||||
if ($form->isValid()) {
|
if ($form->isValid()) {
|
||||||
$data = $form->getData();
|
$data = $form->getData();
|
||||||
|
|
||||||
|
$note = Note::create(['gsactor_id' => $user->getId(), $is_local = true]);
|
||||||
|
DB::persist($note);
|
||||||
|
|
||||||
Security::sanitize($question = $data['Question']);
|
Security::sanitize($question = $data['Question']);
|
||||||
for ($i = 1; $i <= $numOptions; ++$i) {
|
for ($i = 1; $i <= $numOptions; ++$i) {
|
||||||
Security::sanitize($opt[$i - 1] = $data['Option_' . $i]);
|
Security::sanitize($opt[$i - 1] = $data['Option_' . $i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$options = implode("\n",$opt);
|
$options = implode("\n",$opt);
|
||||||
$poll = Poll::create(['gsactor_id' => $user->getId(), 'question' => $question, 'options' => $options]);
|
$poll = Poll::create(['gsactor_id' => $user->getId(), 'question' => $question, 'options' => $options, 'note_id' => $note->getId()]);
|
||||||
DB::persist($poll);
|
DB::persist($poll);
|
||||||
DB::flush();
|
DB::flush();
|
||||||
throw new RedirectException('showpoll', ['id' => $poll->getId()]);
|
throw new RedirectException('showpoll', ['id' => $poll->getId()]);
|
||||||
|
@ -21,8 +21,10 @@
|
|||||||
|
|
||||||
namespace Plugin\Poll\Controller;
|
namespace Plugin\Poll\Controller;
|
||||||
|
|
||||||
|
use App\Entity\Note;
|
||||||
use App\Entity\Poll;
|
use App\Entity\Poll;
|
||||||
use App\Util\Common;
|
use App\Util\Common;
|
||||||
|
use App\Util\Exception\NoSuchNoteException;
|
||||||
use App\Util\Exception\NotFoundException;
|
use App\Util\Exception\NotFoundException;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
@ -55,6 +57,12 @@ class ShowPoll
|
|||||||
|
|
||||||
$poll = Poll::getFromId((int) $id);
|
$poll = Poll::getFromId((int) $id);
|
||||||
|
|
||||||
|
$note = Note::getFromId($poll->getNoteId());
|
||||||
|
|
||||||
|
if (!$note->isVisibleTo($user)) {
|
||||||
|
throw new NoSuchNoteException();
|
||||||
|
}
|
||||||
|
|
||||||
if ($poll == null) {
|
if ($poll == null) {
|
||||||
throw new NotFoundException('Poll does not exist');
|
throw new NotFoundException('Poll does not exist');
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ use App\Entity\Poll;
|
|||||||
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
|
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
|
||||||
use Symfony\Component\Form\Form as SymfForm;
|
use Symfony\Component\Form\Form as SymfForm;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -53,20 +52,18 @@ class PollResponseForm extends Form
|
|||||||
public static function make(Poll $poll,int $noteId): SymfForm
|
public static function make(Poll $poll,int $noteId): SymfForm
|
||||||
{
|
{
|
||||||
$opts = $poll->getOptionsArr();
|
$opts = $poll->getOptionsArr();
|
||||||
$question = $poll->getQuestion();
|
|
||||||
$formOptions = [];
|
$formOptions = [];
|
||||||
$options = [];
|
$options = [];
|
||||||
for ($i = 1; $i <= count($opts); ++$i) {
|
for ($i = 1; $i <= count($opts); ++$i) {
|
||||||
$options[$opts[$i - 1]] = $i;
|
$options[$opts[$i - 1]] = $i;
|
||||||
}
|
}
|
||||||
$formOptions = [
|
$formOptions = [
|
||||||
['Question', TextType::class, ['data' => $question, 'label' => _m(('Question')), 'disabled' => true]],
|
['Options' . $poll->getId(), ChoiceType::class, [
|
||||||
['Options:', ChoiceType::class, [
|
|
||||||
'choices' => $options,
|
'choices' => $options,
|
||||||
'expanded' => true,
|
'expanded' => true,
|
||||||
]],
|
]],
|
||||||
['note_id', HiddenType::class, ['data' => $noteId]],
|
['note_id', HiddenType::class, ['data' => $noteId]],
|
||||||
['pollresponse', SubmitType::class, ['label' => _m('Submit')]],
|
['pollresponse', SubmitType::class, ['label' => _m('Vote')]],
|
||||||
];
|
];
|
||||||
return parent::create($formOptions);
|
return parent::create($formOptions);
|
||||||
}
|
}
|
||||||
|
@ -22,20 +22,17 @@ namespace Plugin\Poll;
|
|||||||
|
|
||||||
use App\Core\DB\DB;
|
use App\Core\DB\DB;
|
||||||
use App\Core\Event;
|
use App\Core\Event;
|
||||||
use App\Core\Form;
|
|
||||||
use function App\Core\I18n\_m;
|
|
||||||
use App\Core\Module;
|
use App\Core\Module;
|
||||||
use App\Core\Router\RouteLoader;
|
use App\Core\Router\RouteLoader;
|
||||||
use App\Entity\Note;
|
use App\Entity\Note;
|
||||||
use App\Entity\Poll as PollEntity;
|
|
||||||
use App\Entity\PollResponse;
|
use App\Entity\PollResponse;
|
||||||
use App\Util\Common;
|
use App\Util\Common;
|
||||||
use App\Util\Exception\InvalidFormException;
|
use App\Util\Exception\InvalidFormException;
|
||||||
|
use App\Util\Exception\NotFoundException;
|
||||||
|
use App\Util\Exception\RedirectException;
|
||||||
use App\Util\Exception\ServerException;
|
use App\Util\Exception\ServerException;
|
||||||
use Plugin\Poll\Forms\PollResponseForm;
|
use Plugin\Poll\Forms\PollResponseForm;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
|
use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\NumberType;
|
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -87,19 +84,41 @@ class Poll extends Module
|
|||||||
return Event::next;
|
return Event::next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function onStartShowStyles(array &$styles): bool
|
||||||
|
{
|
||||||
|
$styles[] = 'poll/poll.css';
|
||||||
|
return Event::next;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display a poll in the timeline
|
* Display a poll in the timeline
|
||||||
*/
|
*/
|
||||||
public function onShowNoteContent(Request $request, Note $note, array &$actions)
|
public function onShowNoteContent(Request $request, Note $note, array &$test)
|
||||||
{
|
{
|
||||||
$user = Common::ensureLoggedIn();
|
$responses = null;
|
||||||
$poll = PollEntity::getFromId(21);
|
$formView = null;
|
||||||
|
try {
|
||||||
|
$poll = DB::findOneBy('poll', ['note_id' => $note->getId()]);
|
||||||
|
} catch (NotFoundException $e) {
|
||||||
|
return Event::next;
|
||||||
|
}
|
||||||
|
|
||||||
if (!PollResponse::exits($poll->getId(), $user->getId())) {
|
if (Common::isLoggedIn() && !PollResponse::exits($poll->getId(), Common::ensureLoggedIn()->getId())) {
|
||||||
$form = PollResponseForm::make($poll, $note->getId());
|
$form = PollResponseForm::make($poll, $note->getId());
|
||||||
$ret = self::noteActionHandle($request, $form, $note, 'pollresponse', function ($note, $data) {
|
$formView = $form->createView();
|
||||||
|
$ret = self::noteActionHandle($request, $form, $note, 'pollresponse', /** TODO Documentation */ function ($note, $data) {
|
||||||
$user = Common::ensureLoggedIn();
|
$user = Common::ensureLoggedIn();
|
||||||
$poll = PollEntity::getFromId(21); //substituir por get from note
|
|
||||||
|
try {
|
||||||
|
$poll = DB::findOneBy('poll', ['note_id' => $note->getId()]);
|
||||||
|
} catch (NotFoundException $e) {
|
||||||
|
return Event::next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (PollResponse::exits($poll->getId(), $user->getId())) {
|
||||||
|
return Event::next;
|
||||||
|
}
|
||||||
|
|
||||||
$selection = array_values($data)[1];
|
$selection = array_values($data)[1];
|
||||||
if (!$poll->isValidSelection($selection)) {
|
if (!$poll->isValidSelection($selection)) {
|
||||||
throw new InvalidFormException();
|
throw new InvalidFormException();
|
||||||
@ -110,20 +129,17 @@ class Poll extends Module
|
|||||||
$pollResponse = PollResponse::create(['poll_id' => $poll->getId(), 'gsactor_id' => $user->getId(), 'selection' => $selection]);
|
$pollResponse = PollResponse::create(['poll_id' => $poll->getId(), 'gsactor_id' => $user->getId(), 'selection' => $selection]);
|
||||||
DB::persist($pollResponse);
|
DB::persist($pollResponse);
|
||||||
DB::flush();
|
DB::flush();
|
||||||
return Event::stop;
|
|
||||||
|
throw new RedirectException();
|
||||||
});
|
});
|
||||||
} else {
|
if ($ret != null) {
|
||||||
$options[] = ['Question', TextType::class, ['data' => $poll->getQuestion(), 'label' => _m(('Question')), 'disabled' => true]];
|
return $ret;
|
||||||
$responses = $poll->countResponses();
|
|
||||||
$i = 0;
|
|
||||||
foreach ($responses as $option => $num) {
|
|
||||||
//['Option_i', TextType::class, ['label' => _m('Option i')]],
|
|
||||||
$options[] = ['Option_' . $i, NumberType::class, ['data' => $num, 'label' => $option, 'disabled' => true]];
|
|
||||||
++$i;
|
|
||||||
}
|
}
|
||||||
$form = Form::create($options);
|
} else {
|
||||||
|
$responses = $poll->countResponses();
|
||||||
}
|
}
|
||||||
$actions[] = $form->createView();
|
//$test[] = $form->createView();
|
||||||
|
$test[] = ['name' => 'Poll', 'vars' => ['question' => $poll->getQuestion(), 'responses' => $responses, 'form' => $formView]];
|
||||||
return Event::next;
|
return Event::next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -284,10 +284,27 @@
|
|||||||
margin-left: 0.2em;
|
margin-left: 0.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* top right */
|
||||||
|
.create-top-right{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
color: var(--fg);
|
||||||
|
background-color: var(--bg1);
|
||||||
|
border-radius: 0 var(--unit-size) 0 0;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tabs */
|
||||||
|
|
||||||
|
.tabs{
|
||||||
|
padding: var(--unit-size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* scope options */
|
/* scope options */
|
||||||
.scope {
|
.scope {
|
||||||
order: 1;
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
color: var(--fg);
|
color: var(--fg);
|
||||||
|
@ -284,16 +284,32 @@
|
|||||||
margin-left: 0.2em;
|
margin-left: 0.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.create-top-right{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
color: var(--fg);
|
||||||
|
background-color: var(--bg1);
|
||||||
|
border-radius: 0 var(--unit-size) 0 0;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tabs */
|
||||||
|
|
||||||
|
.tabs{
|
||||||
|
padding: var(--unit-size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* scope options */
|
/* scope options */
|
||||||
.scope {
|
.scope {
|
||||||
order: 1;
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
color: var(--fg);
|
color: var(--fg);
|
||||||
background-color: var(--bg1);
|
background-color: var(--bg1);
|
||||||
border-radius: 0 var(--unit-size) 0 0;
|
border-radius: 0 var(--unit-size) 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.scope > div {
|
.scope > div {
|
||||||
display: inline;
|
display: inline;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
@ -284,10 +284,25 @@
|
|||||||
margin-left: 0.2em;
|
margin-left: 0.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.create-top-right{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
color: var(--fg);
|
||||||
|
background-color: var(--bg1);
|
||||||
|
border-radius: 0 var(--unit-size) 0 0;
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tabs */
|
||||||
|
|
||||||
|
.tabs{
|
||||||
|
padding: var(--unit-size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* scope options */
|
/* scope options */
|
||||||
.scope {
|
.scope {
|
||||||
order: 1;
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
color: var(--fg);
|
color: var(--fg);
|
||||||
|
83
public/assets/css/poll/poll.css
Normal file
83
public/assets/css/poll/poll.css
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
.poll .poll-question{
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.poll #pollresponse_Options{
|
||||||
|
display:flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
#pollresponse > * > label{
|
||||||
|
vertical-align:top;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.poll .form-single ,
|
||||||
|
.create-poll-notice .form-single{
|
||||||
|
padding: 0 var(--unit-size);
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
border-radius: var(--small-size);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* FORMS ------------------------------*/
|
||||||
|
.poll label {
|
||||||
|
display: inline-block;
|
||||||
|
font-family: 'Montserrat', sans-serif;
|
||||||
|
width: 100%;
|
||||||
|
padding: 0.5em 0.1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.poll input[type=text],
|
||||||
|
.create-poll-notice input[type=text]{
|
||||||
|
margin-top: calc(var(--unit-size) * 0.5);
|
||||||
|
width: calc(100% - var(--unit-size));
|
||||||
|
background-color: var(--bg2);
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
border: solid 2px var(--accent-low);
|
||||||
|
padding: calc(var(--unit-size) * 0.5) calc(var(--unit-size) * 0.5);
|
||||||
|
color: var(--fg);
|
||||||
|
border-radius: calc(var(--unit-size) * 0.5);
|
||||||
|
font-size: var(--medium-size);
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.poll button[type=submit] ,
|
||||||
|
.create-poll-notice button[type=submit]{
|
||||||
|
background: var(--bg1);
|
||||||
|
padding: calc(var(--unit-size) * 0.8) calc(var(--unit-size) * 2);
|
||||||
|
color: var(--fg);
|
||||||
|
border-style: solid;
|
||||||
|
border-color: var(--accent);
|
||||||
|
border-radius: var(--unit-size);
|
||||||
|
border-width: 2px;
|
||||||
|
font-family: 'Montserrat', sans-serif;
|
||||||
|
font-size: var(--small-size);
|
||||||
|
font-weight: 700;
|
||||||
|
margin-top: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#post_poll_visibility {
|
||||||
|
font-size: var(--medium-size);
|
||||||
|
color: var(--fg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-poll-notice{
|
||||||
|
padding: var(--unit-size);
|
||||||
|
}
|
||||||
|
|
||||||
|
#post_poll > *{
|
||||||
|
padding: calc(var(--unit-size) * 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#post_poll_visibility > *{
|
||||||
|
padding-right: calc(var(--unit-size) * 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.create-poll-notice {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
@ -42,6 +42,7 @@ class Poll extends Entity
|
|||||||
private int $id;
|
private int $id;
|
||||||
private ?string $uri;
|
private ?string $uri;
|
||||||
private ?int $gsactor_id;
|
private ?int $gsactor_id;
|
||||||
|
private int $note_id;
|
||||||
private ?string $question;
|
private ?string $question;
|
||||||
private ?string $options;
|
private ?string $options;
|
||||||
private DateTimeInterface $created;
|
private DateTimeInterface $created;
|
||||||
@ -80,6 +81,17 @@ class Poll extends Entity
|
|||||||
return $this->gsactor_id;
|
return $this->gsactor_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setNoteId(int $note_id): self
|
||||||
|
{
|
||||||
|
$this->note_id = $note_id;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getNoteId(): int
|
||||||
|
{
|
||||||
|
return $this->note_id;
|
||||||
|
}
|
||||||
|
|
||||||
public function setQuestion(?string $question): self
|
public function setQuestion(?string $question): self
|
||||||
{
|
{
|
||||||
$this->question = $question;
|
$this->question = $question;
|
||||||
@ -137,19 +149,19 @@ class Poll extends Entity
|
|||||||
'name' => 'poll',
|
'name' => 'poll',
|
||||||
'description' => 'Per-notice poll data for Poll plugin',
|
'description' => 'Per-notice poll data for Poll plugin',
|
||||||
'fields' => [
|
'fields' => [
|
||||||
'id' => ['type' => 'serial', 'not null' => true],
|
'id' => ['type' => 'serial', 'not null' => true],
|
||||||
'uri' => ['type' => 'varchar', 'length' => 191],
|
'uri' => ['type' => 'varchar', 'length' => 191],
|
||||||
// 'uri' => ['type' => 'varchar', 'length' => 191, 'not null' => true],
|
|
||||||
'gsactor_id' => ['type' => 'int'],
|
'gsactor_id' => ['type' => 'int'],
|
||||||
|
'note_id' => ['type' => 'int', 'not null' => true],
|
||||||
'question' => ['type' => 'text'],
|
'question' => ['type' => 'text'],
|
||||||
'options' => ['type' => 'text'],
|
'options' => ['type' => 'text'],
|
||||||
'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
|
'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
|
||||||
'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
|
'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
|
||||||
],
|
],
|
||||||
'primary key' => ['id'],
|
'primary key' => ['id'],
|
||||||
// 'unique keys' => [
|
'unique keys' => [
|
||||||
// 'poll_uri_key' => ['uri'],
|
'poll_note_id' => ['note_id'],
|
||||||
// ],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,6 +50,7 @@ class Extension extends AbstractExtension
|
|||||||
new TwigFunction('is_route', [Runtime::class, 'isCurrentRoute']),
|
new TwigFunction('is_route', [Runtime::class, 'isCurrentRoute']),
|
||||||
new TwigFunction('get_note_actions', [Runtime::class, 'getNoteActions']),
|
new TwigFunction('get_note_actions', [Runtime::class, 'getNoteActions']),
|
||||||
new TwigFunction('get_note_test', [Runtime::class, 'getNoteTest']),
|
new TwigFunction('get_note_test', [Runtime::class, 'getNoteTest']),
|
||||||
|
new TwigFunction('get_show_styles', [Runtime::class, 'getShowStyles']),
|
||||||
new TwigFunction('config', [Runtime::class, 'getConfig']),
|
new TwigFunction('config', [Runtime::class, 'getConfig']),
|
||||||
new TwigFunction('icon', [Runtime::class, 'embedSvgIcon'], ['needs_environment' => true]),
|
new TwigFunction('icon', [Runtime::class, 'embedSvgIcon'], ['needs_environment' => true]),
|
||||||
];
|
];
|
||||||
|
@ -31,15 +31,11 @@
|
|||||||
namespace App\Twig;
|
namespace App\Twig;
|
||||||
|
|
||||||
use App\Core\Event;
|
use App\Core\Event;
|
||||||
use App\Core\Form;
|
|
||||||
use function App\Core\I18n\_m;
|
|
||||||
use App\Entity\Note;
|
use App\Entity\Note;
|
||||||
use App\Util\Common;
|
use App\Util\Common;
|
||||||
use App\Util\Formatting;
|
use App\Util\Formatting;
|
||||||
use Functional as F;
|
use Functional as F;
|
||||||
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\NumberType;
|
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpKernel\Event\RequestEvent;
|
use Symfony\Component\HttpKernel\Event\RequestEvent;
|
||||||
use Symfony\Component\HttpKernel\KernelEvents;
|
use Symfony\Component\HttpKernel\KernelEvents;
|
||||||
@ -79,25 +75,7 @@ class Runtime implements RuntimeExtensionInterface, EventSubscriberInterface
|
|||||||
{
|
{
|
||||||
$test = [];
|
$test = [];
|
||||||
Event::handle('show_note_content', [$this->request, $note, &$test]);
|
Event::handle('show_note_content', [$this->request, $note, &$test]);
|
||||||
/*
|
|
||||||
$options = [];
|
|
||||||
|
|
||||||
$options[0] = ['Question', TextType::class, ['data'=>'fav color?','label' => _m(('Question')),'disabled'=>true]];
|
|
||||||
|
|
||||||
$options[1] = ['Option_1', NumberType::class, ['data'=>3,'label' => 'blue','disabled'=>true]];
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
$options[0] = ['Question', TextType::class, ['data'=>'fav color?','label' => _m(('Question')),'disabled'=>true]];
|
|
||||||
$options[1] = ['Options:', ChoiceType::class, [
|
|
||||||
'choices' => ['blue','green'],
|
|
||||||
'expanded' => true,
|
|
||||||
]];
|
|
||||||
$options[2] = ['save', SubmitType::class, ['label' => _m('Submit')]];
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
$form = Form::create($options);
|
|
||||||
$test[0] = $form->createView();
|
|
||||||
*/
|
|
||||||
return $test;
|
return $test;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -106,6 +84,13 @@ class Runtime implements RuntimeExtensionInterface, EventSubscriberInterface
|
|||||||
return Common::config(...$args);
|
return Common::config(...$args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getShowStyles()
|
||||||
|
{
|
||||||
|
$styles = [];
|
||||||
|
Event::handle('start_show_styles',[&$styles]);
|
||||||
|
return $styles;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------
|
// ----------------------------------------------------------
|
||||||
|
|
||||||
// Request is not a service, can't find a better way to get it
|
// Request is not a service, can't find a better way to get it
|
||||||
|
@ -108,6 +108,11 @@ abstract class Common
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function isLoggedIn(): bool
|
||||||
|
{
|
||||||
|
return self::user() != null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Is the given string identical to a system path or route?
|
* Is the given string identical to a system path or route?
|
||||||
* This could probably be put in some other class, but at
|
* This could probably be put in some other class, but at
|
||||||
|
@ -2,32 +2,42 @@
|
|||||||
{% extends 'left/left.html.twig' %}
|
{% extends 'left/left.html.twig' %}
|
||||||
|
|
||||||
{% block meta %}
|
{% block meta %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block title %}New Poll{% endblock %}
|
{% block title %}Welcome!{% endblock %}
|
||||||
|
|
||||||
{% block stylesheets %}
|
{% block stylesheets %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/network/public.css') }}"
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/network/public.css') }}"
|
||||||
media="screen and (min-width: 1300px)">
|
media="screen and (min-width: 1300px)">
|
||||||
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/network/public_mid.css') }}"
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/network/public_mid.css') }}"
|
||||||
media="screen and (max-width: 1300px)">
|
media="screen and (max-width: 1300px)">
|
||||||
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/network/public_small.css') }}"
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/network/public_small.css') }}"
|
||||||
media="screen and (max-width: 750px)">
|
media="screen and (max-width: 750px)">
|
||||||
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/poll/poll.css') }}"
|
||||||
|
media="screen">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block left %}
|
{% block left %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<div class="content">
|
{{ parent() }}
|
||||||
{{ form(form) }}
|
<div class="content">
|
||||||
|
<div class="create-notice">
|
||||||
|
<div class="create-poll-notice">
|
||||||
|
{% block form %}
|
||||||
|
<div class='form-single'>
|
||||||
|
{{ form(form) }}
|
||||||
|
</div>
|
||||||
|
{% endblock form %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock body %}
|
{% endblock body %}
|
||||||
|
|
||||||
|
17
templates/Poll/view.html.twig
Normal file
17
templates/Poll/view.html.twig
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
|
||||||
|
<div class="poll">
|
||||||
|
<p class="poll-question">{{ vars.question }}</p>
|
||||||
|
{% if vars.form is not null %}
|
||||||
|
{% block form %}
|
||||||
|
<div class='form-single'>
|
||||||
|
{{ form(vars.form) }}
|
||||||
|
</div>
|
||||||
|
{% endblock form %}
|
||||||
|
{% else %}
|
||||||
|
<ul>
|
||||||
|
{% for question, votes in vars.responses %}
|
||||||
|
<li>{{ question }}: {{ votes }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
@ -14,9 +14,13 @@
|
|||||||
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/base_mid.css') }}" media="screen and (max-width: 1300px)">
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/base_mid.css') }}" media="screen and (max-width: 1300px)">
|
||||||
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/base_small.css') }}" media="screen and (max-width: 750px)">
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/base_small.css') }}" media="screen and (max-width: 750px)">
|
||||||
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/reset.css') }}">
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/reset.css') }}">
|
||||||
|
{% for stylesheet in get_show_styles() %}
|
||||||
|
<link rel='stylesheet' type='text/css' href="{{ asset('assets/css/' ~ stylesheet) }}">
|
||||||
|
{% endfor %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{% block header %}
|
{% block header %}
|
||||||
<div id='header'>
|
<div id='header'>
|
||||||
|
@ -38,13 +38,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="create-right">
|
<div class="create-right">
|
||||||
<div class="scope">
|
<div class="create-top-right">
|
||||||
{{ form_row(post_form.visibility) }}
|
<div class="scope">
|
||||||
|
{{ form_row(post_form.visibility) }}
|
||||||
|
</div>
|
||||||
{% for tab in tabs %}
|
<div class="tabs">
|
||||||
<a href={{ path(tab['href']) }}>{{ tab['title'] }}</a>
|
{% for tab in tabs %}
|
||||||
{% endfor %}
|
<a href={{ path(tab['href']) }}>{{ tab['title'] }}</a>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="input-wrapper">
|
<div class="input-wrapper">
|
||||||
<div class="content-input">
|
<div class="content-input">
|
||||||
|
@ -12,14 +12,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="note-content">
|
<div class="note-content">
|
||||||
{{ note.getContent() }}
|
{{ note.getContent() }}
|
||||||
|
<div class="note-extra-content">
|
||||||
|
|
||||||
{% if have_user %}
|
|
||||||
{% for test in get_note_test(note) %}
|
{% for test in get_note_test(note) %}
|
||||||
{{ form(test) }}
|
{% include '/'~ test.name ~ '/view.html.twig' with {'vars': test.vars} only %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
</div>
|
||||||
|
|
||||||
<div class="note-attachments">
|
<div class="note-attachments">
|
||||||
{% for attachment in note.getAttachments() %}
|
{% for attachment in note.getAttachments() %}
|
||||||
{% if attachment.mimetype starts with 'image/' %}
|
{% if attachment.mimetype starts with 'image/' %}
|
||||||
|
Loading…
Reference in New Issue
Block a user