+
-
- {{show.presentationZoom}}px
-
+
+
diff --git a/src/app/modules/presentation/remote/remote.component.less b/src/app/modules/presentation/remote/remote.component.less
index 8184f62..a7a9292 100644
--- a/src/app/modules/presentation/remote/remote.component.less
+++ b/src/app/modules/presentation/remote/remote.component.less
@@ -65,3 +65,8 @@
.fragment {
padding: 10px;
}
+
+.div-bottom {
+ display: grid;
+ grid-template-columns: 40px auto;
+}
diff --git a/src/app/modules/presentation/remote/remote.component.ts b/src/app/modules/presentation/remote/remote.component.ts
index 78e49ab..9ac0ad5 100644
--- a/src/app/modules/presentation/remote/remote.component.ts
+++ b/src/app/modules/presentation/remote/remote.component.ts
@@ -1,5 +1,4 @@
import {Component} from '@angular/core';
-import {ShowDataService} from '../../shows/services/show-data.service';
import {Observable} from 'rxjs';
import {Show} from '../../shows/services/show';
import {MatSelectChange} from '@angular/material/select';
@@ -7,9 +6,8 @@ import {ShowSongService} from '../../shows/services/show-song.service';
import {SongService} from '../../songs/services/song.service';
import {Song} from '../../songs/services/song';
import {Section, TextRenderingService} from '../../songs/services/text-rendering.service';
-import {faSearchPlus} from '@fortawesome/free-solid-svg-icons/faSearchPlus';
-import {faSearchMinus} from '@fortawesome/free-solid-svg-icons/faSearchMinus';
import {faDesktop} from '@fortawesome/free-solid-svg-icons/faDesktop';
+import {ShowService} from '../../shows/services/show.service';
export interface PresentationSong {
id: string;
@@ -29,23 +27,21 @@ export class RemoteComponent {
public presentationSongs: PresentationSong[];
public currentShowId: string;
- public faZoomIn = faSearchPlus;
- public faZoomOut = faSearchMinus;
public faDesktop = faDesktop;
constructor(
- private showDataService: ShowDataService,
+ private showService: ShowService,
private showSongService: ShowSongService,
private songService: SongService,
private textRenderingService: TextRenderingService
) {
- this.shows$ = showDataService.list$();
+ this.shows$ = showService.list$(true);
songService.list$().subscribe(_ => this.songs = _);
}
public onShowChanged(change: MatSelectChange): void {
this.currentShowId = change.value;
- this.showDataService.read$(change.value).subscribe(_ => this.show = _);
+ this.showService.read$(change.value).subscribe(_ => this.show = _);
this.showSongService.list$(change.value).subscribe(_ => {
this.presentationSongs = _
.map(song => this.songs.filter(f => f.id == song.songId)[0])
@@ -62,22 +58,15 @@ export class RemoteComponent {
}
public async onSectionClick(id: string, index: number): Promise
{
- await this.showDataService.update(this.currentShowId, {
+ await this.showService.update$(this.currentShowId, {
presentationSongId: id,
presentationSection: index
})
}
- public async onZoomIn() {
- debugger
- await this.showDataService.update(this.currentShowId, {
- presentationZoom: (this.show.presentationZoom ?? 30) + 2,
- });
- }
-
- public async onZoomOut() {
- await this.showDataService.update(this.currentShowId, {
- presentationZoom: (this.show.presentationZoom ?? 30) - 2,
+ public async onZoom(zoom: number) {
+ await this.showService.update$(this.currentShowId, {
+ presentationZoom: zoom,
});
}
}
diff --git a/src/app/modules/shows/list/list.component.ts b/src/app/modules/shows/list/list.component.ts
index 0d256bb..b80abbc 100644
--- a/src/app/modules/shows/list/list.component.ts
+++ b/src/app/modules/shows/list/list.component.ts
@@ -1,8 +1,8 @@
import {Component} from '@angular/core';
import {Observable} from 'rxjs';
import {Show} from '../services/show';
-import {ShowDataService} from '../services/show-data.service';
import {fade} from '../../../animations';
+import {ShowService} from '../services/show.service';
@Component({
selector: 'app-list',
@@ -13,8 +13,8 @@ import {fade} from '../../../animations';
export class ListComponent {
public shows$: Observable;
- constructor(showDataService: ShowDataService) {
- this.shows$ = showDataService.list$();
+ constructor(showService: ShowService) {
+ this.shows$ = showService.list$();
}
}
diff --git a/src/app/modules/shows/services/show-data.service.ts b/src/app/modules/shows/services/show-data.service.ts
index b1ddf80..109f912 100644
--- a/src/app/modules/shows/services/show-data.service.ts
+++ b/src/app/modules/shows/services/show-data.service.ts
@@ -12,7 +12,7 @@ export class ShowDataService {
constructor(private dbService: DbService) {
}
- public list$ = (): Observable => this.dbService.col$(this.collection);
+ public list$ = (queryFn?): Observable => this.dbService.col$(this.collection, queryFn);
public read$ = (showId: string): Observable => this.dbService.doc$(`${this.collection}/${showId}`);
public update = async (showId: string, data: Partial): Promise => await this.dbService.doc(`${this.collection}/${showId}`).update(data);
public add = async (data: Partial): Promise => (await this.dbService.col(this.collection).add(data)).id
diff --git a/src/app/modules/shows/services/show.service.ts b/src/app/modules/shows/services/show.service.ts
index e4c7ba9..fc8b6bd 100644
--- a/src/app/modules/shows/services/show.service.ts
+++ b/src/app/modules/shows/services/show.service.ts
@@ -2,6 +2,9 @@ import {Injectable} from '@angular/core';
import {ShowDataService} from './show-data.service';
import {Show} from './show';
import {Observable} from 'rxjs';
+import {UserService} from '../../../services/user.service';
+import {map, switchMap} from 'rxjs/operators';
+import {User} from '../../../services/user';
@Injectable({
providedIn: 'root'
@@ -11,15 +14,32 @@ export class ShowService {
public static SHOW_TYPE = ['service-worship', 'service-praise', 'home-group-big', 'home-group', 'prayer-group', 'teens-group', 'kids-group', 'misc-public', 'misc-private'];
public static SHOW_TYPE_PUBLIC = ['service-worship', 'service-praise', 'home-group-big', 'teens-group', 'kids-group', 'misc-public'];
public static SHOW_TYPE_PRIVATE = ['home-group', 'prayer-group', 'misc-private',];
+ private user: User;
- constructor(private showDataService: ShowDataService) {
+ constructor(private showDataService: ShowDataService, private userService: UserService) {
+ userService.user$.subscribe(_ => this.user = _);
}
public read$ = (showId: string): Observable => this.showDataService.read$(showId);
+ public list$(publishedOnly: boolean = false): Observable {
+
+ return this.userService.user$.pipe(
+ switchMap(_ => this.showDataService.list$(), (user: User, shows: Show[]) => ({user, shows})),
+ map(_ => _.shows
+ .filter(_ => !_.archived)
+ .filter(show => show.published || (show.owner === _.user.id && !publishedOnly))
+ )
+ )
+
+ }
+
+ public update$ = async (showId: string, data: Partial): Promise => this.showDataService.update(showId, data);
+
public async new$(data: Partial): Promise {
const calculatedData: Partial = {
...data,
+ owner: this.user.id,
public: ShowService.SHOW_TYPE_PUBLIC.indexOf(data.showType) !== -1,
};
return await this.showDataService.add(calculatedData);
diff --git a/src/app/modules/shows/services/show.ts b/src/app/modules/shows/services/show.ts
index c95ed99..abc7ecb 100644
--- a/src/app/modules/shows/services/show.ts
+++ b/src/app/modules/shows/services/show.ts
@@ -8,6 +8,8 @@ export interface Show {
owner: string;
public: boolean;
reported: boolean;
+ published: boolean;
+ archived: boolean;
presentationSongId: string;
presentationSection: number;
diff --git a/src/app/modules/shows/show/show.component.html b/src/app/modules/shows/show/show.component.html
index a6b7c7c..35a39a7 100644
--- a/src/app/modules/shows/show/show.component.html
+++ b/src/app/modules/shows/show/show.component.html
@@ -1,16 +1,18 @@
-
- Text anzeigen
-
+ heading="{{show.showType|showType}}, {{show.date.toDate()|date:'dd.MM.yyyy'}} - {{getStatus(show)}}">
+ öffentliche Veranstaltung
+ geschlossene Veranstaltung
+
+ Text anzeigen
+
@@ -23,5 +25,11 @@
+
+
+
+
+
+
{{song.comment}}
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
index 40cdc90..2c21343 100644
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
@@ -1,6 +1,6 @@
import {Injectable} from '@angular/core';
import {AngularFireAuth} from '@angular/fire/auth';
-import {Observable} from 'rxjs';
+import {BehaviorSubject, Observable} from 'rxjs';
import {filter, switchMap} from 'rxjs/operators';
import {User} from './user';
import {DbService} from './db.service';
@@ -10,13 +10,16 @@ import {DbService} from './db.service';
})
export class UserService {
constructor(private afAuth: AngularFireAuth, private db: DbService) {
+ this.afAuth.authState.pipe(
+ filter(_ => !!_),
+ switchMap(auth => this.db.doc$('user/' + auth.uid)),
+ ).subscribe(_ => this._user$.next(_));
}
+ private _user$ = new BehaviorSubject(null);
+
public get user$(): Observable {
- return this.afAuth.authState.pipe(
- filter(_ => !!_),
- switchMap(auth => this.db.doc$('user/' + auth.uid))
- );
+ return this._user$.pipe(filter(_ => !!_));
}
public async update$(uid: string, data: Partial): Promise {
diff --git a/src/app/widget-modules/components/song-text/song-text.component.ts b/src/app/widget-modules/components/song-text/song-text.component.ts
index 46156b7..99704ae 100644
--- a/src/app/widget-modules/components/song-text/song-text.component.ts
+++ b/src/app/widget-modules/components/song-text/song-text.component.ts
@@ -17,19 +17,21 @@ export type ChordMode = 'show' | 'hide' | 'onlyFirst'
})
export class SongTextComponent implements OnInit {
public sections: Section[];
- public _chordMode: ChordMode = 'hide';
+ @Input() public scrollIndex = 0;
@Input() showSwitch = false;
- @Input()
- public set chordMode(value: ChordMode) {
- this._chordMode = value ?? 'hide';
- }
-
@Output() public chordModeChanged = new EventEmitter();
public faLines = faGripLines;
constructor(private textRenderingService: TextRenderingService, private elRef: ElementRef) {
}
+ public _chordMode: ChordMode = 'hide';
+
+ @Input()
+ public set chordMode(value: ChordMode) {
+ this._chordMode = value ?? 'hide';
+ }
+
@Input()
public set text(value: string) {
this.sections = this.textRenderingService.parse(value).sort((a, b) => a.type - b.type);
@@ -61,6 +63,10 @@ export class SongTextComponent implements OnInit {
this.chordModeChanged.emit(next);
}
+ public onClick() {
+ scrollTo(0, this.elRef.nativeElement.offsetTop - 20);
+ }
+
private getNextChordMode(): ChordMode {
switch (this._chordMode) {
case 'show':
@@ -71,8 +77,4 @@ export class SongTextComponent implements OnInit {
return 'show';
}
}
-
- public onClick() {
- scrollTo(0, this.elRef.nativeElement.offsetTop - 20);
- }
}