Browse Source

Refactoring

pull/6622/head
Thomas Kaul 2 months ago
parent
commit
406eeaf7a7
  1. 2
      apps/api/src/app/export/export.service.ts
  2. 4
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  3. 2
      libs/ui/src/lib/activities-table/activities-table.component.html
  4. 7
      libs/ui/src/lib/activities-table/activities-table.component.ts

2
apps/api/src/app/export/export.service.ts

@ -43,10 +43,10 @@ export class ExportService {
let { activities } = await this.activitiesService.getActivities({ let { activities } = await this.activitiesService.getActivities({
filters, filters,
userId, userId,
types: activityTypes,
includeDrafts: true, includeDrafts: true,
sortColumn: 'date', sortColumn: 'date',
sortDirection: 'asc', sortDirection: 'asc',
types: activityTypes,
userCurrency: userSettings?.baseCurrency, userCurrency: userSettings?.baseCurrency,
withExcludedAccountsAndActivities: true withExcludedAccountsAndActivities: true
}); });

4
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -327,8 +327,8 @@ export class GfActivitiesPageComponent implements OnInit {
this.fetchActivities(); this.fetchActivities();
} }
public onTypesFilterChanged(types: string[]) { public onTypesFilterChanged(aTypes: string[]) {
this.activityTypesFilter = types; this.activityTypesFilter = aTypes;
this.pageIndex = 0; this.pageIndex = 0;
this.fetchActivities(); this.fetchActivities();

2
libs/ui/src/lib/activities-table/activities-table.component.html

@ -5,7 +5,7 @@
<mat-label i18n>Type</mat-label> <mat-label i18n>Type</mat-label>
<mat-select multiple [formControl]="typesFilter"> <mat-select multiple [formControl]="typesFilter">
@for ( @for (
activityType of activityTypes | keyvalue; activityType of activityTypesTranslationMap | keyvalue;
track activityType.key track activityType.key
) { ) {
<mat-option [value]="activityType.key"> <mat-option [value]="activityType.key">

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

@ -139,7 +139,7 @@ export class GfActivitiesTableComponent
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
public readonly activityTypes = new Map<ActivityType, string>(); public activityTypesTranslationMap = new Map<ActivityType, string>();
public hasDrafts = false; public hasDrafts = false;
public hasErrors = false; public hasErrors = false;
public isUUID = isUUID; public isUUID = isUUID;
@ -202,7 +202,10 @@ export class GfActivitiesTableComponent
public constructor() { public constructor() {
for (const type of Object.keys(ActivityType) as ActivityType[]) { for (const type of Object.keys(ActivityType) as ActivityType[]) {
this.activityTypes.set(ActivityType[type], translate(ActivityType[type])); this.activityTypesTranslationMap.set(
ActivityType[type],
translate(ActivityType[type])
);
} }
addIcons({ addIcons({

Loading…
Cancel
Save