Browse Source

Remove comments and uncomment logic

pull/1531/head
yksolanki9 3 years ago
parent
commit
07075bd607
  1. 11
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts
  2. 44
      libs/ui/src/lib/activities-table/activities-table.component.ts

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

@ -195,17 +195,6 @@ export class ImportActivitiesDialog implements OnDestroy {
private handleImportSuccess() { private handleImportSuccess() {
this.importComplete = true; this.importComplete = true;
//Needed to trigger onPush change detection strategy
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
// this.snackBar.open(
// '✅ ' + $localize`Import has been completed`,
// undefined,
// {
// duration: 3000
// }
// );
// this.dialogRef.close();
} }
} }

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

@ -101,7 +101,6 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
} }
public ngOnChanges() { public ngOnChanges() {
console.log('INSIDE LIIB', this.activities);
this.displayedColumns = [ this.displayedColumns = [
'select', 'select',
'count', 'count',
@ -244,18 +243,13 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
}; };
} }
if (activity.SymbolProfile?.currency) { fieldValueMap[activity.SymbolProfile.currency] = {
fieldValueMap[activity.SymbolProfile.currency] = { id: activity.SymbolProfile.currency,
id: activity.SymbolProfile.currency, label: activity.SymbolProfile.currency,
label: activity.SymbolProfile.currency, type: 'TAG'
type: 'TAG' };
};
}
if ( if (!isUUID(activity.SymbolProfile.symbol)) {
activity.SymbolProfile?.symbol &&
!isUUID(activity.SymbolProfile.symbol)
) {
fieldValueMap[activity.SymbolProfile.symbol] = { fieldValueMap[activity.SymbolProfile.symbol] = {
id: activity.SymbolProfile.symbol, id: activity.SymbolProfile.symbol,
label: activity.SymbolProfile.symbol, label: activity.SymbolProfile.symbol,
@ -263,21 +257,17 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
}; };
} }
if (activity?.type) { fieldValueMap[activity.type] = {
fieldValueMap[activity.type] = { id: activity.type,
id: activity.type, label: activity.type,
label: activity.type, type: 'TAG'
type: 'TAG' };
};
} fieldValueMap[format(new Date(activity.date), 'yyyy')] = {
id: format(new Date(activity.date), 'yyyy'),
// if (typeof activity?.date) { label: format(new Date(activity.date), 'yyyy'),
// fieldValueMap[format(activity.date, 'yyyy')] = { type: 'TAG'
// id: format(activity.date, 'yyyy'), };
// label: format(activity.date, 'yyyy'),
// type: 'TAG'
// };
// }
return Object.values(fieldValueMap); return Object.values(fieldValueMap);
} }

Loading…
Cancel
Save