Browse Source

Fix condition to show checkbox

pull/1531/head
yksolanki9 3 years ago
parent
commit
6abb730f51
  1. 1
      apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
  2. 4
      libs/ui/src/lib/activities-table/activities-table.component.scss
  3. 12
      libs/ui/src/lib/activities-table/activities-table.component.ts

1
apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html

@ -18,6 +18,7 @@
[hasPermissionToOpenDetails]="false"
[locale]="data?.user?.settings?.locale"
[showActions]="false"
[showCheckbox]="true"
[showSymbolColumn]="false"
(selectedActivities)="importActivities($event)"
></gf-activities-table>

4
libs/ui/src/lib/activities-table/activities-table.component.scss

@ -25,6 +25,10 @@
}
}
.mat-checkbox {
margin-top: 8px;
}
.mat-row {
.type-badge {
background-color: rgba(var(--palette-foreground-text), 0.05);

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

@ -41,9 +41,9 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
@Input() hasPermissionToImportActivities: boolean;
@Input() hasPermissionToOpenDetails = true;
@Input() locale: string;
@Input() multiselect = false;
@Input() pageSize = DEFAULT_PAGE_SIZE;
@Input() showActions: boolean;
@Input() showCheckbox = false;
@Input() showNameColumn = true;
@Output() activityDeleted = new EventEmitter<string>();
@ -118,6 +118,16 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
'actions'
];
if (this.showCheckbox) {
this.displayedColumns = this.displayedColumns.filter((column) => {
return column !== 'count';
});
} else {
this.displayedColumns = this.displayedColumns.filter((column) => {
return column !== 'select';
});
}
if (!this.showNameColumn) {
this.displayedColumns = this.displayedColumns.filter((column) => {
return column !== 'nameWithSymbol';

Loading…
Cancel
Save