diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ab9408b..cca26532 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improved the usage of the premium indicator component - Removed the intro image in dark mode +- Refactored the `TransactionsPageComponent` to `ActivitiesPageComponent` ## 1.208.0 - 03.11.2022 diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 856230eb..71e46416 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -148,8 +148,8 @@ const routes: Routes = [ { path: 'portfolio/activities', loadChildren: () => - import('./pages/portfolio/transactions/transactions-page.module').then( - (m) => m.TransactionsPageModule + import('./pages/portfolio/activities/activities-page.module').then( + (m) => m.ActivitiesPageModule ) }, { diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page-routing.module.ts b/apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts similarity index 69% rename from apps/client/src/app/pages/portfolio/transactions/transactions-page-routing.module.ts rename to apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts index 70dc226f..b1a3e1e4 100644 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page-routing.module.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts @@ -2,12 +2,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; -import { TransactionsPageComponent } from './transactions-page.component'; +import { ActivitiesPageComponent } from './activities-page.component'; const routes: Routes = [ { canActivate: [AuthGuard], - component: TransactionsPageComponent, + component: ActivitiesPageComponent, path: '', title: $localize`Activities` } @@ -17,4 +17,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class TransactionsPageRoutingModule {} +export class ActivitiesPageRoutingModule {} diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts similarity index 86% rename from apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts rename to apps/client/src/app/pages/portfolio/activities/activities-page.component.ts index 0925dbf3..9a6c871e 100644 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts @@ -10,7 +10,7 @@ import { PositionDetailDialog } from '@ghostfolio/client/components/position/pos import { DataService } from '@ghostfolio/client/services/data.service'; import { IcsService } from '@ghostfolio/client/services/ics/ics.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; -import { ImportTransactionsService } from '@ghostfolio/client/services/import-transactions.service'; +import { ImportActivitiesService } from '@ghostfolio/client/services/import-activities.service'; import { UserService } from '@ghostfolio/client/services/user/user.service'; import { downloadAsFile } from '@ghostfolio/common/helper'; import { User } from '@ghostfolio/common/interfaces'; @@ -22,23 +22,23 @@ import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, Subscription } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { CreateOrUpdateTransactionDialog } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.component'; -import { ImportTransactionDialog } from './import-transaction-dialog/import-transaction-dialog.component'; +import { CreateOrUpdateActivityDialog } from './create-or-update-activity-dialog/create-or-update-activity-dialog.component'; +import { ImportActivitiesDialog } from './import-activities-dialog/import-activities-dialog.component'; @Component({ host: { class: 'page' }, - selector: 'gf-transactions-page', - styleUrls: ['./transactions-page.scss'], - templateUrl: './transactions-page.html' + selector: 'gf-activities-page', + styleUrls: ['./activities-page.scss'], + templateUrl: './activities-page.html' }) -export class TransactionsPageComponent implements OnDestroy, OnInit { +export class ActivitiesPageComponent implements OnDestroy, OnInit { public activities: Activity[]; public defaultAccountId: string; public deviceType: string; public hasImpersonationId: boolean; - public hasPermissionToCreateOrder: boolean; - public hasPermissionToDeleteOrder: boolean; - public hasPermissionToImportOrders: boolean; + public hasPermissionToCreateActivity: boolean; + public hasPermissionToDeleteActivity: boolean; + public hasPermissionToImportActivities: boolean; public routeQueryParams: Subscription; public user: User; @@ -51,7 +51,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { private dialog: MatDialog, private icsService: IcsService, private impersonationStorageService: ImpersonationStorageService, - private importTransactionsService: ImportTransactionsService, + private importActivitiesService: ImportActivitiesService, private route: ActivatedRoute, private router: Router, private snackBar: MatSnackBar, @@ -61,14 +61,14 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { .pipe(takeUntil(this.unsubscribeSubject)) .subscribe((params) => { if (params['createDialog']) { - this.openCreateTransactionDialog(); + this.openCreateActivityDialog(); } else if (params['editDialog']) { if (this.activities) { - const transaction = this.activities.find(({ id }) => { - return id === params['transactionId']; + const activity = this.activities.find(({ id }) => { + return id === params['activityId']; }); - this.openUpdateTransactionDialog(transaction); + this.openUpdateActivityDialog(activity); } else { this.router.navigate(['.'], { relativeTo: this.route }); } @@ -96,7 +96,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { .subscribe((aId) => { this.hasImpersonationId = !!aId; - this.hasPermissionToImportOrders = + this.hasPermissionToImportActivities = hasPermission(globalPermissions, permissions.enableImport) && !this.hasImpersonationId; }); @@ -121,7 +121,10 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { .subscribe(({ activities }) => { this.activities = activities; - if (this.hasPermissionToCreateOrder && this.activities?.length <= 0) { + if ( + this.hasPermissionToCreateActivity && + this.activities?.length <= 0 + ) { this.router.navigate([], { queryParams: { createDialog: true } }); } @@ -129,11 +132,11 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { }); } - public onCloneTransaction(aActivity: Activity) { - this.openCreateTransactionDialog(aActivity); + public onCloneActivity(aActivity: Activity) { + this.openCreateActivityDialog(aActivity); } - public onDeleteTransaction(aId: string) { + public onDeleteActivity(aId: string) { this.dataService .deleteOrder(aId) .pipe(takeUntil(this.unsubscribeSubject)) @@ -221,7 +224,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { } try { - await this.importTransactionsService.importJson({ + await this.importActivitiesService.importJson({ content: content.activities }); @@ -234,7 +237,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { return; } else if (file.name.endsWith('.csv')) { try { - await this.importTransactionsService.importCsv({ + await this.importActivitiesService.importCsv({ fileContent, userAccounts: this.user.accounts }); @@ -267,14 +270,14 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { input.click(); } - public onUpdateTransaction(aTransaction: OrderModel) { + public onUpdateActivity(aActivity: OrderModel) { this.router.navigate([], { - queryParams: { editDialog: true, transactionId: aTransaction.id } + queryParams: { activityId: aActivity.id, editDialog: true } }); } - public openUpdateTransactionDialog(activity: Activity): void { - const dialogRef = this.dialog.open(CreateOrUpdateTransactionDialog, { + public openUpdateActivityDialog(activity: Activity): void { + const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, { data: { activity, accounts: this.user?.accounts?.filter((account) => { @@ -321,7 +324,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { }) { this.snackBar.dismiss(); - this.dialog.open(ImportTransactionDialog, { + this.dialog.open(ImportActivitiesDialog, { data: { activities, deviceType: this.deviceType, @@ -343,14 +346,14 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { ); } - private openCreateTransactionDialog(aActivity?: Activity): void { + private openCreateActivityDialog(aActivity?: Activity): void { this.userService .get() .pipe(takeUntil(this.unsubscribeSubject)) .subscribe((user) => { this.updateUser(user); - const dialogRef = this.dialog.open(CreateOrUpdateTransactionDialog, { + const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, { data: { accounts: this.user?.accounts?.filter((account) => { return account.accountType === 'SECURITIES'; @@ -438,11 +441,11 @@ export class TransactionsPageComponent implements OnDestroy, OnInit { return account.isDefault; })?.id; - this.hasPermissionToCreateOrder = hasPermission( + this.hasPermissionToCreateActivity = hasPermission( this.user.permissions, permissions.createOrder ); - this.hasPermissionToDeleteOrder = hasPermission( + this.hasPermissionToDeleteActivity = hasPermission( this.user.permissions, permissions.deleteOrder ); diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.html similarity index 71% rename from apps/client/src/app/pages/portfolio/transactions/transactions-page.html rename to apps/client/src/app/pages/portfolio/activities/activities-page.html index ee2e4181..cc12176b 100644 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.html +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html @@ -6,14 +6,14 @@ [activities]="activities" [baseCurrency]="user?.settings?.baseCurrency" [deviceType]="deviceType" - [hasPermissionToCreateActivity]="hasPermissionToCreateOrder" + [hasPermissionToCreateActivity]="hasPermissionToCreateActivity" [hasPermissionToExportActivities]="!hasImpersonationId" - [hasPermissionToImportActivities]="hasPermissionToImportOrders" + [hasPermissionToImportActivities]="hasPermissionToImportActivities" [locale]="user?.settings?.locale" - [showActions]="!hasImpersonationId && hasPermissionToDeleteOrder && !user.settings.isRestrictedView" - (activityDeleted)="onDeleteTransaction($event)" - (activityToClone)="onCloneTransaction($event)" - (activityToUpdate)="onUpdateTransaction($event)" + [showActions]="!hasImpersonationId && hasPermissionToDeleteActivity && !user.settings.isRestrictedView" + (activityDeleted)="onDeleteActivity($event)" + (activityToClone)="onCloneActivity($event)" + (activityToUpdate)="onUpdateActivity($event)" (export)="onExport($event)" (exportDrafts)="onExportDrafts($event)" (import)="onImport()" @@ -22,7 +22,7 @@
, - public dialogRef: MatDialogRef, + public dialogRef: MatDialogRef, private formBuilder: FormBuilder, @Inject(MAT_DATE_LOCALE) private locale: string ) {} diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html similarity index 100% rename from apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.html rename to apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.ts similarity index 86% rename from apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts rename to apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.ts index 15950be7..f36e8cfa 100644 --- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.module.ts +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.ts @@ -13,10 +13,10 @@ import { MatSelectModule } from '@angular/material/select'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; import { GfValueModule } from '@ghostfolio/ui/value'; -import { CreateOrUpdateTransactionDialog } from './create-or-update-transaction-dialog.component'; +import { CreateOrUpdateActivityDialog } from './create-or-update-activity-dialog.component'; @NgModule({ - declarations: [CreateOrUpdateTransactionDialog], + declarations: [CreateOrUpdateActivityDialog], imports: [ CommonModule, GfSymbolModule, @@ -35,4 +35,4 @@ import { CreateOrUpdateTransactionDialog } from './create-or-update-transaction- ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class GfCreateOrUpdateTransactionDialogModule {} +export class GfCreateOrUpdateActivityDialogModule {} diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.scss similarity index 100% rename from apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/create-or-update-transaction-dialog.scss rename to apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.scss diff --git a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts similarity index 82% rename from apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts rename to apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts index b4b15dfd..2db48a45 100644 --- a/apps/client/src/app/pages/portfolio/transactions/create-or-update-transaction-dialog/interfaces/interfaces.ts +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts @@ -2,7 +2,7 @@ import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interf import { User } from '@ghostfolio/common/interfaces'; import { Account } from '@prisma/client'; -export interface CreateOrUpdateTransactionDialogParams { +export interface CreateOrUpdateActivityDialogParams { accountId: string; accounts: Account[]; activity: Activity; diff --git a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts similarity index 69% rename from apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.component.ts rename to apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts index 8a28b4ea..c9a87376 100644 --- a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts @@ -7,22 +7,22 @@ import { import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Subject } from 'rxjs'; -import { ImportTransactionDialogParams } from './interfaces/interfaces'; +import { ImportActivitiesDialogParams } from './interfaces/interfaces'; @Component({ changeDetection: ChangeDetectionStrategy.OnPush, - selector: 'gf-import-transaction-dialog', - styleUrls: ['./import-transaction-dialog.scss'], - templateUrl: 'import-transaction-dialog.html' + selector: 'gf-import-activities-dialog', + styleUrls: ['./import-activities-dialog.scss'], + templateUrl: 'import-activities-dialog.html' }) -export class ImportTransactionDialog implements OnDestroy { +export class ImportActivitiesDialog implements OnDestroy { public details: any[] = []; private unsubscribeSubject = new Subject(); public constructor( - @Inject(MAT_DIALOG_DATA) public data: ImportTransactionDialogParams, - public dialogRef: MatDialogRef + @Inject(MAT_DIALOG_DATA) public data: ImportActivitiesDialogParams, + public dialogRef: MatDialogRef ) {} public ngOnInit() { diff --git a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html similarity index 100% rename from apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.html rename to apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html diff --git a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.module.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts similarity index 80% rename from apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.module.ts rename to apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts index 6d932cb8..d28b38f6 100644 --- a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.module.ts +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts @@ -6,10 +6,10 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module'; import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module'; -import { ImportTransactionDialog } from './import-transaction-dialog.component'; +import { ImportActivitiesDialog } from './import-activities-dialog.component'; @NgModule({ - declarations: [ImportTransactionDialog], + declarations: [ImportActivitiesDialog], imports: [ CommonModule, GfDialogFooterModule, @@ -20,4 +20,4 @@ import { ImportTransactionDialog } from './import-transaction-dialog.component'; ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class GfImportTransactionDialogModule {} +export class GfImportActivitiesDialogModule {} diff --git a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.scss b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.scss similarity index 100% rename from apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/import-transaction-dialog.scss rename to apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.scss diff --git a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/interfaces/interfaces.ts similarity index 57% rename from apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/interfaces/interfaces.ts rename to apps/client/src/app/pages/portfolio/activities/import-activities-dialog/interfaces/interfaces.ts index 12323854..21a7b8d3 100644 --- a/apps/client/src/app/pages/portfolio/transactions/import-transaction-dialog/interfaces/interfaces.ts +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/interfaces/interfaces.ts @@ -1,4 +1,4 @@ -export interface ImportTransactionDialogParams { +export interface ImportActivitiesDialogParams { activities: any[]; deviceType: string; messages: string[]; diff --git a/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts b/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts deleted file mode 100644 index e71d3067..00000000 --- a/apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { MatButtonModule } from '@angular/material/button'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { RouterModule } from '@angular/router'; -import { ImportTransactionsService } from '@ghostfolio/client/services/import-transactions.service'; -import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module'; - -import { GfCreateOrUpdateTransactionDialogModule } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.module'; -import { GfImportTransactionDialogModule } from './import-transaction-dialog/import-transaction-dialog.module'; -import { TransactionsPageRoutingModule } from './transactions-page-routing.module'; -import { TransactionsPageComponent } from './transactions-page.component'; - -@NgModule({ - declarations: [TransactionsPageComponent], - exports: [], - imports: [ - CommonModule, - GfActivitiesTableModule, - GfCreateOrUpdateTransactionDialogModule, - GfImportTransactionDialogModule, - MatButtonModule, - MatSnackBarModule, - RouterModule, - TransactionsPageRoutingModule - ], - providers: [ImportTransactionsService], - schemas: [CUSTOM_ELEMENTS_SCHEMA] -}) -export class TransactionsPageModule {} diff --git a/apps/client/src/app/services/import-transactions.service.ts b/apps/client/src/app/services/import-activities.service.ts similarity index 91% rename from apps/client/src/app/services/import-transactions.service.ts rename to apps/client/src/app/services/import-activities.service.ts index 6a88bb27..f64faf52 100644 --- a/apps/client/src/app/services/import-transactions.service.ts +++ b/apps/client/src/app/services/import-activities.service.ts @@ -11,7 +11,7 @@ import { catchError } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) -export class ImportTransactionsService { +export class ImportActivitiesService { private static ACCOUNT_KEYS = ['account', 'accountid']; private static CURRENCY_KEYS = ['ccy', 'currency']; private static DATA_SOURCE_KEYS = ['datasource']; @@ -90,7 +90,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.ACCOUNT_KEYS) { + for (const key of ImportActivitiesService.ACCOUNT_KEYS) { if (item[key]) { return userAccounts.find((account) => { return ( @@ -115,7 +115,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.CURRENCY_KEYS) { + for (const key of ImportActivitiesService.CURRENCY_KEYS) { if (item[key]) { return item[key]; } @@ -130,7 +130,7 @@ export class ImportTransactionsService { private parseDataSource({ item }: { item: any }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.DATA_SOURCE_KEYS) { + for (const key of ImportActivitiesService.DATA_SOURCE_KEYS) { if (item[key]) { return DataSource[item[key].toUpperCase()]; } @@ -151,7 +151,7 @@ export class ImportTransactionsService { item = this.lowercaseKeys(item); let date: string; - for (const key of ImportTransactionsService.DATE_KEYS) { + for (const key of ImportActivitiesService.DATE_KEYS) { if (item[key]) { if (isMatch(item[key], 'dd-MM-yyyy')) { date = parse(item[key], 'dd-MM-yyyy', new Date()).toISOString(); @@ -186,7 +186,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.FEE_KEYS) { + for (const key of ImportActivitiesService.FEE_KEYS) { if (isFinite(item[key])) { return item[key]; } @@ -209,7 +209,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.QUANTITY_KEYS) { + for (const key of ImportActivitiesService.QUANTITY_KEYS) { if (isFinite(item[key])) { return item[key]; } @@ -232,7 +232,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.SYMBOL_KEYS) { + for (const key of ImportActivitiesService.SYMBOL_KEYS) { if (item[key]) { return item[key]; } @@ -255,7 +255,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.TYPE_KEYS) { + for (const key of ImportActivitiesService.TYPE_KEYS) { if (item[key]) { switch (item[key].toLowerCase()) { case 'buy': @@ -289,7 +289,7 @@ export class ImportTransactionsService { }) { item = this.lowercaseKeys(item); - for (const key of ImportTransactionsService.UNIT_PRICE_KEYS) { + for (const key of ImportActivitiesService.UNIT_PRICE_KEYS) { if (isFinite(item[key])) { return item[key]; }