tykayn
/
date-poll-api
mirror of https://framagit.org/tykayn/date-poll-api
1
0
Fork 0
Code Issues Releases Wiki Activity

reorder fields for poll display

This commit is contained in:
Tykayn 2021-11-25 12:57:24 +01:00 committed by tykayn
parent 85efc2cbe5
commit 83978f1757
2 changed files with 858 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/api/v1/PollController.php
View File

@ -104,7 +104,7 @@ class PollController extends EmailsController {
} else { } else {
// free access to poll // free access to poll
return $this->json( $poll->display() ); return $this->json( sort( $poll->display()) );
} }
} }

240
src/Entity/Poll.php
View File

@ -16,7 +16,8 @@ use JMS\Serializer\Annotation as Serializer;
* @ORM\Entity(repositoryClass="App\Repository\PollRepository") * @ORM\Entity(repositoryClass="App\Repository\PollRepository")
* @Serializer\ExclusionPolicy("all") * @Serializer\ExclusionPolicy("all")
*/ */
class Poll { class Poll
{
use RandomTrait; use RandomTrait;
@ -201,7 +202,8 @@ class Poll {
private $adminKey; private $adminKey;
private $maxChoicesLimit = 25; private $maxChoicesLimit = 25;
public function __construct() { public function __construct()
{
$this->initiate(); $this->initiate();
$this->setCreatedAt(new DateTime()); $this->setCreatedAt(new DateTime());
@ -212,7 +214,8 @@ class Poll {
$this->comments = new ArrayCollection(); $this->comments = new ArrayCollection();
} }
private function initiate() { private function initiate()
{
$this->votes = new ArrayCollection(); $this->votes = new ArrayCollection();
$this->stacksOfVotes = new ArrayCollection(); $this->stacksOfVotes = new ArrayCollection();
$this->choices = new ArrayCollection(); $this->choices = new ArrayCollection();
@ -226,13 +229,15 @@ class Poll {
$this->setAllowedAnswers(['yes', 'maybe', 'no']); $this->setAllowedAnswers(['yes', 'maybe', 'no']);
} }
public function setCreatedAt( DateTimeInterface $createdAt ): self { public function setCreatedAt(DateTimeInterface $createdAt): self
{
$this->createdAt = $createdAt; $this->createdAt = $createdAt;
return $this; return $this;
} }
public function displayForAdmin() { public function displayForAdmin()
{
$content = $this->display(); $content = $this->display();
$content['owner'] = $this->getOwner()->displayForAdmin(); $content['owner'] = $this->getOwner()->displayForAdmin();
$content['admin_key'] = $this->getAdminKey(); $content['admin_key'] = $this->getAdminKey();
@ -244,7 +249,8 @@ class Poll {
// counts each number of answer for this choice // counts each number of answer for this choice
public function display() { public function display()
{
$computedAnswers = $this->computeAnswers(); $computedAnswers = $this->computeAnswers();
$displayedStackOfVotes = []; $displayedStackOfVotes = [];
@ -262,43 +268,33 @@ class Poll {
$resp = [ $resp = [
'title' => $this->getTitle(),
'description' => $this->getDescription(),
'choices_grouped' => $computedAnswers[ 'grouped_dates' ],
'created_at' => $this->getCreatedAt()->format( 'c' ),
'expiracy_date' => $this->getExpiracyDate()->format( 'c' ),
'votes_max' => $this->getVotesMax(),
'custom_url' => $this->getCustomUrl(),
'choices_max' => $this->getChoicesMax(),
'kind' => $this->getKind(),
'allowed_answers' => $this->getAllowedAnswers(), 'allowed_answers' => $this->getAllowedAnswers(),
'votes_allowed' => $this->getVotesAllowed(),
'modification_policy' => $this->getModificationPolicy(),
'hide_results' => $this->getHideResults(),
'show_results_even_if_password' => $this->getShowResultEvenIfPasswords(),
'owner' => [
'pseudo' => $this->getOwner()->getPseudo(),
]
,
'choices' => $computedAnswers['answers'], 'choices' => $computedAnswers['answers'],
'password_protected' => $this->getPassword() ? 'yes' : 'no', 'choices_grouped' => $computedAnswers['grouped_dates'],
'max_score' => $computedAnswers[ 'max_score' ], 'choices_max' => $this->getChoicesMax(),
'stacks' => $displayedStackOfVotes,
'comments' => $displayedComments, 'comments' => $displayedComments,
'created_at' => $this->getCreatedAt()->format('c'),
'custom_url' => $this->getCustomUrl(),
'description' => $this->getDescription(),
'expiracy_date' => $this->getExpiracyDate()->format('c'),
'hide_results' => $this->getHideResults(),
'kind' => $this->getKind(),
'max_score' => $computedAnswers['max_score'],
'modification_policy' => $this->getModificationPolicy(),
'owner' => ['pseudo' => $this->getOwner()->getPseudo(),],
'password_protected' => $this->getPassword() ? 'yes' : 'no',
'show_results_even_if_password' => $this->getShowResultEvenIfPasswords(),
'stacks' => $displayedStackOfVotes,
'title' => $this->getTitle(),
'votes_allowed' => $this->getVotesAllowed(),
'votes_max' => $this->getVotesMax(),
]; ];
// if ( $this->getKind() == 'text' ) {
// $resp[ 'choices' ] = $computedAnswers[ 'grouped_dates' ];
// $resp[ 'choices_grouped' ] = $computedAnswers[ 'answers' ];
// } elseif ( $this->getKind() == 'date' ) {
// $resp[ 'choices' ] = $computedAnswers[ 'answers' ];
// $resp[ 'choices_grouped' ] = $computedAnswers[ 'grouped_dates' ];
// }
return $resp; return $resp;
} }
public function computeAnswers() { public function computeAnswers()
{
$computedArray = []; $computedArray = [];
$grouped_dates = []; $grouped_dates = [];
$maxScore = 0; $maxScore = 0;
@ -323,8 +319,7 @@ class Poll {
"choice_id" => $choice->getId(), "choice_id" => $choice->getId(),
"name" => $boom[1], "name" => $boom[1],
]; ];
} } elseif (count($boom) == 1) {
elseif(count( $boom ) == 1){
$name = $choice->getName(); $name = $choice->getName();
$grouped_dates[$name] = [ $grouped_dates[$name] = [
@ -452,25 +447,30 @@ class Poll {
/** /**
* @return Collection|Choice[] * @return Collection|Choice[]
*/ */
public function getChoices(): Collection { public function getChoices(): Collection
{
return $this->choices; return $this->choices;
} }
public function getKind(): ?string { public function getKind(): ?string
{
return $this->kind; return $this->kind;
} }
public function setKind( string $kind ): self { public function setKind(string $kind): self
{
$this->kind = $kind; $this->kind = $kind;
return $this; return $this;
} }
public function getStacksOfVotes() { public function getStacksOfVotes()
{
return $this->stacksOfVotes; return $this->stacksOfVotes;
} }
public function setStacksOfVotes( ?StackOfVotes $stacksOfVotes ): self { public function setStacksOfVotes(?StackOfVotes $stacksOfVotes): self
{
$this->stacksOfVotes = $stacksOfVotes; $this->stacksOfVotes = $stacksOfVotes;
return $this; return $this;
@ -479,69 +479,83 @@ class Poll {
/** /**
* @return Collection|Comment[] * @return Collection|Comment[]
*/ */
public function getComments(): Collection { public function getComments(): Collection
{
return $this->comments; return $this->comments;
} }
public function getTitle(): ?string { public function getTitle(): ?string
{
return $this->title; return $this->title;
} }
public function setTitle( string $title ): self { public function setTitle(string $title): self
{
$this->title = $title; $this->title = $title;
return $this; return $this;
} }
public function getDescription(): ?string { public function getDescription(): ?string
{
return $this->description; return $this->description;
} }
public function setDescription( string $description ): self { public function setDescription(string $description): self
{
$this->description = $description; $this->description = $description;
return $this; return $this;
} }
public function getCreatedAt(): ?DateTimeInterface { public function getCreatedAt(): ?DateTimeInterface
{
return $this->createdAt; return $this->createdAt;
} }
public function getExpiracyDate(): ?DateTimeInterface { public function getExpiracyDate(): ?DateTimeInterface
{
return $this->expiracyDate; return $this->expiracyDate;
} }
public function setExpiracyDate( DateTimeInterface $expiracyDate ): self { public function setExpiracyDate(DateTimeInterface $expiracyDate): self
{
$this->expiracyDate = $expiracyDate; $this->expiracyDate = $expiracyDate;
return $this; return $this;
} }
public function getVotesMax() { public function getVotesMax()
{
return $this->votesMax; return $this->votesMax;
} }
public function setVotesMax( $votesMax ): self { public function setVotesMax($votesMax): self
{
$this->votesMax = $votesMax; $this->votesMax = $votesMax;
return $this; return $this;
} }
public function getChoicesMax() { public function getChoicesMax()
{
return $this->choicesMax; return $this->choicesMax;
} }
public function setChoicesMax( $choicesMax ): self { public function setChoicesMax($choicesMax): self
{
$this->choicesMax = $choicesMax; $this->choicesMax = $choicesMax;
return $this; return $this;
} }
public function getAllowedAnswers(): ?array { public function getAllowedAnswers(): ?array
{
return $this->allowedAnswers; return $this->allowedAnswers;
} }
public function setAllowedAnswers( array $allowedAnswers ): self { public function setAllowedAnswers(array $allowedAnswers): self
{
if (!count($allowedAnswers)) { if (!count($allowedAnswers)) {
$this->allowedAnswers = ['yes']; $this->allowedAnswers = ['yes'];
} else { } else {
@ -551,81 +565,97 @@ class Poll {
return $this; return $this;
} }
public function getVotesAllowed(): ?bool { public function getVotesAllowed(): ?bool
{
return $this->votesAllowed; return $this->votesAllowed;
} }
public function setVotesAllowed( ?bool $votesAllowed ): self { public function setVotesAllowed(?bool $votesAllowed): self
{
$this->votesAllowed = $votesAllowed; $this->votesAllowed = $votesAllowed;
return $this; return $this;
} }
public function getModificationPolicy(): ?string { public function getModificationPolicy(): ?string
{
return $this->modificationPolicy; return $this->modificationPolicy;
} }
public function setModificationPolicy( string $modificationPolicy ): self { public function setModificationPolicy(string $modificationPolicy): self
{
$this->modificationPolicy = $modificationPolicy; $this->modificationPolicy = $modificationPolicy;
return $this; return $this;
} }
public function getHideResults(): ?bool { public function getHideResults(): ?bool
{
return $this->hideResults; return $this->hideResults;
} }
public function setHideResults( bool $hideResults ): self { public function setHideResults(bool $hideResults): self
{
$this->hideResults = $hideResults; $this->hideResults = $hideResults;
return $this; return $this;
} }
public function getShowResultEvenIfPasswords(): ?bool { public function getShowResultEvenIfPasswords(): ?bool
{
return $this->showResultEvenIfPasswords; return $this->showResultEvenIfPasswords;
} }
public function setShowResultEvenIfPasswords( bool $showResultEvenIfPasswords ): self { public function setShowResultEvenIfPasswords(bool $showResultEvenIfPasswords): self
{
$this->showResultEvenIfPasswords = $showResultEvenIfPasswords; $this->showResultEvenIfPasswords = $showResultEvenIfPasswords;
return $this; return $this;
} }
public function getOwner(): ?Owner { public function getOwner(): ?Owner
{
return $this->owner; return $this->owner;
} }
public function setOwner( ?Owner $owner ): self { public function setOwner(?Owner $owner): self
{
$this->owner = $owner; $this->owner = $owner;
return $this; return $this;
} }
public function getPassword(): ?string { public function getPassword(): ?string
{
return $this->password; return $this->password;
} }
public function setPassword( string $password ): self { public function setPassword(string $password): self
{
$this->password = md5($password); $this->password = md5($password);
return $this; return $this;
} }
public function getAdminKey(): ?string { public function getAdminKey(): ?string
{
return $this->adminKey; return $this->adminKey;
} }
public function setAdminKey( string $adminKey ): self { public function setAdminKey(string $adminKey): self
{
$this->adminKey = $adminKey; $this->adminKey = $adminKey;
return $this; return $this;
} }
public function getId(): ?int { public function getId(): ?int
{
return $this->id; return $this->id;
} }
public function findChoiceById( int $id ) { public function findChoiceById(int $id)
{
$choices = $this->getChoices(); $choices = $this->getChoices();
$counter = 0; $counter = 0;
@ -647,41 +677,49 @@ class Poll {
/** /**
* @return Collection|Vote[] * @return Collection|Vote[]
*/ */
public function getVotes(): Collection { public function getVotes(): Collection
{
return $this->votes; return $this->votes;
} }
public function getCustomUrl(): ?string { public function getCustomUrl(): ?string
{
return $this->customUrl; return $this->customUrl;
} }
public function setCustomUrl( string $customUrl ): self { public function setCustomUrl(string $customUrl): self
{
$this->customUrl = $customUrl; $this->customUrl = $customUrl;
return $this; return $this;
} }
public function getMailOnComment(): ?bool { public function getMailOnComment(): ?bool
{
return $this->mailOnComment; return $this->mailOnComment;
} }
public function setMailOnComment( bool $mailOnComment ): self { public function setMailOnComment(bool $mailOnComment): self
{
$this->mailOnComment = $mailOnComment; $this->mailOnComment = $mailOnComment;
return $this; return $this;
} }
public function getMailOnVote(): ?bool { public function getMailOnVote(): ?bool
{
return $this->mailOnVote; return $this->mailOnVote;
} }
public function setMailOnVote( bool $mailOnVote ): self { public function setMailOnVote(bool $mailOnVote): self
{
$this->mailOnVote = $mailOnVote; $this->mailOnVote = $mailOnVote;
return $this; return $this;
} }
public function addComment( Comment $comment ): self { public function addComment(Comment $comment): self
{
if (!$this->comments->contains($comment)) { if (!$this->comments->contains($comment)) {
$this->comments[] = $comment; $this->comments[] = $comment;
$comment->setPoll($this); $comment->setPoll($this);
@ -690,7 +728,8 @@ class Poll {
return $this; return $this;
} }
public function removeComment( Comment $comment ): self { public function removeComment(Comment $comment): self
{
if ($this->comments->contains($comment)) { if ($this->comments->contains($comment)) {
$this->comments->removeElement($comment); $this->comments->removeElement($comment);
// set the owning side to null (unless already changed) // set the owning side to null (unless already changed)
@ -702,7 +741,8 @@ class Poll {
return $this; return $this;
} }
public function addStackOfVote( StackOfVotes $stackOfVote ): self { public function addStackOfVote(StackOfVotes $stackOfVote): self
{
if (!$this->stacksOfVotes->contains($stackOfVote)) { if (!$this->stacksOfVotes->contains($stackOfVote)) {
$this->stacksOfVotes[] = $stackOfVote; $this->stacksOfVotes[] = $stackOfVote;
$stackOfVote->setPoll($this); $stackOfVote->setPoll($this);
@ -711,7 +751,8 @@ class Poll {
return $this; return $this;
} }
public function removeStackOfVote( StackOfVotes $stackOfVote ): self { public function removeStackOfVote(StackOfVotes $stackOfVote): self
{
if ($this->stacksOfVotes->contains($stackOfVote)) { if ($this->stacksOfVotes->contains($stackOfVote)) {
$this->stacksOfVotes->removeElement($stackOfVote); $this->stacksOfVotes->removeElement($stackOfVote);
// set the owning side to null (unless already changed) // set the owning side to null (unless already changed)
@ -723,7 +764,8 @@ class Poll {
return $this; return $this;
} }
public function addVote( Vote $vote ): self { public function addVote(Vote $vote): self
{
if (!$this->votes->contains($vote)) { if (!$this->votes->contains($vote)) {
$this->votes[] = $vote; $this->votes[] = $vote;
$vote->setPoll($this); $vote->setPoll($this);
@ -732,7 +774,8 @@ class Poll {
return $this; return $this;
} }
public function removeVote( Vote $vote ): self { public function removeVote(Vote $vote): self
{
if ($this->votes->contains($vote)) { if ($this->votes->contains($vote)) {
$this->votes->removeElement($vote); $this->votes->removeElement($vote);
// set the owning side to null (unless already changed) // set the owning side to null (unless already changed)
@ -744,7 +787,8 @@ class Poll {
return $this; return $this;
} }
public function addTextChoiceArray( array $choiceTextArray ): self { public function addTextChoiceArray(array $choiceTextArray): self
{
foreach ($choiceTextArray as $text) { foreach ($choiceTextArray as $text) {
$newChoice = new Choice(); $newChoice = new Choice();
$newChoice->setName($text); $newChoice->setName($text);
@ -754,7 +798,8 @@ class Poll {
return $this; return $this;
} }
public function addChoice( Choice $choice ): self { public function addChoice(Choice $choice): self
{
if (!is_null($this->choices)) { if (!is_null($this->choices)) {
if (!$this->choices->contains($choice)) { if (!$this->choices->contains($choice)) {
$this->choices[] = $choice; $this->choices[] = $choice;
@ -769,7 +814,8 @@ class Poll {
return $this; return $this;
} }
public function addStacksOfVote( StackOfVotes $stacksOfVote ): self { public function addStacksOfVote(StackOfVotes $stacksOfVote): self
{
if (!$this->stacksOfVotes->contains($stacksOfVote)) { if (!$this->stacksOfVotes->contains($stacksOfVote)) {
$this->stacksOfVotes[] = $stacksOfVote; $this->stacksOfVotes[] = $stacksOfVote;
$stacksOfVote->setPoll($this); $stacksOfVote->setPoll($this);
@ -778,7 +824,8 @@ class Poll {
return $this; return $this;
} }
public function removeStacksOfVote( StackOfVotes $stacksOfVote ): self { public function removeStacksOfVote(StackOfVotes $stacksOfVote): self
{
if ($this->stacksOfVotes->contains($stacksOfVote)) { if ($this->stacksOfVotes->contains($stacksOfVote)) {
$this->stacksOfVotes->removeElement($stacksOfVote); $this->stacksOfVotes->removeElement($stacksOfVote);
// set the owning side to null (unless already changed) // set the owning side to null (unless already changed)
@ -790,7 +837,8 @@ class Poll {
return $this; return $this;
} }
public function removeChoice( Choice $choice ): self { public function removeChoice(Choice $choice): self
{
if ($this->choices->contains($choice)) { if ($this->choices->contains($choice)) {
$this->choices->removeElement($choice); $this->choices->removeElement($choice);
// set the owning side to null (unless already changed) // set the owning side to null (unless already changed)
@ -802,21 +850,25 @@ class Poll {
return $this; return $this;
} }
public function getCommentsAllowed(): ?bool { public function getCommentsAllowed(): ?bool
{
return $this->commentsAllowed; return $this->commentsAllowed;
} }
public function setCommentsAllowed( ?bool $commentsAllowed ): self { public function setCommentsAllowed(?bool $commentsAllowed): self
{
$this->commentsAllowed = $commentsAllowed; $this->commentsAllowed = $commentsAllowed;
return $this; return $this;
} }
public function getIsZeroKnowledge(): ?bool { public function getIsZeroKnowledge(): ?bool
{
return $this->isZeroKnowledge; return $this->isZeroKnowledge;
} }
public function setIsZeroKnowledge( ?bool $isZeroKnowledge ): self { public function setIsZeroKnowledge(?bool $isZeroKnowledge): self
{
$this->isZeroKnowledge = $isZeroKnowledge; $this->isZeroKnowledge = $isZeroKnowledge;
return $this; return $this;