diff --git a/obj/Debug/VeragTvApp.client.esproj.FileListAbsolute.txt b/obj/Debug/VeragTvApp.client.esproj.FileListAbsolute.txt index f1b0e75..464e801 100644 --- a/obj/Debug/VeragTvApp.client.esproj.FileListAbsolute.txt +++ b/obj/Debug/VeragTvApp.client.esproj.FileListAbsolute.txt @@ -1 +1,2 @@ C:\Users\m.ilhan\source\repos\verag\obj\Debug\VeragTvApp.client.esproj.CoreCompileInputs.cache +C:\Users\m.ilhan\source\repos\AvisoTv\AvisoTv.Frontend\obj\Debug\VeragTvApp.client.esproj.CoreCompileInputs.cache diff --git a/src/app/pages/aviso/aviso.page.html b/src/app/pages/aviso/aviso.page.html index 90c768e..96f57a5 100644 --- a/src/app/pages/aviso/aviso.page.html +++ b/src/app/pages/aviso/aviso.page.html @@ -109,13 +109,13 @@ -
+
-
@@ -139,7 +139,7 @@
-
+
@@ -183,9 +183,9 @@
- + -
+
= IMPORT diff --git a/src/app/pages/aviso/aviso.page.scss b/src/app/pages/aviso/aviso.page.scss index 83622d8..e58500a 100644 --- a/src/app/pages/aviso/aviso.page.scss +++ b/src/app/pages/aviso/aviso.page.scss @@ -454,4 +454,4 @@ ion-title { .passport { width: 32%; } -} +} diff --git a/src/app/pages/aviso/aviso.page.ts b/src/app/pages/aviso/aviso.page.ts index 6629d57..f72526f 100644 --- a/src/app/pages/aviso/aviso.page.ts +++ b/src/app/pages/aviso/aviso.page.ts @@ -137,6 +137,7 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit { // Falls neue Arrivals schon geladen, aber noch nicht aktiv pendingArrivals: AvisoDto[] | null = null; + pendingTotalCount: number | null = null; constructor( private route: ActivatedRoute, @@ -199,7 +200,7 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit { catchError((error) => { this.errorMessage = 'Fehler beim Laden der Arrivals. Bitte versuche es später erneut.'; this.loadingArrivals = false; - return of({ avisos: [], totalCount: 0 }); + return of({ avisos: [], totalCount: this.totalArrivals }); }) ); }), @@ -211,7 +212,11 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit { if (this.pages.length > 1) { // Bei mehreren Seiten erst mit dem nächsten Seitenwechsel übernehmen this.pendingArrivals = data.avisos; - this.totalArrivals = data.totalCount; + this.pendingTotalCount = data.totalCount; + // totalArrivals nur aktualisieren wenn neue Daten verfügbar sind + if (data.totalCount > 0) { + this.totalArrivals = data.totalCount; + } } else { // Bei nur einer Seite direkt übernehmen this.arrivals = data.avisos; @@ -637,6 +642,13 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit { if (this.pendingArrivals) { this.arrivals = this.pendingArrivals; this.pendingArrivals = null; + + // Auch den pending totalCount übernehmen + if (this.pendingTotalCount !== null) { + this.totalArrivals = this.pendingTotalCount; + this.pendingTotalCount = null; + } + this.paginateArrivals(); this.cdr.detectChanges(); } diff --git a/src/assets/Logos/ambar.png b/src/assets/Logos/ambar.png new file mode 100644 index 0000000..12946ee Binary files /dev/null and b/src/assets/Logos/ambar.png differ