benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

fix song sorting in docx

Browse Source
This commit is contained in:
smuddyx
2021-07-04 20:17:41 +02:00
parent 62cc092b95
commit 1605be82a3
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/modules/shows/services/docx.service.ts
View File

@@ -199,7 +199,8 @@ export class DocxService {
sections, sections,
}; };
}); });
const songs = (await Promise.all(songsAsync)).filter(_ => !!_).map(_ => _ as {showSong: ShowSong; song: Song; sections: Section[]}); const songsLoaded = (await Promise.all(songsAsync)).filter(_ => !!_).map(_ => _ as {showSong: ShowSong; sections: Section[]});
const songs = show.order.map(_ => songsLoaded.filter(f => f.showSong.id === _)[0]);
return {songs, show, user, config}; return {songs, show, user, config};
} }

2
src/app/modules/shows/services/show.ts
View File

@@ -1,4 +1,4 @@
import * as firebase from 'firebase'; import firebase from 'firebase/app';
import Timestamp = firebase.firestore.Timestamp; import Timestamp = firebase.firestore.Timestamp;
export interface Show { export interface Show {

2
src/app/modules/songs/services/song.service.ts
View File

@@ -4,7 +4,7 @@ import {Song} from './song';
import {SongDataService} from './song-data.service'; import {SongDataService} from './song-data.service';
import {first} from 'rxjs/operators'; import {first} from 'rxjs/operators';
import {UserService} from '../../../services/user/user.service'; import {UserService} from '../../../services/user/user.service';
import * as firebase from 'firebase'; import firebase from 'firebase/app';
import Timestamp = firebase.firestore.Timestamp; import Timestamp = firebase.firestore.Timestamp;
// declare let importCCLI: any; // declare let importCCLI: any;

2
src/app/modules/songs/services/song.ts
View File

@@ -1,5 +1,5 @@
import firebase from 'firebase/app';
import Timestamp = firebase.firestore.Timestamp; import Timestamp = firebase.firestore.Timestamp;
import * as firebase from 'firebase';
export interface Song { export interface Song {
id: string; id: string;