benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

directly add song to show

Browse Source
This commit is contained in:
smuddyx
2022-11-12 14:54:34 +01:00
parent f0fb7ed4f8
commit 5701d3c9e6
7 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/modules/shows/list/filter/filter.component.html
View File

@@ -1,6 +1,5 @@
<div [formGroup]="filterFormGroup">
<div class="third">
<mat-form-field appearance="outline">
<mat-label>Zeitraum</mat-label>

8
src/app/modules/shows/list/list.component.html
View File

@@ -1,18 +1,18 @@
<div>
<!-- <app-list-header *appRole="['leader']"></app-list-header>-->
<app-list-header *appRole="['leader']">
<app-filter *ngIf="shows$ | async as shows" [shows]="shows"></app-filter>
<app-filter *ngIf="shows$ | async as shows" [shows]="publicShows$ | async"></app-filter>
</app-list-header>
<ng-container *appRole="['leader']">
<ng-container *ngIf="shows$ | async as shows">
<ng-container *ngIf="privateShows$ | async as shows">
<app-card
*ngIf="getPrivateSongs(shows).length > 0"
*ngIf="shows.length > 0"
[padding]="false"
heading="meine Veranstaltungen"
>
<app-list-item
*ngFor="let show of getPrivateSongs(shows) | sortBy: 'desc':'date'"
*ngFor="let show of shows | sortBy: 'desc':'date'"
[routerLink]="show.id"
[show]="show"
></app-list-item>

45
src/app/modules/shows/list/list.component.ts
View File

@@ -1,5 +1,5 @@
import {Component} from '@angular/core';
import {combineLatest, Observable} from 'rxjs';
import {combineLatest} from 'rxjs';
import {Show} from '../services/show';
import {fade} from '../../../animations';
import {ShowService} from '../services/show.service';
@@ -14,34 +14,27 @@ import {map} from 'rxjs/operators';
animations: [fade],
})
export class ListComponent {
public shows$: Observable<Show[]>;
public publicShows$: Observable<Show[]>;
public lastMonths$: Observable<number>;
public shows$ = this.showService.list$();
public privateShows$ = this.showService.list$().pipe(map(show => show.filter(_ => !_.published)));
public lastMonths$ = this.activatedRoute.queryParams.pipe(
map(params => {
const filterValues = params as FilterValues;
if (!filterValues?.time) return 1;
return +filterValues.time;
})
);
public constructor(showService: ShowService, activatedRoute: ActivatedRoute) {
this.shows$ = showService.list$();
this.lastMonths$ = activatedRoute.queryParams.pipe(
map(params => {
const filterValues = params as FilterValues;
if (!filterValues?.time) return 3;
return +filterValues.time;
public publicShows$ = combineLatest([this.shows$, this.lastMonths$]).pipe(
map(_ =>
_[0].filter(f => {
const d = new Date();
d.setMonth(d.getMonth() - _[1]);
return f.published && f.date.toDate() >= d;
})
);
)
);
this.publicShows$ = combineLatest([this.shows$, this.lastMonths$]).pipe(
map(_ =>
_[0].filter(f => {
const d = new Date();
d.setMonth(d.getMonth() - _[1]);
return f.published && f.date.toDate() >= d;
})
)
);
}
public getPrivateSongs(songs: Show[]): Show[] {
return songs.filter(_ => !_.published);
}
public constructor(private showService: ShowService, private activatedRoute: ActivatedRoute) {}
public trackBy = (index: number, show: unknown) => (show as Show).id;
}