benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

fix remote

Browse Source
This commit is contained in:
smuddyx
2022-11-10 18:13:02 +01:00
parent 0058055dd6
commit c7ff022b84
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/modules/presentation/monitor/monitor.component.less
View File

@@ -80,7 +80,7 @@
flex-direction: column; flex-direction: column;
font-size: 13vh; font-size: 13vh;
box-sizing: border-box; box-sizing: border-box;
text-shadow: 0 0 10px black, 0 0 20px black, 0 0 40px black; text-shadow: 0 0 2px black, 0 0 5px black, 0 0 10px black, 0 0 20px black, 0 0 30px black, 0 0 35px black, 0 0 40px black, 0 0 45px black;
.date { .date {
font-size: 0.6em; font-size: 0.6em;
@@ -97,6 +97,7 @@
.blur { .blur {
filter: blur(10px); filter: blur(10px);
opacity: 0.5; opacity: 0.5;
scale: 0.9;
} }
.hide { .hide {

12
src/app/modules/presentation/remote/remote.component.html
View File

@@ -6,14 +6,14 @@
<div class="song"> <div class="song">
<div *ngIf="show" class="song-parts"> <div *ngIf="show" class="song-parts">
<div <div
(click)="onSectionClick('title', -1)" (click)="onSectionClick('title', -1, show.id)"
[class.active]="show.presentationSongId === 'title'" [class.active]="show.presentationSongId === 'title'"
class="song-part" class="song-part"
> >
<div class="head">Veranstaltung</div> <div class="head">Veranstaltung</div>
</div> </div>
<div <div
(click)="onSectionClick('empty', -1)" (click)="onSectionClick('empty', -1, show.id)"
[class.active]="show.presentationSongId === 'empty'" [class.active]="show.presentationSongId === 'empty'"
class="song-part" class="song-part"
> >
@@ -27,13 +27,13 @@
[class.active]="show.presentationSongId === song.id" [class.active]="show.presentationSongId === song.id"
class="title song-part" class="title song-part"
> >
<div (click)="onSectionClick(song.id, -1)" class="head"> <div (click)="onSectionClick(song.id, -1, show.id)" class="head">
{{ song.title }} {{ song.title }}
</div> </div>
</div> </div>
<div *ngIf="show" class="song-parts"> <div *ngIf="show" class="song-parts">
<div <div
(click)="onSectionClick(song.id, i)" (click)="onSectionClick(song.id, i, show.id)"
*ngFor="let section of song.sections; index as i" *ngFor="let section of song.sections; index as i"
[class.active]=" [class.active]="
show.presentationSongId === song.id && show.presentationSongId === song.id &&
@@ -61,7 +61,7 @@
<mat-label>Hintergrund</mat-label> <mat-label>Hintergrund</mat-label>
<mat-select <mat-select
[ngModel]="show.presentationBackground" [ngModel]="show.presentationBackground"
(ngModelChange)="onBackground($event)"> (ngModelChange)="onBackground($event, show.id)">
<mat-option value="none">kein Hintergrund</mat-option> <mat-option value="none">kein Hintergrund</mat-option>
<mat-option value="blue">Sternenhimmel</mat-option> <mat-option value="blue">Sternenhimmel</mat-option>
<mat-option value="green">Blätter</mat-option> <mat-option value="green">Blätter</mat-option>
@@ -72,7 +72,7 @@
</mat-form-field> </mat-form-field>
<mat-slider <mat-slider
(ngModelChange)="onZoom($event)" (ngModelChange)="onZoom($event, show.id)"
[max]="100" [max]="100"
[min]="10" [min]="10"
[ngModel]="show.presentationZoom" [ngModel]="show.presentationZoom"

20
src/app/modules/presentation/remote/remote.component.ts
View File

@@ -31,7 +31,6 @@ export class RemoteComponent {
public showSongs: ShowSong[] = []; public showSongs: ShowSong[] = [];
public songs$ = this.songService.list$(); public songs$ = this.songService.list$();
public presentationSongs: PresentationSong[] = []; public presentationSongs: PresentationSong[] = [];
public currentShowId: string | null = null;
public progress = false; public progress = false;
public faIcon = faRepeat; public faIcon = faRepeat;
@@ -78,19 +77,18 @@ export class RemoteComponent {
return section.lines.filter(_ => _.type === 1)[0].text; return section.lines.filter(_ => _.type === 1)[0].text;
} }
public async onSectionClick(id: string, index: number): Promise<void> { public async onSectionClick(id: string, index: number, showId: string): Promise<void> {
if (this.currentShowId != null) await this.showService.update$(showId, {
await this.showService.update$(this.currentShowId, { presentationSongId: id,
presentationSongId: id, presentationSection: index,
presentationSection: index, });
});
} }
public async onZoom(presentationZoom: number): Promise<void> { public async onZoom(presentationZoom: number, showId: string): Promise<void> {
if (this.currentShowId != null) await this.showService.update$(this.currentShowId, {presentationZoom}); await this.showService.update$(showId, {presentationZoom});
} }
public async onBackground(presentationBackground: PresentationBackground): Promise<void> { public async onBackground(presentationBackground: PresentationBackground, showId: string): Promise<void> {
if (this.currentShowId != null) await this.showService.update$(this.currentShowId, {presentationBackground}); await this.showService.update$(showId, {presentationBackground});
} }
} }

5
src/app/modules/presentation/select/select.component.ts
View File

@@ -22,9 +22,10 @@ export class SelectComponent implements OnInit {
public async selectShow(show: Show) { public async selectShow(show: Show) {
this.visible = false; this.visible = false;
await this.globalSettingsService.set({currentShow: show.id}); await this.globalSettingsService.set({currentShow: show.id});
await this.showService.update$(show.id, {presentationSongId: 'title'}); void this.showService.update$(show.id, {presentationSongId: 'title'});
await this.router.navigateByUrl('/presentation/remote'); void this.router.navigateByUrl('/presentation/remote');
} }
public ngOnInit(): void { public ngOnInit(): void {