Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Pull request #357: RED-3494

Browse Source 
Merge in RED/ui from VM/RED-3494 to master

* commit 'de121f2e01da9f598163d3223e48a1d49f4291ad':
  RED-3494 -> shown suggestions in preview as redactions
This commit is contained in:
Valentin-Gabriel Mihai 2022-02-28 17:45:00 +01:00 committed by Timo Bejan
commit a29060ee38
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/models/file/annotation.wrapper.ts
View File

@ -235,6 +235,10 @@ export class AnnotationWrapper {
return this.legalBasisChangeValue || this.legalBasisValue;
}
get previewAnnotation() {
return this.isRedacted || this.isSuggestionAdd;
}
static fromData(redactionLogEntry?: RedactionLogEntry) {
const annotationWrapper = new AnnotationWrapper();

2
apps/red-ui/src/app/models/file/file-data.model.ts
View File

@ -46,7 +46,7 @@ export class FileDataModel {
} else if (viewMode === 'DELTA') {
return annotation.isChangeLogEntry;
} else {
return annotation.isRedacted;
return annotation.previewAnnotation;
}
});
}

4
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
View File

@ -722,7 +722,9 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
private _setAnnotationsColor(annotations: Annotation[], customData: string) {
annotations.forEach(annotation => {
annotation['StrokeColor'] = this._annotationDrawService.convertColor(this._instance, annotation.getCustomData(customData));
const color = this._annotationDrawService.convertColor(this._instance, annotation.getCustomData(customData));
annotation['StrokeColor'] = color;
annotation['FillColor'] = color;
});
}
}

2
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
View File

@ -204,7 +204,7 @@ export class AnnotationDrawService {
annotationWrapper.isOCR ||
annotationWrapper.hidden;
annotation.setCustomData('redact-manager', 'true');
annotation.setCustomData('redaction', String(annotationWrapper.isRedacted));
annotation.setCustomData('redaction', String(annotationWrapper.previewAnnotation));
annotation.setCustomData('skipped', String(annotationWrapper.isSkipped));
annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry));
annotation.setCustomData('changeLogRemoved', String(annotationWrapper.isChangeLogRemoved));