mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-31 09:37:15 +01:00
Merged PR 706: #1878 Task Calendar Fix, changes Status correctly if click on button Erneut B...
#1878 Task Calendar Fix, changes Status correctly if click on button Erneut Bearbeiten
This commit is contained in:
committed by
Lorenz Hilpert
parent
16e3a4c0d6
commit
720fe3e5c0
@@ -32,7 +32,7 @@
|
||||
</ng-container>
|
||||
</div>
|
||||
<ng-container *ngIf="showResetEditCta$ | async">
|
||||
<button class="btn-cta-secondary" type="button" (click)="resetEdit()">Erneut bearbeiten</button>
|
||||
<button class="btn-cta-secondary" type="button" (click)="edit()">Erneut bearbeiten</button>
|
||||
<button class="btn-cta" type="button" (click)="close()">Fenster schließen</button>
|
||||
</ng-container>
|
||||
</div>
|
||||
|
||||
@@ -6,7 +6,7 @@ import { UiMessageModalComponent, UiModalRef, UiModalService } from '@ui/modal';
|
||||
import { isNullOrUndefined } from '@utils/common';
|
||||
import { NativeContainerService } from 'native-container';
|
||||
import { combineLatest, ReplaySubject } from 'rxjs';
|
||||
import { map, shareReplay, switchMap } from 'rxjs/operators';
|
||||
import { map, tap, shareReplay, switchMap } from 'rxjs/operators';
|
||||
import { CameraCaptureModalComponent } from '../camera/camera-capture-modal.component';
|
||||
|
||||
@Component({
|
||||
@@ -30,6 +30,7 @@ export class TaskModalComponent {
|
||||
);
|
||||
|
||||
status$ = this.processingStatus$.pipe(
|
||||
tap((x) => console.log(x)),
|
||||
map((processingStatus) => {
|
||||
if (processingStatus.includes('InProcess')) {
|
||||
return 'In Bearbeitung';
|
||||
@@ -93,8 +94,8 @@ export class TaskModalComponent {
|
||||
this.close();
|
||||
}
|
||||
|
||||
async resetEdit() {
|
||||
await this.domainTaskCalendarService.resetConfirmation({ infoId: this.info.id }).toPromise();
|
||||
async edit() {
|
||||
await this.domainTaskCalendarService.setToEdit({ infoId: this.info.id }).toPromise();
|
||||
this.reloadInfo();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user