user preferences - chord type

This commit is contained in:
2020-03-22 14:06:50 +01:00
committed by smuddy
parent 7d8f6dd80b
commit aa57dc2ce3
19 changed files with 93 additions and 21 deletions

View File

@@ -2,12 +2,15 @@
<app-card
heading="{{show.showType|showType}}, {{show.date.toDate()|date:'dd.MM.yyyy'}}">
<mat-checkbox [(ngModel)]="showText">Text anzeigen</mat-checkbox>
<div *ngIf="showSongs && songs" class="song-list">
<app-song *ngFor="let song of showSongs"
[showId]="showId"
[showSong]="song"
[showSongs]="showSongs"
[song]="getSong(song.songId)"
[showText]="showText"
></app-song>
</div>

View File

@@ -20,6 +20,7 @@ export class ShowComponent implements OnInit {
public songs: Song[];
public showSongs: ShowSong[];
public showId: string;
public showText: boolean;
constructor(
private activatedRoute: ActivatedRoute,

View File

@@ -1,8 +1,9 @@
<div *ngIf="_song" class="song">
<app-menu-button (click)="reorder(true)" [icon]="faUp" class="btnUp"></app-menu-button>
<app-menu-button (click)="reorder(false)" [icon]="faDown" class="btnDown"></app-menu-button>
<span class="title">{{_song.title}}</span>
<span class="keys">
<div *ngIf="_song" class="row">
<div class="song">
<app-menu-button (click)="reorder(true)" [icon]="faUp" class="btnUp"></app-menu-button>
<app-menu-button (click)="reorder(false)" [icon]="faDown" class="btnDown"></app-menu-button>
<span class="title">{{_song.title}}</span>
<span class="keys">
<span *ngIf="showSong.keyOriginal!==showSong.key">{{showSong.keyOriginal}}&nbsp;&nbsp;</span>
<mat-form-field *ngIf="keys" appearance="standard">
<mat-select [formControl]="keyFormControl">
@@ -10,5 +11,7 @@
</mat-select>
</mat-form-field>
</span>
<app-menu-button (click)="onDelete()" [icon]="faDelete" class="btnDelete"></app-menu-button>
<app-menu-button (click)="onDelete()" [icon]="faDelete" class="btnDelete"></app-menu-button>
</div>
<app-song-text *ngIf="showText" [text]="_song.text"></app-song-text>
</div>

View File

@@ -1,5 +1,9 @@
.song {
.row {
border-bottom: 1px solid #ccc;
}
.song {
display: grid;
grid-template-columns: 20px 20px auto 70px 25px;
@media screen and (max-width: 860px) {

View File

@@ -15,10 +15,12 @@ import {FormControl} from '@angular/forms';
})
export class SongComponent implements OnInit {
@Input() public showSong: ShowSong;
@Input() public showId: string;
public keys: string[];
@Input() public showSongs: ShowSong[];
@Input() public showId: string;
@Input() public showText: boolean;
public keys: string[];
public faDelete = faTrash;
public faUp = faCaretUp;
public faDown = faCaretDown;

View File

@@ -5,7 +5,7 @@ import {ShowsRoutingModule} from './shows-routing.module';
import {NewComponent} from './new/new.component';
import {CardModule} from '../../widget-modules/components/card/card.module';
import {MatFormFieldModule} from '@angular/material/form-field';
import {ReactiveFormsModule} from '@angular/forms';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MatInputModule} from '@angular/material/input';
import {ListComponent} from './list/list.component';
import {ListItemComponent} from './list/list-item/list-item.component';
@@ -21,6 +21,7 @@ import {ShowComponent} from './show/show.component';
import {SongComponent} from './show/song/song.component';
import {FontAwesomeModule} from '@fortawesome/angular-fontawesome';
import {MenuButtonModule} from '../../widget-modules/components/menu-button/menu-button.module';
import {SongTextModule} from '../../widget-modules/components/song-text/song-text.module';
@NgModule({
@@ -41,7 +42,9 @@ import {MenuButtonModule} from '../../widget-modules/components/menu-button/menu
MatSelectModule,
ShowTypeTranslaterModule,
FontAwesomeModule,
MenuButtonModule
MenuButtonModule,
FormsModule,
SongTextModule
]
})
export class ShowsModule {