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

Merge branch 'master' into refactor

Browse Source
This commit is contained in:
Dan Percic 2021-11-17 23:45:43 +02:00
commit aa6ad7d8c4
10 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,17 @@ export class AnnotationWrapper {
}
get isSuggestion() {
return this.isSuggestionAdd || this.isSuggestionRemove || this.isSuggestionChangeLegalBasis || this.isSuggestionRecategorizeImage;
return (
this.isSuggestionAdd ||
this.isSuggestionRemove ||
this.isSuggestionChangeLegalBasis ||
this.isSuggestionRecategorizeImage ||
this.isSuggestionResize
);
}
get isSuggestionResize() {
return this.superType === 'suggestion-resize';
}
get isSuggestionRecategorizeImage() {

1
apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
View File

@ -48,6 +48,7 @@ export class CommentsComponent {
this.annotation.comments.push({
text: value,
id: commentId,
annotationId: this.annotation.id,
user: this._userService.currentUser.id,
});
this._input.reset();

3
apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
View File

@ -5,11 +5,13 @@
*ngIf="!multiSelectActive && !isReadOnly"
class="all-caps-label primary pointer"
translate="file-preview.tabs.annotations.select"
iqserHelpMode="bulk-select-annotations"
></div>
<iqser-popup-filter
[actionsTemplate]="annotationFilterActionTemplate"
[primaryFiltersSlug]="'primaryFilters'"
[secondaryFiltersSlug]="'secondaryFilters'"
iqserHelpMode="workload-filter"
></iqser-popup-filter>
</div>
</div>
@ -190,6 +192,7 @@
[canMultiSelect]="!isReadOnly"
[file]="file"
[selectedAnnotations]="selectedAnnotations"
iqserHelpMode="workload-annotations-list"
></redaction-annotations-list>
</div>
</ng-container>

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

@ -7,24 +7,29 @@
[class.active]="viewMode === 'STANDARD'"
[matTooltip]="'file-preview.standard-tooltip' | translate"
class="red-tab"
iqserHelpMode="standard-view"
>
{{ 'file-preview.standard' | translate }}
</div>
<div
(click)="canSwitchToDeltaView && switchView('DELTA')"
[class.active]="viewMode === 'DELTA'"
[class.disabled]="!canSwitchToDeltaView"
[matTooltip]="'file-preview.delta-tooltip' | translate"
class="red-tab"
iqserHelpMode="delta-view"
>
{{ 'file-preview.delta' | translate }}
</div>
<div
(click)="canSwitchToRedactedView(file) && switchView('REDACTED')"
[class.active]="viewMode === 'REDACTED'"
[class.disabled]="!canSwitchToRedactedView(file)"
[matTooltip]="'file-preview.redacted-tooltip' | translate"
class="red-tab"
iqserHelpMode="preview-view"
>
{{ 'file-preview.redacted' | translate }}
</div>
@ -104,6 +109,7 @@
[icon]="fullScreen ? 'red:exit-fullscreen' : 'red:fullscreen'"
[tooltip]="'file-preview.fullscreen' | translate"
class="ml-2"
iqserHelpMode="assign-reviewer"
tooltipPosition="below"
></iqser-circle-button>

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

@ -246,6 +246,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
ngOnDetach(): void {
this.displayPDFViewer = false;
this._changeDetectorRef.markForCheck();
super.ngOnDestroy();
}

3
apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
View File

@ -406,6 +406,7 @@ export class AnnotationActionsService {
const annotationManager = viewer.Core.annotationManager;
const viewerAnnotation = annotationManager.getAnnotationById(annotationWrapper.id);
viewerAnnotation.ReadOnly = false;
viewerAnnotation.Hidden = false;
viewerAnnotation.setRotationControlEnabled(false);
annotationManager.redrawAnnotation(viewerAnnotation);
annotationManager.selectAnnotation(viewerAnnotation);
@ -430,8 +431,6 @@ export class AnnotationActionsService {
value: text,
};
console.log(resizeRequest);
this._processObsAndEmit(
this._manualAnnotationService.resizeOrSuggestToResize(annotationWrapper, dossier, resizeRequest),
annotationWrapper,

42
apps/red-ui/src/assets/help-mode/links.json
View File

@ -76,5 +76,47 @@
"de": "",
"it": "",
"fr": ""
},
"standard-view": {
"en": "https://docs.redactmanager.com/2.2/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html",
"de": "",
"it": "",
"fr": ""
},
"delta-view": {
"en": "https://docs.redactmanager.com/2.2/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html",
"de": "",
"it": "",
"fr": ""
},
"preview-view": {
"en": "https://docs.redactmanager.com/2.2/en/editing-documents-in-the-editor/views-in-the-editor/preview.html",
"de": "",
"it": "",
"fr": ""
},
"bulk-select-annotations": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"workload-filter": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"workload-annotations-list": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"assign-reviewer": {
"en": "",
"de": "",
"it": "",
"fr": ""
}
}

2
libs/common-ui

@ -1 +1 @@
Subproject commit 17c65675b934698a61a2c80435f532e5a77f0c97
Subproject commit 813170555884c193e3eb8d4c06ae55540d266827

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "redaction",
"version": "3.30.0",
"version": "3.32.0",
"private": true,
"license": "MIT",
"scripts": {

BIN
paligo-theme.tar.gz
View File

Binary file not shown.