ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5281 from tsiegleauq/poll-list-filter

Browse Source 
Filter only evoting polls, change filter options
This commit is contained in:
Sean 2020-03-26 12:27:33 +01:00 committed by GitHub
commit af6c5faac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html
View File

@ -80,7 +80,7 @@
</div> </div>
<!-- The Vote --> <!-- The Vote -->
<os-assignment-poll-vote *ngIf="poll.canBeVotedFor" [poll]="poll"></os-assignment-poll-vote> <os-assignment-poll-vote *ngIf="poll.canBeVotedFor()" [poll]="poll"></os-assignment-poll-vote>
<!-- More-Button --> <!-- More-Button -->
<div class="poll-detail-button-wrapper"> <div class="poll-detail-button-wrapper">

6
client/src/app/site/polls/components/poll-list/poll-list.component.html
View File

@ -1,5 +1,5 @@
<os-head-bar> <os-head-bar>
<div class="title-slot" translate>List of votes</div> <div class="title-slot" translate>List of electronic votes</div>
</os-head-bar> </os-head-bar>
<os-list-view-table <os-list-view-table
@ -30,11 +30,11 @@
<!-- Voted Indicator --> <!-- Voted Indicator -->
<div *pblNgridCellDef="'votability'; row as poll" class="cell-slot fill"> <div *pblNgridCellDef="'votability'; row as poll" class="cell-slot fill">
<mat-icon *ngIf="poll.user_has_voted" color="accent" matTooltip="{{ 'You have already voted.' | translate }}"> <mat-icon *ngIf="poll.hasVote" color="accent" matTooltip="{{ 'You have already voted.' | translate }}">
check_circle check_circle
</mat-icon> </mat-icon>
<mat-icon <mat-icon
*ngIf="!poll.user_has_voted && poll.canBeVotedFor" *ngIf="!poll.hasVote && poll.hasVote !== null"
color="warn" color="warn"
matTooltip="{{ 'Voting is currently in progress.' | translate }}" matTooltip="{{ 'Voting is currently in progress.' | translate }}"
> >

10
client/src/app/site/polls/models/view-base-poll.ts
View File

@ -96,6 +96,16 @@ export abstract class ViewBasePoll<
return MajorityMethodVerbose[this.majority_method]; return MajorityMethodVerbose[this.majority_method];
} }
public get hasVote(): boolean | null {
if (!this.user_has_voted && this.canBeVotedFor()) {
return false;
} else if (this.user_has_voted) {
return true;
} else {
return null;
}
}
public abstract get pollmethodVerbose(): string; public abstract get pollmethodVerbose(): string;
public abstract get percentBaseVerbose(): string; public abstract get percentBaseVerbose(): string;

2
client/src/app/site/polls/services/base-poll-repository.service.ts
View File

@ -53,7 +53,7 @@ export abstract class BasePollRepositoryService<
protected createViewModelWithTitles(model: M): V { protected createViewModelWithTitles(model: M): V {
const viewModel = super.createViewModelWithTitles(model); const viewModel = super.createViewModelWithTitles(model);
Object.defineProperty(viewModel, 'canBeVotedFor', { Object.defineProperty(viewModel, 'canBeVotedFor', {
get: () => this.votingService.canVote(viewModel) value: () => this.votingService.canVote(viewModel)
}); });
return viewModel; return viewModel;
} }

24
client/src/app/site/polls/services/poll-filter-list.service.ts
View File

@ -21,6 +21,14 @@ export class PollFilterListService extends BaseFilterListService<ViewBasePoll> {
super(store, OSStatus); super(store, OSStatus);
} }
/**
* Filter out analog polls
* @param viewPoll All polls
*/
protected preFilter(viewPoll: ViewBasePoll[]): ViewBasePoll[] | void {
return viewPoll.filter(poll => !poll.isAnalog);
}
/** /**
* @returns the filter definition * @returns the filter definition
*/ */
@ -37,19 +45,11 @@ export class PollFilterListService extends BaseFilterListService<ViewBasePoll> {
] ]
}, },
{ {
property: 'canBeVotedFor', property: 'hasVote',
label: this.translate.instant('Vote'), label: this.translate.instant('Voting'),
options: [ options: [
{ condition: true, label: this.translate.instant('Vote currently possible') }, { condition: false, label: this.translate.instant('Voting is currently in progress.') },
{ condition: false, label: this.translate.instant('Vote not possible') } { condition: true, label: this.translate.instant('You have already voted.') }
]
},
{
property: 'user_has_voted',
label: this.translate.instant('Vote finished'),
options: [
{ condition: true, label: this.translate.instant('Has been voted for') },
{ condition: false, label: this.translate.instant('Has not been voted for') }
] ]
} }
]; ];