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

Merge pull request #4121 from MaximilianKrambach/speechcount

Browse Source 
warn/show speaker-call amount
This commit is contained in:
Sean 2019-01-18 20:31:14 +01:00 committed by GitHub
commit 5a74c7d662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/site/agenda/components/speaker-list/speaker-list.component.html
View File

@ -53,6 +53,9 @@
<os-sorting-list [input]="speakers" [live]="true" [count]="true" (sortEvent)="onSortingChange($event)"> <os-sorting-list [input]="speakers" [live]="true" [count]="true" (sortEvent)="onSortingChange($event)">
<!-- implicit item references into the component using ng-template slot --> <!-- implicit item references into the component using ng-template slot -->
<ng-template let-item> <ng-template let-item>
<span *ngIf="hasSpokenCount(item)" class="red-warning-text speaker-warning">
<span translate>Call</span><span>&nbsp;{{ hasSpokenCount(item) + 1 }}</span>
</span>
<mat-button-toggle-group> <mat-button-toggle-group>
<mat-button-toggle matTooltip="{{ 'Begin speech' | translate }}" <mat-button-toggle matTooltip="{{ 'Begin speech' | translate }}"
(click)="onStartButton(item)"> (click)="onStartButton(item)">

4
client/src/app/site/agenda/components/speaker-list/speaker-list.component.scss
View File

@ -61,4 +61,8 @@
.add-self-buttons { .add-self-buttons {
padding: 0 0 20px 25px; padding: 0 0 20px 25px;
} }
.speaker-warning {
margin-right: 5px;
}
} }

10
client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts
View File

@ -180,4 +180,14 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit {
public isOpInList(): boolean { public isOpInList(): boolean {
return this.speakers.some(speaker => speaker.user.id === this.op.user.id); return this.speakers.some(speaker => speaker.user.id === this.op.user.id);
} }
/**
* Checks how often a speaker has already finished speaking
*
* @param speaker
* @returns 0 or the number of times a speaker occurs in finishedSpeakers
*/
public hasSpokenCount(speaker: ViewSpeaker): number {
return this.finishedSpeakers.filter(finishedSpeaker => finishedSpeaker.user.id === speaker.user.id).length;
}
} }