{
const importData: CreateOrderDto[] = [];
+
for (const activity of selectedActivities) {
importData.push(this.convertToCreateOrderDto(activity));
}
+
return this.importJson({ content: importData });
}
private convertToCreateOrderDto({
+ accountId,
date,
fee,
quantity,
@@ -105,6 +108,7 @@ export class ImportActivitiesService {
unitPrice
}: Activity): CreateOrderDto {
return {
+ accountId,
fee,
quantity,
type,
diff --git a/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts b/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts
index d2053bb7c..5b72d9ce7 100644
--- a/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts
+++ b/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts
@@ -8,7 +8,7 @@ export interface EnhancedSymbolProfile {
activitiesCount: number;
assetClass: AssetClass;
assetSubClass: AssetSubClass;
- comment?: string;
+ comment: string | null;
countries: Country[];
createdAt: Date;
currency: string | null;
diff --git a/libs/common/src/lib/interfaces/historical-data-item.interface.ts b/libs/common/src/lib/interfaces/historical-data-item.interface.ts
index dd7bb84d8..59a53ee94 100644
--- a/libs/common/src/lib/interfaces/historical-data-item.interface.ts
+++ b/libs/common/src/lib/interfaces/historical-data-item.interface.ts
@@ -4,6 +4,7 @@ export interface HistoricalDataItem {
grossPerformancePercent?: number;
netPerformance?: number;
netPerformanceInPercentage?: number;
+ quantity?: number;
totalInvestment?: number;
value?: number;
}
diff --git a/libs/common/src/lib/types/account-with-platform.type.ts b/libs/common/src/lib/types/account-with-platform.type.ts
new file mode 100644
index 000000000..b0730abce
--- /dev/null
+++ b/libs/common/src/lib/types/account-with-platform.type.ts
@@ -0,0 +1,3 @@
+import { Account, Platform } from '@prisma/client';
+
+export type AccountWithPlatform = Account & { Platform?: Platform };
diff --git a/libs/common/src/lib/types/index.ts b/libs/common/src/lib/types/index.ts
index d70295b53..255a1c3fe 100644
--- a/libs/common/src/lib/types/index.ts
+++ b/libs/common/src/lib/types/index.ts
@@ -1,4 +1,5 @@
import type { AccessWithGranteeUser } from './access-with-grantee-user.type';
+import { AccountWithPlatform } from './account-with-platform.type';
import { AccountWithValue } from './account-with-value.type';
import type { ColorScheme } from './color-scheme';
import type { DateRange } from './date-range.type';
@@ -13,6 +14,7 @@ import type { ViewMode } from './view-mode.type';
export type {
AccessWithGranteeUser,
+ AccountWithPlatform,
AccountWithValue,
ColorScheme,
DateRange,
diff --git a/libs/common/src/lib/types/order-with-account.type.ts b/libs/common/src/lib/types/order-with-account.type.ts
index 09c64a283..af8803091 100644
--- a/libs/common/src/lib/types/order-with-account.type.ts
+++ b/libs/common/src/lib/types/order-with-account.type.ts
@@ -1,6 +1,6 @@
-import { Account, Order, Platform, SymbolProfile, Tag } from '@prisma/client';
+import { Order, SymbolProfile, Tag } from '@prisma/client';
-type AccountWithPlatform = Account & { Platform?: Platform };
+import { AccountWithPlatform } from './account-with-platform.type';
export type OrderWithAccount = Order & {
Account?: AccountWithPlatform;
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 462b412ba..d2dbb95e8 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -117,7 +117,7 @@
- {{ element.SymbolProfile.name }}
+ {{ element.SymbolProfile?.name }}
-
+
{{
- element.SymbolProfile.symbol | gfSymbol
+ element.SymbolProfile?.symbol | gfSymbol
}}
|
@@ -149,7 +149,7 @@
class="d-none d-lg-table-cell px-1"
mat-cell
>
- {{ element.SymbolProfile.currency }}
+ {{ element.SymbolProfile?.currency }}
{{ baseCurrency }}
@@ -388,6 +388,14 @@
Import Activities
+
|