From 143fa70bfd0e8f5d09315b03b2f9bbe42bafbbde Mon Sep 17 00:00:00 2001 From: Nikodem Keller Date: Tue, 29 Oct 2024 22:03:59 +0100 Subject: [PATCH] Done --- .../audio/audio-list/audio-list.component.css | 0 .../audio-list/audio-list.component.html | 27 ++++++++++++++++ .../audio/audio-list/audio-list.component.ts | 21 ++++++++++++ .../map-location-modal.component.html | 32 +++---------------- .../map-location-modal.component.ts | 15 +++------ 5 files changed, 58 insertions(+), 37 deletions(-) create mode 100644 src/app/audio/audio-list/audio-list.component.css create mode 100644 src/app/audio/audio-list/audio-list.component.html create mode 100644 src/app/audio/audio-list/audio-list.component.ts diff --git a/src/app/audio/audio-list/audio-list.component.css b/src/app/audio/audio-list/audio-list.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/audio/audio-list/audio-list.component.html b/src/app/audio/audio-list/audio-list.component.html new file mode 100644 index 0000000..ffa45d4 --- /dev/null +++ b/src/app/audio/audio-list/audio-list.component.html @@ -0,0 +1,27 @@ +
+

Loading audio files, please wait...

+
+
+

Error loading audio files. Please try again later.

+
+
+ +

No audios found

+
+ diff --git a/src/app/audio/audio-list/audio-list.component.ts b/src/app/audio/audio-list/audio-list.component.ts new file mode 100644 index 0000000..82c3b88 --- /dev/null +++ b/src/app/audio/audio-list/audio-list.component.ts @@ -0,0 +1,21 @@ +import {Component, Input} from '@angular/core'; +import {Audio} from "../audio.model"; +import { DomSanitizer, SafeUrl } from "@angular/platform-browser"; +import {NgClass, NgForOf, NgIf} from "@angular/common"; + +@Component({ + selector: 'app-audio-list', + standalone: true, + imports: [ + NgClass, + NgIf, + NgForOf, + ], + templateUrl: './audio-list.component.html', + styleUrl: './audio-list.component.css' +}) +export class AudioListComponent { + @Input() audioData: { audio: Audio, url: SafeUrl }[] = []; + @Input() isLoading: boolean = false; + @Input() isError: boolean = false; +} diff --git a/src/app/map-location/map-location-modal/map-location-modal.component.html b/src/app/map-location/map-location-modal/map-location-modal.component.html index 4a99b2f..33db481 100644 --- a/src/app/map-location/map-location-modal/map-location-modal.component.html +++ b/src/app/map-location/map-location-modal/map-location-modal.component.html @@ -10,32 +10,10 @@
{{mapLocation.name}}

{{mapLocation.description}}

Navigate - + diff --git a/src/app/map-location/map-location-modal/map-location-modal.component.ts b/src/app/map-location/map-location-modal/map-location-modal.component.ts index 9766455..88bd4b0 100644 --- a/src/app/map-location/map-location-modal/map-location-modal.component.ts +++ b/src/app/map-location/map-location-modal/map-location-modal.component.ts @@ -8,11 +8,14 @@ import {AudioService} from "../../audio/audio.service"; import {ScreenSizeService} from "../../shared/screen-size.service"; import {maxPageSize} from "../../shared/http.config"; import {MapService} from "../../shared/map/map.service"; +import {AudioListComponent} from "../../audio/audio-list/audio-list.component"; + @Component({ selector: 'app-map-location-modal', standalone: true, imports: [ + AudioListComponent, NgForOf, NgIf, ], @@ -25,13 +28,10 @@ export class MapLocationModalComponent implements OnInit { mapLocationImageUrl: SafeUrl; - - audiosEntities: Audio[] = []; audioData: { audio: Audio, url: SafeUrl }[] = []; mobileVersion: boolean; isError: boolean; isLoading: boolean; - noAudioAvailable: boolean; constructor( private mapLocationService: MapLocationService, private audioService: AudioService, @@ -69,15 +69,9 @@ export class MapLocationModalComponent implements OnInit { private fetchMapLocationAudio() { this.isLoading= true; this.isError = false; - this.audiosEntities = []; - this.audioData = []; this.audioService.getAudiosByMapLocation(this.mapLocation, 0, maxPageSize).subscribe({ next: (response) => { - this.audiosEntities = response.content; - if (this.audiosEntities.length === 0) { - this.noAudioAvailable = true; - } - const audioPromises = this.audiosEntities.map((audio, index) => { + const audioPromises = response.content.map((audio, index) => { return this.audioService.getAudioFileByAudio(audio).toPromise() .then((audioBlob) => { let audioUrl: SafeUrl = null; @@ -92,6 +86,7 @@ export class MapLocationModalComponent implements OnInit { this.audioData[index] = {audio, url: null}; }); }); + Promise.all(audioPromises).then(() => { this.isLoading = false; }).catch(() => {