Browse Source

Minor improvements

pull/5527/head
Thomas Kaul 1 month ago
parent
commit
715157629f
  1. 2
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
  2. 43
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
  3. 4
      libs/ui/src/lib/activities-table/activities-table.component.ts

2
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@ -93,7 +93,7 @@ export class GfImportActivitiesDialog implements OnDestroy {
public isLoading = false; public isLoading = false;
public mode: 'DIVIDEND'; public mode: 'DIVIDEND';
public pageIndex = 0; public pageIndex = 0;
public pageSize = 10; public pageSize = 8;
public selectedActivities: Activity[] = []; public selectedActivities: Activity[] = [];
public sortColumn = 'date'; public sortColumn = 'date';
public sortDirection: SortDirection = 'desc'; public sortDirection: SortDirection = 'desc';

43
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html

@ -21,9 +21,10 @@
<ng-container i18n>Select File</ng-container> <ng-container i18n>Select File</ng-container>
} }
</ng-template> </ng-template>
<div class="pt-3"> <div>
@if (mode === 'DIVIDEND') { @if (mode === 'DIVIDEND') {
<form <form
class="pt-3"
[formGroup]="assetProfileForm" [formGroup]="assetProfileForm"
(ngSubmit)="onLoadDividends(stepper)" (ngSubmit)="onLoadDividends(stepper)"
> >
@ -114,7 +115,7 @@
<ng-container i18n>Select Activities</ng-container> <ng-container i18n>Select Activities</ng-container>
} }
</ng-template> </ng-template>
<div class="pt-3"> <div>
@if (errorMessages?.length === 0) { @if (errorMessages?.length === 0) {
@if (importStep === 1) { @if (importStep === 1) {
<gf-activities-table <gf-activities-table
@ -155,25 +156,27 @@
</button> </button>
</div> </div>
} @else { } @else {
<mat-accordion displayMode="flat"> <div class="pt-3">
@for (message of errorMessages; track message; let i = $index) { <mat-accordion displayMode="flat">
<mat-expansion-panel [disabled]="!details[i]"> @for (message of errorMessages; track message; let i = $index) {
<mat-expansion-panel-header class="pl-1"> <mat-expansion-panel [disabled]="!details[i]">
<mat-panel-title> <mat-expansion-panel-header class="pl-1">
<div class="d-flex"> <mat-panel-title>
<div class="align-items-center d-flex mr-2"> <div class="d-flex">
<ion-icon name="warning-outline" /> <div class="align-items-center d-flex mr-2">
<ion-icon name="warning-outline" />
</div>
<div>{{ message }}</div>
</div> </div>
<div>{{ message }}</div> </mat-panel-title>
</div> </mat-expansion-panel-header>
</mat-panel-title> @if (details[i]) {
</mat-expansion-panel-header> <pre class="m-0"><code>{{ details[i] | json }}</code></pre>
@if (details[i]) { }
<pre class="m-0"><code>{{ details[i] | json }}</code></pre> </mat-expansion-panel>
} }
</mat-expansion-panel> </mat-accordion>
} </div>
</mat-accordion>
<div class="d-flex justify-content-end mt-3"> <div class="d-flex justify-content-end mt-3">
<button mat-button (click)="onReset(stepper)"> <button mat-button (click)="onReset(stepper)">
<ng-container i18n>Back</ng-container> <ng-container i18n>Back</ng-container>

4
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -169,7 +169,9 @@ export class GfActivitiesTableComponent
} }
public ngAfterViewInit() { public ngAfterViewInit() {
this.dataSource.paginator = this.paginator; if (this.dataSource) {
this.dataSource.paginator = this.paginator;
}
this.sort.sortChange.subscribe((value: Sort) => { this.sort.sortChange.subscribe((value: Sort) => {
this.sortChanged.emit(value); this.sortChanged.emit(value);

Loading…
Cancel
Save