diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 8df76d9d2..0cbde8228 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -36,22 +36,22 @@ const SEARCH_STRING_SEPARATOR = ',';
templateUrl: './activities-table.component.html'
})
export class ActivitiesTableComponent implements OnChanges, OnDestroy {
+ @Input() activities: OrderWithAccount[];
@Input() baseCurrency: string;
@Input() deviceType: string;
- @Input() hasPermissionToCreateOrder: boolean;
+ @Input() hasPermissionToCreateActivity: boolean;
@Input() hasPermissionToFilter = true;
- @Input() hasPermissionToImportOrders: boolean;
+ @Input() hasPermissionToImportActivities: boolean;
@Input() hasPermissionToOpenDetails = true;
@Input() locale: string;
@Input() showActions: boolean;
@Input() showSymbolColumn = true;
- @Input() transactions: OrderWithAccount[];
+ @Output() activityDeleted = new EventEmitter
();
+ @Output() activityToClone = new EventEmitter();
+ @Output() activityToUpdate = new EventEmitter();
@Output() export = new EventEmitter();
@Output() import = new EventEmitter();
- @Output() transactionDeleted = new EventEmitter();
- @Output() transactionToClone = new EventEmitter();
- @Output() transactionToUpdate = new EventEmitter();
@ViewChild('autocomplete') matAutocomplete: MatAutocomplete;
@ViewChild('searchInput') searchInput: ElementRef;
@@ -148,8 +148,8 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
this.isLoading = true;
- if (this.transactions) {
- this.dataSource = new MatTableDataSource(this.transactions);
+ if (this.activities) {
+ this.dataSource = new MatTableDataSource(this.activities);
this.dataSource.filterPredicate = (data, filter) => {
const dataString = this.getFilterableValues(data)
.join(' ')
@@ -167,13 +167,15 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
}
}
- public onDeleteTransaction(aId: string) {
- const confirmation = confirm(
- 'Do you really want to delete this transaction?'
- );
+ public onCloneActivity(aActivity: OrderWithAccount) {
+ this.activityToClone.emit(aActivity);
+ }
+
+ public onDeleteActivity(aId: string) {
+ const confirmation = confirm('Do you really want to delete this activity?');
if (confirmation) {
- this.transactionDeleted.emit(aId);
+ this.activityDeleted.emit(aId);
}
}
@@ -191,12 +193,8 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
});
}
- public onUpdateTransaction(aTransaction: OrderWithAccount) {
- this.transactionToUpdate.emit(aTransaction);
- }
-
- public onCloneTransaction(aTransaction: OrderWithAccount) {
- this.transactionToClone.emit(aTransaction);
+ public onUpdateActivity(aActivity: OrderWithAccount) {
+ this.activityToUpdate.emit(aActivity);
}
public ngOnDestroy() {
@@ -213,7 +211,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
this.placeholder =
lowercaseSearchKeywords.length <= 0 ? SEARCH_PLACEHOLDER : '';
- this.allFilters = this.getSearchableFieldValues(this.transactions).filter(
+ this.allFilters = this.getSearchableFieldValues(this.activities).filter(
(item) => {
return !lowercaseSearchKeywords.includes(item.trim().toLowerCase());
}
@@ -222,11 +220,11 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
this.filters$.next(this.allFilters);
}
- private getSearchableFieldValues(transactions: OrderWithAccount[]): string[] {
+ private getSearchableFieldValues(activities: OrderWithAccount[]): string[] {
const fieldValues = new Set();
- for (const transaction of transactions) {
- this.getFilterableValues(transaction, fieldValues);
+ for (const activity of activities) {
+ this.getFilterableValues(activity, fieldValues);
}
return [...fieldValues]
@@ -251,15 +249,15 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
}
private getFilterableValues(
- transaction: OrderWithAccount,
+ activity: OrderWithAccount,
fieldValues: Set = new Set()
): string[] {
- fieldValues.add(transaction.currency);
- fieldValues.add(transaction.symbol);
- fieldValues.add(transaction.type);
- fieldValues.add(transaction.Account?.name);
- fieldValues.add(transaction.Account?.Platform?.name);
- fieldValues.add(format(transaction.date, 'yyyy'));
+ fieldValues.add(activity.currency);
+ fieldValues.add(activity.symbol);
+ fieldValues.add(activity.type);
+ fieldValues.add(activity.Account?.name);
+ fieldValues.add(activity.Account?.Platform?.name);
+ fieldValues.add(format(activity.date, 'yyyy'));
return [...fieldValues].filter((item) => {
return item !== undefined;
diff --git a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html
index bb3ce1238..9f30d437a 100644
--- a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html
+++ b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.html
@@ -5,10 +5,10 @@
- Time to add your first transaction.
+ Time to add your first activity.