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

Show point of order icon on projector (los slide)

Browse Source
This commit is contained in:
Emanuel Schütze 2020-11-07 17:17:43 +01:00
parent 5b84bddc2a
commit f9796027ef
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 { export interface SlideSpeaker {
user: string; user: string;
marked: boolean; marked: boolean;
point_of_order: boolean;
} }
export interface CommonListOfSpeakersSlideData { export interface CommonListOfSpeakersSlideData {

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

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

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

@ -7,13 +7,9 @@
font-weight: bold; font-weight: bold;
margin: 20px 0 16px; margin: 20px 0 16px;
.mat-icon, .micicon {
span {
vertical-align: middle; vertical-align: middle;
} }
span {
padding-left: 8px;
}
} }
.nextSpeakers { .nextSpeakers {
@ -26,3 +22,7 @@
line-height: 150%; 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 = { formatted_speaker = {
"user": user, "user": user,
"marked": speaker["marked"], "marked": speaker["marked"],
"point_of_order": speaker["point_of_order"],
"weight": speaker["weight"], "weight": speaker["weight"],
"end_time": speaker["end_time"], "end_time": speaker["end_time"],
} }