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

Merge pull request #5685 from emanuelschuetze/point-of-order-on-projector 

Show point of order icon on projector (los slide)
This commit is contained in:
Emanuel Schütze 2020-11-07 18:09:27 +01:00 committed by GitHub
parent 9fcb6cdcba f9796027ef
commit 019c097c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/slides/agenda/common/common-list-of-speakers-slide-data.ts
View File

@ -1,6 +1,7 @@
export interface SlideSpeaker {
user: string;
marked: boolean;
point_of_order: boolean;
}
export interface CommonListOfSpeakersSlideData {

11
client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.html
View File

@ -13,18 +13,20 @@
</div>
<!-- Last speakers -->
<div *ngIf="data.data.finished && data.data.finished.length">
<div *ngFor="let speaker of data.data.finished" class="lastSpeakers">
<div *ngIf="data.data.finished && data.data.finished.length" class="lastSpeakers">
<div *ngFor="let speaker of data.data.finished">
{{ speaker.user }}
<mat-icon *ngIf="speaker.marked">star</mat-icon>
<mat-icon *ngIf="speaker.point_of_order" color="warn"> warning</mat-icon>
</div>
</div>
<!-- Current speaker -->
<div *ngIf="data.data.current" class="currentSpeaker">
<mat-icon>mic</mat-icon>
<span>{{ data.data.current.user }}</span>
<mat-icon class="micicon">mic</mat-icon>
{{ data.data.current.user }}
<mat-icon *ngIf="data.data.current.marked">star</mat-icon>
<mat-icon *ngIf="data.data.current.point_of_order" color="warn"> warning</mat-icon>
</div>
<!-- Next speakers -->
@ -33,6 +35,7 @@
<li *ngFor="let speaker of data.data.waiting">
{{ speaker.user }}
<mat-icon *ngIf="speaker.marked">star</mat-icon>
<mat-icon *ngIf="speaker.point_of_order" color="warn"> warning</mat-icon>
</li>
</ol>
</div>

10
client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.scss
View File

@ -7,13 +7,9 @@
font-weight: bold;
margin: 20px 0 16px;
.mat-icon,
span {
.micicon {
vertical-align: middle;
}
span {
padding-left: 8px;
}
}
.nextSpeakers {
@ -26,3 +22,7 @@
line-height: 150%;
}
}
.mat-icon {
vertical-align: text-top;
}

1
server/openslides/agenda/projector.py
View File

@ -147,6 +147,7 @@ async def get_list_of_speakers_slide_data(
formatted_speaker = {
"user": user,
"marked": speaker["marked"],
"point_of_order": speaker["point_of_order"],
"weight": speaker["weight"],
"end_time": speaker["end_time"],
}