reorder fields for poll display
This commit is contained in:
tykayn
parent
85efc2cbe5
commit
83978f1757
|
|
@ -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()) );
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
|
@ -111,7 +112,7 @@ class Poll {
|
||||||
* @Serializer\Type("smallint")
|
* @Serializer\Type("smallint")
|
||||||
* @Serializer\Expose()
|
* @Serializer\Expose()
|
||||||
*/
|
*/
|
||||||
public $choicesMax = - 1;
|
public $choicesMax = -1;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* people can add comments
|
* people can add comments
|
||||||
|
|
@ -201,156 +202,150 @@ 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());
|
||||||
$this->setAdminKey( $this->generateRandomKey() );
|
$this->setAdminKey($this->generateRandomKey());
|
||||||
$this->votes = new ArrayCollection();
|
$this->votes = new ArrayCollection();
|
||||||
$this->stacksOfVotes = new ArrayCollection();
|
$this->stacksOfVotes = new ArrayCollection();
|
||||||
$this->choices = new ArrayCollection();
|
$this->choices = new ArrayCollection();
|
||||||
$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();
|
||||||
$this->comments = new ArrayCollection();
|
$this->comments = new ArrayCollection();
|
||||||
$this->setAdminKey( $this->generateRandomKey() );
|
$this->setAdminKey($this->generateRandomKey());
|
||||||
$this->setCreatedAt( new DateTime() );
|
$this->setCreatedAt(new DateTime());
|
||||||
$this->setExpiracyDate( $this->addDaysToDate(
|
$this->setExpiracyDate($this->addDaysToDate(
|
||||||
new DateTime(),
|
new DateTime(),
|
||||||
$this->defaultExpiracyDaysFromNow
|
$this->defaultExpiracyDaysFromNow
|
||||||
) );
|
));
|
||||||
$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();
|
||||||
$content[ 'password_hash' ] = $this->getPassword();
|
$content['password_hash'] = $this->getPassword();
|
||||||
$content[ 'id' ] = $this->getId();
|
$content['id'] = $this->getId();
|
||||||
|
|
||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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 = [];
|
||||||
foreach ( $this->getStacksOfVotes() as $stack ) {
|
foreach ($this->getStacksOfVotes() as $stack) {
|
||||||
$displayedStackOfVotes[] = $stack->display();
|
$displayedStackOfVotes[] = $stack->display();
|
||||||
}
|
}
|
||||||
$displayedChoices = [];
|
$displayedChoices = [];
|
||||||
foreach ( $this->getChoices() as $choice ) {
|
foreach ($this->getChoices() as $choice) {
|
||||||
$displayedChoices[] = $choice->display( $this->getKind() );
|
$displayedChoices[] = $choice->display($this->getKind());
|
||||||
}
|
}
|
||||||
$displayedComments = [];
|
$displayedComments = [];
|
||||||
foreach ( $this->getComments() as $comment ) {
|
foreach ($this->getComments() as $comment) {
|
||||||
$displayedComments[] = $comment->display();
|
$displayedComments[] = $comment->display();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$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(),
|
'choices' => $computedAnswers['answers'],
|
||||||
'modification_policy' => $this->getModificationPolicy(),
|
'choices_grouped' => $computedAnswers['grouped_dates'],
|
||||||
'hide_results' => $this->getHideResults(),
|
'choices_max' => $this->getChoicesMax(),
|
||||||
'show_results_even_if_password' => $this->getShowResultEvenIfPasswords(),
|
|
||||||
'owner' => [
|
|
||||||
'pseudo' => $this->getOwner()->getPseudo(),
|
|
||||||
]
|
|
||||||
,
|
|
||||||
'choices' => $computedAnswers[ 'answers' ],
|
|
||||||
'password_protected' => $this->getPassword() ? 'yes' : 'no',
|
|
||||||
'max_score' => $computedAnswers[ 'max_score' ],
|
|
||||||
'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;
|
||||||
|
|
||||||
if ( $this->getKind() == 'date' ) {
|
if ($this->getKind() == 'date') {
|
||||||
foreach ( $this->getChoices() as $choice ) {
|
foreach ($this->getChoices() as $choice) {
|
||||||
$boom = explode( ' >>> ', $choice->getName() );
|
$boom = explode(' >>> ', $choice->getName());
|
||||||
|
|
||||||
// handle sub time slices
|
// handle sub time slices
|
||||||
if ( count( $boom ) == 2 ) {
|
if (count($boom) == 2) {
|
||||||
|
|
||||||
|
|
||||||
if ( ! isset( $grouped_dates[ $boom[ 0 ] ] ) ) {
|
if (!isset($grouped_dates[$boom[0]])) {
|
||||||
|
|
||||||
$grouped_dates[ $boom[ 0 ] ] = [
|
$grouped_dates[$boom[0]] = [
|
||||||
|
|
||||||
"date_string" => $boom[ 0 ],
|
"date_string" => $boom[0],
|
||||||
"choices" => [],
|
"choices" => [],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
$grouped_dates[ $boom[ 0 ] ][ "choices" ][] = [
|
$grouped_dates[$boom[0]]["choices"][] = [
|
||||||
"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] = [
|
||||||
|
|
||||||
"date_string" => $name,
|
"date_string" => $name,
|
||||||
"choices" => [],
|
"choices" => [],
|
||||||
];
|
];
|
||||||
$grouped_dates[ $name ][ "choices" ][] = [
|
$grouped_dates[$name]["choices"][] = [
|
||||||
"choice_id" => $choice->getId(),
|
"choice_id" => $choice->getId(),
|
||||||
"name" => $name,
|
"name" => $name,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elseif ( $this->getKind() == 'text' ) {
|
} elseif ($this->getKind() == 'text') {
|
||||||
foreach ( $this->getChoices() as $choice ) {
|
foreach ($this->getChoices() as $choice) {
|
||||||
$name = $choice->getName();
|
$name = $choice->getName();
|
||||||
|
|
||||||
|
|
||||||
if ( ! isset( $grouped_dates[ $name ] ) ) {
|
if (!isset($grouped_dates[$name])) {
|
||||||
|
|
||||||
$grouped_dates[ $name ] = [
|
$grouped_dates[$name] = [
|
||||||
|
|
||||||
"date_string" => $name,
|
"date_string" => $name,
|
||||||
"choices" => [],
|
"choices" => [],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
$grouped_dates[ $name ][ "choices" ][] = [
|
$grouped_dates[$name]["choices"][] = [
|
||||||
"choice_id" => $choice->getId(),
|
"choice_id" => $choice->getId(),
|
||||||
"name" => $name,
|
"name" => $name,
|
||||||
];
|
];
|
||||||
|
|
@ -377,18 +372,18 @@ class Poll {
|
||||||
];
|
];
|
||||||
|
|
||||||
// first, prefill all choices
|
// first, prefill all choices
|
||||||
foreach ( $this->getChoices() as $choice ) {
|
foreach ($this->getChoices() as $choice) {
|
||||||
$computedArray[ $choice->getId() ] = array_merge( $scoreInfos, $choice->display( $this->getKind() ) );
|
$computedArray[$choice->getId()] = array_merge($scoreInfos, $choice->display($this->getKind()));
|
||||||
}
|
}
|
||||||
// then, compute stack of votes scores on each choice
|
// then, compute stack of votes scores on each choice
|
||||||
foreach ( $this->getStacksOfVotes() as $stack_of_vote ) {
|
foreach ($this->getStacksOfVotes() as $stack_of_vote) {
|
||||||
foreach ( $stack_of_vote->getVotes() as $vote ) {
|
foreach ($stack_of_vote->getVotes() as $vote) {
|
||||||
$answer = $vote->getValue();
|
$answer = $vote->getValue();
|
||||||
$choice_id = $vote->getChoice()->getId();
|
$choice_id = $vote->getChoice()->getId();
|
||||||
$choice_url = $vote->getChoice()->getUrl();
|
$choice_url = $vote->getChoice()->getUrl();
|
||||||
|
|
||||||
if ( ! isset( $computedArray[ $choice_id ] ) ) {
|
if (!isset($computedArray[$choice_id])) {
|
||||||
$computedArray[ $choice_id ] = [
|
$computedArray[$choice_id] = [
|
||||||
'id' => $choice_id,
|
'id' => $choice_id,
|
||||||
'url' => $choice_url,
|
'url' => $choice_url,
|
||||||
'name' => $vote->getChoice()->getName(),
|
'name' => $vote->getChoice()->getName(),
|
||||||
|
|
@ -408,35 +403,35 @@ class Poll {
|
||||||
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
$computedArray[ $choice_id ][ $answer ][ 'count' ] ++;
|
$computedArray[$choice_id][$answer]['count']++;
|
||||||
$computedArray[ $choice_id ][ $answer ][ 'people' ][] = $stack_of_vote->getOwner()->getPseudo();
|
$computedArray[$choice_id][$answer]['people'][] = $stack_of_vote->getOwner()->getPseudo();
|
||||||
|
|
||||||
if ( $answer == 'yes' ) {
|
if ($answer == 'yes') {
|
||||||
$computedArray[ $choice_id ][ 'score' ] += 1;
|
$computedArray[$choice_id]['score'] += 1;
|
||||||
} elseif ( $answer == 'maybe' ) {
|
} elseif ($answer == 'maybe') {
|
||||||
$computedArray[ $choice_id ][ 'score' ] += 0.5;
|
$computedArray[$choice_id]['score'] += 0.5;
|
||||||
}
|
}
|
||||||
// compare with max value
|
// compare with max value
|
||||||
if ( $computedArray[ $choice_id ][ 'score' ] > $maxScore ) {
|
if ($computedArray[$choice_id]['score'] > $maxScore) {
|
||||||
$maxScore = $computedArray[ $choice_id ][ 'score' ];
|
$maxScore = $computedArray[$choice_id]['score'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$answersWithStats = [];
|
$answersWithStats = [];
|
||||||
foreach ( $computedArray as $choice_stat ) {
|
foreach ($computedArray as $choice_stat) {
|
||||||
$answersWithStats[] = $choice_stat;
|
$answersWithStats[] = $choice_stat;
|
||||||
}
|
}
|
||||||
$groupsOfDates = [];
|
$groupsOfDates = [];
|
||||||
foreach ( $grouped_dates as $group ) {
|
foreach ($grouped_dates as $group) {
|
||||||
$ii = 0;
|
$ii = 0;
|
||||||
foreach ( $group[ "choices" ] as $slice ) {
|
foreach ($group["choices"] as $slice) {
|
||||||
$slice[ 'score' ] = $computedArray[ $slice[ 'choice_id' ] ][ 'score' ];
|
$slice['score'] = $computedArray[$slice['choice_id']]['score'];
|
||||||
$slice[ 'yes' ] = $computedArray[ $slice[ 'choice_id' ] ][ 'yes' ];
|
$slice['yes'] = $computedArray[$slice['choice_id']]['yes'];
|
||||||
$slice[ 'maybe' ] = $computedArray[ $slice[ 'choice_id' ] ][ 'maybe' ];
|
$slice['maybe'] = $computedArray[$slice['choice_id']]['maybe'];
|
||||||
$slice[ 'no' ] = $computedArray[ $slice[ 'choice_id' ] ][ 'no' ];
|
$slice['no'] = $computedArray[$slice['choice_id']]['no'];
|
||||||
$slice[ 'id' ] = $slice[ 'choice_id' ];
|
$slice['id'] = $slice['choice_id'];
|
||||||
$group[ "choices" ][ $ii ] = $slice;
|
$group["choices"][$ii] = $slice;
|
||||||
$ii ++;
|
$ii++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$groupsOfDates[] = $group;
|
$groupsOfDates[] = $group;
|
||||||
|
|
@ -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,71 +479,85 @@ 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 ) ) {
|
{
|
||||||
$this->allowedAnswers = [ 'yes' ];
|
if (!count($allowedAnswers)) {
|
||||||
|
$this->allowedAnswers = ['yes'];
|
||||||
} else {
|
} else {
|
||||||
$this->allowedAnswers = $allowedAnswers;
|
$this->allowedAnswers = $allowedAnswers;
|
||||||
}
|
}
|
||||||
|
|
@ -551,91 +565,107 @@ 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;
|
||||||
// there must be something cleaner than this in Doctrine ArrayCollection
|
// there must be something cleaner than this in Doctrine ArrayCollection
|
||||||
foreach ( $choices as $choice ) {
|
foreach ($choices as $choice) {
|
||||||
$counter ++;
|
$counter++;
|
||||||
if ( $counter > $this->maxChoicesLimit ) {
|
if ($counter > $this->maxChoicesLimit) {
|
||||||
throw new ErrorException( "max number of choices reached for this poll" );
|
throw new ErrorException("max number of choices reached for this poll");
|
||||||
}
|
}
|
||||||
if ( $choice && $choice->getId() == $id ) {
|
if ($choice && $choice->getId() == $id) {
|
||||||
return $choice;
|
return $choice;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -647,176 +677,198 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeComment( Comment $comment ): self {
|
public function removeComment(Comment $comment): self
|
||||||
if ( $this->comments->contains( $comment ) ) {
|
{
|
||||||
$this->comments->removeElement( $comment );
|
if ($this->comments->contains($comment)) {
|
||||||
|
$this->comments->removeElement($comment);
|
||||||
// set the owning side to null (unless already changed)
|
// set the owning side to null (unless already changed)
|
||||||
if ( $comment->getPoll() === $this ) {
|
if ($comment->getPoll() === $this) {
|
||||||
$comment->setPoll( null );
|
$comment->setPoll(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeStackOfVote( StackOfVotes $stackOfVote ): self {
|
public function removeStackOfVote(StackOfVotes $stackOfVote): self
|
||||||
if ( $this->stacksOfVotes->contains( $stackOfVote ) ) {
|
{
|
||||||
$this->stacksOfVotes->removeElement( $stackOfVote );
|
if ($this->stacksOfVotes->contains($stackOfVote)) {
|
||||||
|
$this->stacksOfVotes->removeElement($stackOfVote);
|
||||||
// set the owning side to null (unless already changed)
|
// set the owning side to null (unless already changed)
|
||||||
if ( $stackOfVote->getPoll() === $this ) {
|
if ($stackOfVote->getPoll() === $this) {
|
||||||
$stackOfVote->setPoll( null );
|
$stackOfVote->setPoll(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeVote( Vote $vote ): self {
|
public function removeVote(Vote $vote): self
|
||||||
if ( $this->votes->contains( $vote ) ) {
|
{
|
||||||
$this->votes->removeElement( $vote );
|
if ($this->votes->contains($vote)) {
|
||||||
|
$this->votes->removeElement($vote);
|
||||||
// set the owning side to null (unless already changed)
|
// set the owning side to null (unless already changed)
|
||||||
if ( $vote->getPoll() === $this ) {
|
if ($vote->getPoll() === $this) {
|
||||||
$vote->setPoll( null );
|
$vote->setPoll(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
||||||
$this->addChoice( $newChoice );
|
$this->addChoice($newChoice);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function addChoice( Choice $choice ): self {
|
public function addChoice(Choice $choice): self
|
||||||
if ( ! is_null( $this->choices ) ) {
|
{
|
||||||
if ( ! $this->choices->contains( $choice ) ) {
|
if (!is_null($this->choices)) {
|
||||||
|
if (!$this->choices->contains($choice)) {
|
||||||
$this->choices[] = $choice;
|
$this->choices[] = $choice;
|
||||||
$choice->setPoll( $this );
|
$choice->setPoll($this);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->choices[] = $choice;
|
$this->choices[] = $choice;
|
||||||
$choice->setPoll( $this );
|
$choice->setPoll($this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeStacksOfVote( StackOfVotes $stacksOfVote ): self {
|
public function removeStacksOfVote(StackOfVotes $stacksOfVote): self
|
||||||
if ( $this->stacksOfVotes->contains( $stacksOfVote ) ) {
|
{
|
||||||
$this->stacksOfVotes->removeElement( $stacksOfVote );
|
if ($this->stacksOfVotes->contains($stacksOfVote)) {
|
||||||
|
$this->stacksOfVotes->removeElement($stacksOfVote);
|
||||||
// set the owning side to null (unless already changed)
|
// set the owning side to null (unless already changed)
|
||||||
if ( $stacksOfVote->getPoll() === $this ) {
|
if ($stacksOfVote->getPoll() === $this) {
|
||||||
$stacksOfVote->setPoll( null );
|
$stacksOfVote->setPoll(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeChoice( Choice $choice ): self {
|
public function removeChoice(Choice $choice): self
|
||||||
if ( $this->choices->contains( $choice ) ) {
|
{
|
||||||
$this->choices->removeElement( $choice );
|
if ($this->choices->contains($choice)) {
|
||||||
|
$this->choices->removeElement($choice);
|
||||||
// set the owning side to null (unless already changed)
|
// set the owning side to null (unless already changed)
|
||||||
if ( $choice->getPoll() === $this ) {
|
if ($choice->getPoll() === $this) {
|
||||||
$choice->setPoll( null );
|
$choice->setPoll(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue