|
|
@ -39,13 +39,13 @@ import { GfImportActivitiesDialogComponent } from './import-activities-dialog/im |
|
|
import { ImportActivitiesDialogParams } from './import-activities-dialog/interfaces/interfaces'; |
|
|
import { ImportActivitiesDialogParams } from './import-activities-dialog/interfaces/interfaces'; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
|
|
|
changeDetection: ChangeDetectionStrategy.OnPush, |
|
|
imports: [ |
|
|
imports: [ |
|
|
GfActivitiesTableComponent, |
|
|
GfActivitiesTableComponent, |
|
|
GfFabComponent, |
|
|
GfFabComponent, |
|
|
MatSnackBarModule, |
|
|
MatSnackBarModule, |
|
|
RouterModule |
|
|
RouterModule |
|
|
], |
|
|
], |
|
|
changeDetection: ChangeDetectionStrategy.OnPush, |
|
|
|
|
|
selector: 'gf-activities-page', |
|
|
selector: 'gf-activities-page', |
|
|
styleUrls: ['./activities-page.scss'], |
|
|
styleUrls: ['./activities-page.scss'], |
|
|
templateUrl: './activities-page.html' |
|
|
templateUrl: './activities-page.html' |
|
|
@ -114,6 +114,7 @@ export class GfActivitiesPageComponent implements OnInit { |
|
|
.pipe(takeUntilDestroyed(this.destroyRef)) |
|
|
.pipe(takeUntilDestroyed(this.destroyRef)) |
|
|
.subscribe((impersonationId) => { |
|
|
.subscribe((impersonationId) => { |
|
|
this.hasImpersonationId = !!impersonationId; |
|
|
this.hasImpersonationId = !!impersonationId; |
|
|
|
|
|
|
|
|
this.changeDetectorRef.markForCheck(); |
|
|
this.changeDetectorRef.markForCheck(); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
@ -135,8 +136,6 @@ export class GfActivitiesPageComponent implements OnInit { |
|
|
this.dataSource = undefined; |
|
|
this.dataSource = undefined; |
|
|
this.totalItems = undefined; |
|
|
this.totalItems = undefined; |
|
|
|
|
|
|
|
|
this.changeDetectorRef.markForCheck(); |
|
|
|
|
|
|
|
|
|
|
|
const dateRange = this.user?.settings?.dateRange; |
|
|
const dateRange = this.user?.settings?.dateRange; |
|
|
const range = this.isCalendarYear(dateRange) ? dateRange : undefined; |
|
|
const range = this.isCalendarYear(dateRange) ? dateRange : undefined; |
|
|
|
|
|
|
|
|
@ -453,7 +452,5 @@ export class GfActivitiesPageComponent implements OnInit { |
|
|
this.hasPermissionToDeleteActivity = |
|
|
this.hasPermissionToDeleteActivity = |
|
|
!this.hasImpersonationId && |
|
|
!this.hasImpersonationId && |
|
|
hasPermission(this.user.permissions, permissions.deleteActivity); |
|
|
hasPermission(this.user.permissions, permissions.deleteActivity); |
|
|
|
|
|
|
|
|
this.changeDetectorRef.markForCheck(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|