show user in show

restrict show actions
This commit is contained in:
2020-05-03 17:18:23 +02:00
committed by smuddy
parent 8619027fdb
commit 8b6ff52054
13 changed files with 114 additions and 34 deletions

View File

@@ -37,7 +37,6 @@ export class DocxService {
...this.renderTitle(title),
...this.renderSongs(songs),
];
console.log(paragraphs);
const document = this.prepareNewDocument(type, user.name);
document.addSection({

View File

@@ -2,8 +2,12 @@
<app-card
closeLink="../"
heading="{{show.showType|showType}}, {{show.date.toDate()|date:'dd.MM.yyyy'}} - {{getStatus(show)}}">
<i *ngIf="show.public">öffentliche Veranstaltung</i>
<i *ngIf="!show.public">geschlossene Veranstaltung</i>
<i *ngIf="show.public">öffentliche Veranstaltung von
<app-user-name [userId]="show.owner"></app-user-name>
</i>
<i *ngIf="!show.public">geschlossene Veranstaltung von
<app-user-name [userId]="show.owner"></app-user-name>
</i>
<p *ngIf="!show.published">
<mat-checkbox [(ngModel)]="showText">Text anzeigen</mat-checkbox>
</p>
@@ -22,17 +26,21 @@
[songs]="songs"></app-add-song>
<app-button-row>
<ng-container *appOwner="show.owner">
<app-button (click)="onArchive(true)" *ngIf="!show.archived" [icon]="faBox">Archivieren</app-button>
<app-button (click)="onArchive(false)" *ngIf="show.archived" [icon]="faBoxOpen">Wiederherstellen</app-button>
<app-button (click)="onPublish(true)" *ngIf="!show.published" [icon]="faPublish">Veröffentlichen</app-button>
<app-button (click)="onPublish(false)" *ngIf="show.published" [icon]="faUnpublish">Veröffentlichung zurückziehen
<app-button (click)="onArchive(true)" *ngIf="!show.archived" [icon]="faBox">
Archivieren
</app-button>
<app-button (click)="onArchive(false)" *ngIf="show.archived" [icon]="faBoxOpen">
Wiederherstellen
</app-button>
<app-button (click)="onPublish(true)" *ngIf="!show.published" [icon]="faPublish">
Veröffentlichen
</app-button>
<app-button (click)="onPublish(false)" *ngIf="show.published" [icon]="faUnpublish">
Veröffentlichung zurückziehen
</app-button>
</ng-container>
<app-button (click)="onDownload()" [icon]="faDownload">Herunterladen</app-button>
</app-button-row>
</app-card>
</div>

View File

@@ -26,6 +26,7 @@ import {NgxMatSelectSearchModule} from 'ngx-mat-select-search';
import {AddSongModule} from '../../widget-modules/components/add-song/add-song.module';
import {ButtonModule} from '../../widget-modules/components/button/button.module';
import {OwnerModule} from '../../services/user/owner.module';
import {UserNameModule} from '../../services/user/user-name/user-name.module';
@NgModule({
@@ -53,6 +54,7 @@ import {OwnerModule} from '../../services/user/owner.module';
AddSongModule,
ButtonModule,
OwnerModule,
UserNameModule,
]
})
export class ShowsModule {

View File

@@ -62,9 +62,8 @@ Cool bridge without any chords
});
it('should parse chord lines', () => {
const service: TextRenderingService = TestBed.get(TextRenderingService);
const service: TextRenderingService = TestBed.inject(TextRenderingService);
const sections = service.parse(testText);
console.log(sections);
expect(sections[0].lines[0].type).toBe(LineType.chord);
expect(sections[0].lines[0].text).toBe('C D E F G A H');
expect(sections[0].lines[2].type).toBe(LineType.chord);

View File

@@ -25,7 +25,6 @@ export class NewComponent implements OnInit {
public async onCreate(): Promise<void> {
this.form.updateValueAndValidity();
console.log(this.form);
if (this.form.valid) {
try {
await this.userService.createNewUser(this.form.value.email, this.form.value.name, this.form.value.password);