diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index 12b31c438..3f4afa121 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -190,6 +190,9 @@ export class AnnotationWrapper { } static fromData(redactionLogEntry?: RedactionLogEntryWrapper) { + if (redactionLogEntry.status === 'REQUESTED') { + console.log(redactionLogEntry); + } const annotationWrapper = new AnnotationWrapper(); annotationWrapper._origin = redactionLogEntry; diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html index 55693c59b..00c82dbca 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html @@ -28,7 +28,7 @@
- +
@@ -176,51 +176,49 @@ >
- -
- -
-
- {{ annotation.typeLabel | translate }} -
-
- - {{ annotation.descriptor | translate }}: {{ annotation.dictionary | humanize: false }} -
-
- : {{ annotation.shortContent }} -
+
+ +
+
+ {{ annotation.typeLabel | translate }}
- -
- +
+ + {{ annotation.descriptor | translate }}: {{ annotation.dictionary | humanize: false }} +
+
+ : {{ annotation.shortContent }}
-
-
- - {{ annotation.comments.length }} -
-
- -
+
+
- - +
+ +
+
+ + {{ annotation.comments.length }} +
+
+ +
+
+
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts index efba5b395..63720e7df 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts @@ -156,6 +156,7 @@ export class FileWorkloadComponent { annotationClicked(annotation: AnnotationWrapper, $event: MouseEvent) { this.pagesPanelActive = false; + this.logAnnotation(annotation); if (this.isSelected(annotation)) { this.deselectAnnotations.emit([annotation]); } else { diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts index 866579915..420533a70 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts @@ -24,6 +24,7 @@ export class AnnotationActionsService { acceptSuggestion($event: MouseEvent, annotations: AnnotationWrapper[], annotationsChanged: EventEmitter) { $event?.stopPropagation(); annotations.forEach(annotation => { + console.log('Accept ', annotation); this._processObsAndEmit( this._manualAnnotationService.approveRequest(annotation.id, annotation.isModifyDictionary), annotation, diff --git a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts index 4c84e0f43..ac926d292 100644 --- a/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts @@ -80,50 +80,6 @@ export class DossiersDialogService extends DialogService { return ref; } - openAcceptSuggestionModal( - $event: MouseEvent, - annotation: AnnotationWrapper, - callback?: Function - ): MatDialogRef { - $event?.stopPropagation(); - - const ref = this._dialog.open(ConfirmationDialogComponent, dialogConfig); - ref.afterClosed().subscribe(result => { - if (result) { - this._manualAnnotationService.approveRequest(annotation.id).subscribe(acceptResult => { - if (callback) { - callback(acceptResult); - } - }); - } - }); - - return ref; - } - - openRejectSuggestionModal( - $event: MouseEvent, - annotation: AnnotationWrapper, - rejectCallback: () => void - ): MatDialogRef { - $event?.stopPropagation(); - - const ref = this._dialog.open(ConfirmationDialogComponent, { - width: '400px', - maxWidth: '90vw' - }); - - ref.afterClosed().subscribe(result => { - if (result) { - this._manualAnnotationService.declineOrRemoveRequest(annotation).subscribe(() => { - rejectCallback(); - }); - } - }); - - return ref; - } - openForceRedactionDialog($event: MouseEvent, cb?: Function): MatDialogRef { $event?.stopPropagation(); const ref = this._dialog.open(ForceRedactionDialogComponent, { diff --git a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts index f07debfe0..ca4d5c069 100644 --- a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts @@ -34,7 +34,9 @@ export class PdfViewerDataService { const dossierId = this._appStateService.activeDossierId; const fileId = this._appStateService.activeFileId; - this._man.getManualRedaction(dossierId, fileId).subscribe(); + this._man.getManualRedaction(dossierId, fileId).subscribe(mr => { + console.log(mr); + }); const file$ = this.downloadOriginalFile(this._appStateService.activeFile); const reactionLog$ = this._redactionLogControllerService.getRedactionLog(dossierId, fileId).pipe(catchError(() => of({})));