|
@ -36,6 +36,7 @@ export class ImportActivitiesDialog implements OnDestroy { |
|
|
public mode: 'DIVIDEND'; |
|
|
public mode: 'DIVIDEND'; |
|
|
public selectedActivities: Activity[] = []; |
|
|
public selectedActivities: Activity[] = []; |
|
|
public uniqueAssetForm: FormGroup; |
|
|
public uniqueAssetForm: FormGroup; |
|
|
|
|
|
public isAnyActivityDuplicate: boolean = false; |
|
|
|
|
|
|
|
|
private unsubscribeSubject = new Subject<void>(); |
|
|
private unsubscribeSubject = new Subject<void>(); |
|
|
|
|
|
|
|
@ -228,6 +229,12 @@ export class ImportActivitiesDialog implements OnDestroy { |
|
|
this.isFileSelected = true; |
|
|
this.isFileSelected = true; |
|
|
this.snackBar.dismiss(); |
|
|
this.snackBar.dismiss(); |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
|
|
|
this.activities.some((activity) => { |
|
|
|
|
|
if (activity.isDuplicate) { |
|
|
|
|
|
this.isAnyActivityDuplicate = true; |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
}; |
|
|
}; |
|
|
}; |
|
|
}; |
|
@ -236,7 +243,9 @@ export class ImportActivitiesDialog implements OnDestroy { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public updateSelection(data: Activity[]) { |
|
|
public updateSelection(data: Activity[]) { |
|
|
this.selectedActivities = data; |
|
|
this.selectedActivities = data.filter((activity) => { |
|
|
|
|
|
return !activity.isDuplicate; |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public ngOnDestroy() { |
|
|
public ngOnDestroy() { |
|
|