|
@ -155,7 +155,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { |
|
|
|
|
|
|
|
|
public onDeleteActivity(aId: string) { |
|
|
public onDeleteActivity(aId: string) { |
|
|
this.dataService |
|
|
this.dataService |
|
|
.deleteOrder(aId) |
|
|
.deleteActivity(aId) |
|
|
.pipe(takeUntil(this.unsubscribeSubject)) |
|
|
.pipe(takeUntil(this.unsubscribeSubject)) |
|
|
.subscribe({ |
|
|
.subscribe({ |
|
|
next: () => { |
|
|
next: () => { |
|
@ -171,7 +171,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { |
|
|
|
|
|
|
|
|
if (confirmation) { |
|
|
if (confirmation) { |
|
|
this.dataService |
|
|
this.dataService |
|
|
.deleteAllOrders() |
|
|
.deleteAllActivities() |
|
|
.pipe(takeUntil(this.unsubscribeSubject)) |
|
|
.pipe(takeUntil(this.unsubscribeSubject)) |
|
|
.subscribe({ |
|
|
.subscribe({ |
|
|
next: () => { |
|
|
next: () => { |
|
@ -400,6 +400,7 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { |
|
|
hasPermission(this.user.permissions, permissions.createOrder); |
|
|
hasPermission(this.user.permissions, permissions.createOrder); |
|
|
this.hasPermissionToDeleteActivity = |
|
|
this.hasPermissionToDeleteActivity = |
|
|
!this.hasImpersonationId && |
|
|
!this.hasImpersonationId && |
|
|
hasPermission(this.user.permissions, permissions.deleteOrder); |
|
|
hasPermission(this.user.permissions, permissions.deleteOrder) && |
|
|
|
|
|
!this.userService.hasFilters(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|