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

fixes

Browse Source
This commit is contained in:
Timo Bejan 2020-11-16 16:21:02 +02:00
parent 0b90c19762
commit 905cf6a860
6 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/common/filter/model/filter.model.ts
View File

@ -4,5 +4,6 @@ export interface FilterModel {
checked?: boolean;
indeterminate?: boolean;
expanded?: boolean;
topLevelFilter?: boolean;
filters?: FilterModel[];
}

8
apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
View File

@ -97,7 +97,7 @@
<div>
<strong>{{ annotation.typeLabel | translate }}</strong>
</div>
<div *ngIf="annotation.dictionary">
<div *ngIf="annotation.dictionary && annotation.dictionary !== 'manual'">
<strong><span translate="dictionary"></span>: </strong>{{ annotation.dictionary | humanize }}
</div>
<div *ngIf="annotation.content">
@ -122,9 +122,9 @@
<redaction-full-page-loading-indicator [message]="loadingMessage" [displayed]="!viewReady"></redaction-full-page-loading-indicator>
<ng-template #annotationFilterTemplate let-filter="filter">
<redaction-type-filter *ngIf="isCategoryFilter(filter)" [filter]="filter"></redaction-type-filter>
<ng-container *ngIf="!isCategoryFilter(filter)">
<redaction-type-filter *ngIf="filter.topLevelFilter" [filter]="filter"></redaction-type-filter>
<ng-container *ngIf="!filter.topLevelFilter">
<redaction-dictionary-annotation-icon [dictionaryKey]="filter.key"></redaction-dictionary-annotation-icon>
{{ 'annotation-type.' + filter.key | translate }}
{{ filter.key | humanize }}
</ng-container>
</ng-template>

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

@ -440,10 +440,6 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
await this.appStateService.reloadActiveProjectFiles();
}
isCategoryFilter(filter: FilterModel) {
return filter.filters && filter.filters.length > 0;
}
get displayData() {
return this.fileData ? (this.redactedView ? this.fileData.redactedFileData : this.fileData.annotatedFileData) : null;
}

6
apps/red-ui/src/app/screens/file/model/annotation.wrapper.ts
View File

@ -150,11 +150,7 @@ export class AnnotationWrapper {
AnnotationWrapper._setSuperType(annotationWrapper, redactionLogEntry, manualRedactionEntry, idRemoval);
if (annotationWrapper.superType === 'hint' || annotationWrapper.superType === 'redaction') {
annotationWrapper.typeLabel = humanize(annotationWrapper.dictionary);
} else {
annotationWrapper.typeLabel = 'annotation-type.' + annotationWrapper.superType;
}
annotationWrapper.typeLabel = 'annotation-type.' + annotationWrapper.superType;
return annotationWrapper;
}

3
apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts
View File

@ -30,7 +30,8 @@ export class AnnotationProcessingService {
for (const key of Object.keys(availableAnnotationTypes)) {
const filter: FilterModel = {
key: key,
label: 'annotation-filter.super-type.' + key,
topLevelFilter: true,
label: 'annotation-type.' + key,
filters: Array.from(availableAnnotationTypes[key]).map((dc: string) => {
// const defaultFilter = this._appStateService.dictionaryData[dc]?.defaultFilter;
return { key: dc, checked: false, filters: [] };

13
apps/red-ui/src/assets/i18n/en.json
View File

@ -301,7 +301,7 @@
"comment": "Comment",
"suggestion": "Suggestion for redaction",
"dictionary": "Dictionary",
"content": "Content",
"content": "Reason",
"page": "Page",
"filter": {
"hint": "Hints only",
@ -310,15 +310,6 @@
"analysis": "Re-analysis required",
"none": "No Annotations"
},
"annotation-filter": {
"super-type": {
"redaction": "Redaction",
"hint": "Hint",
"suggestion": "Suggestion",
"suggestion-remove": "Suggestion to Remove",
"ignore": "Ignored redaction"
}
},
"filter-menu": {
"label": "Filter",
"all": "All",
@ -391,7 +382,7 @@
"error": "Failed to remove redaction."
},
"redaction-add": {
"success": "Redaction added.",
"success": "Manual Redaction added.",
"error": "Failed to add redaction."
}
},