Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #363 from NicolasConstant/topic_fix-poll-counts 

fix polls count
This commit is contained in:
Nicolas Constant 2021-03-11 23:25:45 -05:00 committed by GitHub
parent 28065912b2 03bcc95d65
commit f8cea22693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/stream/status/poll/poll.component.html
View File

@ -25,7 +25,7 @@
<button href *ngIf="!poll.voted && !poll.expired && !pollLocked" class="btn btn-sm btn-custom-primary poll__btn-vote"
title="don't boo, vote!" (click)="vote()">Vote</button>
<a href class="poll__refresh" *ngIf="(poll.voted || poll.expired) && !pollLocked" title="refresh poll" (click)="refresh()">refresh</a>
<div class="poll__statistics"><span *ngIf="(poll.voted || poll.expired) && !pollLocked" class="poll__separator">·</span>{{poll.votes_count}} votes<span *ngIf="!poll.expired" class="poll__separator" title="{{ poll.expires_at | timeLeft | async }}">· {{ poll.expires_at | timeLeft | async }}</span></div>
<div class="poll__statistics"><span *ngIf="(poll.voted || poll.expired) && !pollLocked" class="poll__separator">·</span>{{poll.votes_count}} votes<span *ngIf="poll.voters_count > 0" class="poll__separator">·</span><span *ngIf="poll.voters_count > 0">{{poll.voters_count}} people</span><span *ngIf="!poll.expired" class="poll__separator" title="{{ poll.expires_at | timeLeft | async }}">· {{ poll.expires_at | timeLeft | async }}</span></div>
</div>
<div class="poll__error" *ngIf="errorOccuredWhenRetrievingPoll">
Error occured when retrieving the poll

11
src/app/components/stream/status/poll/poll.component.ts
View File

@ -48,7 +48,7 @@ export class PollComponent implements OnInit {
const maxVotes = Math.max(...this.poll.options.map(x => x.votes_count));
let i = 0;
for (let opt of this.poll.options) {
let optWrapper = new PollOptionWrapper(i, opt, this.poll.votes_count, opt.votes_count === maxVotes);
let optWrapper = new PollOptionWrapper(i, opt, this.poll.votes_count, this.poll.voters_count, opt.votes_count === maxVotes);
this.options.push(optWrapper);
i++;
}
@ -183,14 +183,19 @@ export class PollComponent implements OnInit {
}
class PollOptionWrapper implements PollOption {
constructor(index: number, option: PollOption, totalVotes: number, isMax: boolean) {
constructor(index: number, option: PollOption, totalVotes: number, totalVoters: number, isMax: boolean) {
let votesDivider = totalVotes;
if(totalVoters && totalVoters > 0){
votesDivider = totalVoters;
}
this.id = index;
this.title = option.title;
this.votes_count = option.votes_count;
if (totalVotes === 0) {
this.percentage = '0';
} else {
this.percentage = ((this.votes_count / totalVotes) * 100).toFixed(0);
this.percentage = ((this.votes_count / votesDivider) * 100).toFixed(0);
}
this.isMax = isMax;
}

1
src/app/services/models/mastodon.interfaces.ts
View File

@ -223,6 +223,7 @@ export interface Poll {
expired: boolean;
multiple: boolean;
votes_count: number;
voters_count: number;
options: PollOption[];
voted: boolean;
}