update
This commit is contained in:
@@ -1 +1,2 @@
|
|||||||
C:\Users\m.ilhan\source\repos\verag\obj\Debug\VeragTvApp.client.esproj.CoreCompileInputs.cache
|
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
|
||||||
|
|||||||
@@ -109,13 +109,13 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Zusätzliche IM/EX-Icons (Standort 'WAI') -->
|
<!-- Zusätzliche IM/EX-Icons (Standort 'WAI') -->
|
||||||
<div *ngIf="standort === 'WAI' || standort === 'SBG'">
|
<div *ngIf="standort === 'WAI' || standort === 'SBG' || standort === 'AMB' ">
|
||||||
<div class="bottom-right-icon-im" *ngIf="aviso.imEx === 'IMPORT' || aviso.imEx === ''">
|
<div class="bottom-right-icon-im" *ngIf="aviso.imEx === 'IMPORT' || aviso.imEx === ''">
|
||||||
<img src="assets/icon/import_icon.png"
|
<img src="assets/icon/import_icon.png"
|
||||||
style="width: 0.7em; aspect-ratio: 10 / 12" />
|
style="width: 0.7em; aspect-ratio: 10 / 12" />
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom-right-icon-ex" *ngIf="aviso.imEx === 'EXPORT'">
|
<div class="bottom-right-icon-ex" *ngIf="aviso.imEx === 'EXPORT'">
|
||||||
<img src="assets/icon/import_icon.png"
|
<img src="assets/icon/export_icon.png"
|
||||||
style="width: 0.7em; aspect-ratio: 10 / 12" />
|
style="width: 0.7em; aspect-ratio: 10 / 12" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -139,7 +139,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- IM/EX-Icons bei Hinweisen (nur Standort 'WAI') -->
|
<!-- IM/EX-Icons bei Hinweisen (nur Standort 'WAI') -->
|
||||||
<div *ngIf="standort === 'WAI' || standort === 'SBG'">
|
<div *ngIf="standort === 'WAI' || standort === 'SBG' || standort === 'AMB' ">
|
||||||
<div class="bottom-right-icon" *ngIf="aviso.imEx === 'IMPORT' || aviso.imEx === '' ">
|
<div class="bottom-right-icon" *ngIf="aviso.imEx === 'IMPORT' || aviso.imEx === '' ">
|
||||||
<ion-icon name="download-outline"></ion-icon>
|
<ion-icon name="download-outline"></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
@@ -183,9 +183,9 @@
|
|||||||
<!-- Logo und Icons Container -->
|
<!-- Logo und Icons Container -->
|
||||||
<div class="logo-and-icons">
|
<div class="logo-and-icons">
|
||||||
<img [src]="'assets/Logos/' + avisoTvSettings[0].logo" class="logo" />
|
<img [src]="'assets/Logos/' + avisoTvSettings[0].logo" class="logo" />
|
||||||
|
|
||||||
<!-- Legende für WAI (Import / Export) -->
|
<!-- Legende für WAI (Import / Export) -->
|
||||||
<div *ngIf="standort === 'WAI' || standort === 'SBG'" class="title legendecontainer">
|
<div *ngIf="standort === 'WAI' || standort === 'SBG' || standort === 'AMB' " class="title legendecontainer">
|
||||||
<div class="div-import">
|
<div class="div-import">
|
||||||
<img src="assets/icon/import_icon.png"
|
<img src="assets/icon/import_icon.png"
|
||||||
style="width: 0.8em; aspect-ratio: 10 / 12" /> = IMPORT
|
style="width: 0.8em; aspect-ratio: 10 / 12" /> = IMPORT
|
||||||
|
|||||||
@@ -454,4 +454,4 @@ ion-title {
|
|||||||
.passport {
|
.passport {
|
||||||
width: 32%;
|
width: 32%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,6 +137,7 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit {
|
|||||||
|
|
||||||
// Falls neue Arrivals schon geladen, aber noch nicht aktiv
|
// Falls neue Arrivals schon geladen, aber noch nicht aktiv
|
||||||
pendingArrivals: AvisoDto[] | null = null;
|
pendingArrivals: AvisoDto[] | null = null;
|
||||||
|
pendingTotalCount: number | null = null;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
@@ -199,7 +200,7 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit {
|
|||||||
catchError((error) => {
|
catchError((error) => {
|
||||||
this.errorMessage = 'Fehler beim Laden der Arrivals. Bitte versuche es später erneut.';
|
this.errorMessage = 'Fehler beim Laden der Arrivals. Bitte versuche es später erneut.';
|
||||||
this.loadingArrivals = false;
|
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) {
|
if (this.pages.length > 1) {
|
||||||
// Bei mehreren Seiten erst mit dem nächsten Seitenwechsel übernehmen
|
// Bei mehreren Seiten erst mit dem nächsten Seitenwechsel übernehmen
|
||||||
this.pendingArrivals = data.avisos;
|
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 {
|
} else {
|
||||||
// Bei nur einer Seite direkt übernehmen
|
// Bei nur einer Seite direkt übernehmen
|
||||||
this.arrivals = data.avisos;
|
this.arrivals = data.avisos;
|
||||||
@@ -637,6 +642,13 @@ export class AvisoPage implements OnInit, OnDestroy, AfterViewInit {
|
|||||||
if (this.pendingArrivals) {
|
if (this.pendingArrivals) {
|
||||||
this.arrivals = this.pendingArrivals;
|
this.arrivals = this.pendingArrivals;
|
||||||
this.pendingArrivals = null;
|
this.pendingArrivals = null;
|
||||||
|
|
||||||
|
// Auch den pending totalCount übernehmen
|
||||||
|
if (this.pendingTotalCount !== null) {
|
||||||
|
this.totalArrivals = this.pendingTotalCount;
|
||||||
|
this.pendingTotalCount = null;
|
||||||
|
}
|
||||||
|
|
||||||
this.paginateArrivals();
|
this.paginateArrivals();
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
src/assets/Logos/ambar.png
Normal file
BIN
src/assets/Logos/ambar.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
Reference in New Issue
Block a user