Merge remote-tracking branch 'origin/master' into RED-2830

This commit is contained in:
Adina Țeudan 2021-12-02 03:49:51 +02:00
commit c8d48b50f3
13 changed files with 64 additions and 8 deletions

View File

@ -1,12 +1,19 @@
<iqser-status-bar *ngIf="stats" [configs]="statusBarConfig"></iqser-status-bar>
<div (longPress)="forceReanalysisAction($event)" class="action-buttons" redactionLongPress>
<div
(longPress)="forceReanalysisAction($event)"
class="action-buttons"
redactionLongPress
iqserHelpMode="dossier-features"
[updateElementPosition]="false"
>
<iqser-circle-button
(action)="openEditDossierDialog($event, dossier.dossierId)"
*ngIf="currentUser.isManager"
[tooltip]="'dossier-listing.edit.action' | translate"
[type]="circleButtonTypes.dark"
icon="iqser:edit"
iqserHelpMode="edit-dossier-from-list"
></iqser-circle-button>
<iqser-circle-button

View File

@ -38,6 +38,7 @@
[tooltip]="'annotation-actions.edit-reason.label' | translate"
[type]="buttonType"
icon="iqser:edit"
iqserHelpMode="redaction-edit-reason"
></iqser-circle-button>
<iqser-circle-button
@ -47,6 +48,7 @@
[tooltip]="'annotation-actions.accept-recommendation.label' | translate"
[type]="buttonType"
icon="iqser:check"
iqserHelpMode="recommendation-accept-or-reject"
></iqser-circle-button>
<iqser-circle-button
@ -119,6 +121,7 @@
[tooltip]="'annotation-actions.remove-annotation.remove-from-dict' | translate"
[type]="buttonType"
icon="red:remove-from-dict"
iqserHelpMode="redaction-remove-from-dictionary"
></iqser-circle-button>
<iqser-circle-button
@ -128,6 +131,7 @@
[tooltip]="'annotation-actions.remove-annotation.false-positive' | translate"
[type]="buttonType"
icon="red:thumb-down"
iqserHelpMode="redaction-false-positive"
></iqser-circle-button>
<iqser-circle-button
@ -137,6 +141,7 @@
[tooltip]="'annotation-actions.remove-annotation.only-here' | translate"
[type]="buttonType"
icon="iqser:trash"
iqserHelpMode="redaction-remove-only-here"
></iqser-circle-button>
</ng-container>
</div>

View File

@ -5,6 +5,7 @@
[attr.annotation-page]="activeViewerPage"
[class.active]="isSelected(annotation.annotationId)"
[class.multi-select-active]="multiSelectService.active$ | async"
[class.help-mode]="helpModeService.isHelpModeActive$ | async"
class="annotation-wrapper"
>
<div class="active-bar-marker"></div>

View File

@ -81,7 +81,8 @@
}
}
&:hover {
&:hover,
&.help-mode {
background-color: variables.$grey-8;
::ng-deep .annotation-actions {

View File

@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, TemplateRef } from '@angular/core';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { IqserEventTarget } from '@iqser/common-ui';
import { HelpModeService, IqserEventTarget } from '@iqser/common-ui';
import { File } from '@red/domain';
import { MultiSelectService } from '../../services/multi-select.service';
@ -22,7 +22,7 @@ export class AnnotationsListComponent {
@Output() readonly selectAnnotations = new EventEmitter<AnnotationWrapper[]>();
@Output() readonly deselectAnnotations = new EventEmitter<AnnotationWrapper[]>();
constructor(readonly multiSelectService: MultiSelectService) {}
constructor(readonly multiSelectService: MultiSelectService, readonly helpModeService: HelpModeService) {}
annotationClicked(annotation: AnnotationWrapper, $event: MouseEvent): void {
if (($event.target as IqserEventTarget).localName === 'input') {

View File

@ -34,6 +34,7 @@
[tooltip]="assignTooltip"
icon="iqser:edit"
tooltipPosition="below"
iqserHelpMode="assign-reviewer"
></iqser-circle-button>
<iqser-circle-button

View File

@ -38,7 +38,6 @@
[icon]="fullScreen ? 'red:exit-fullscreen' : 'red:fullscreen'"
[tooltip]="'file-preview.fullscreen' | translate"
class="ml-2"
iqserHelpMode="assign-reviewer"
tooltipPosition="below"
></iqser-circle-button>

View File

@ -16,7 +16,7 @@
</ng-container>
<ng-template #actions (longPress)="forceReanalysisAction($event)" redactionLongPress>
<div class="file-actions">
<div class="file-actions" iqserHelpMode="document-features">
<redaction-expandable-file-actions
[actions]="buttons"
[buttonType]="buttonType"

View File

@ -83,6 +83,12 @@
"it": "",
"fr": ""
},
"edit-dossier-from-list": {
"en": "",
"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": "",
@ -136,5 +142,41 @@
"de": "",
"it": "",
"fr": ""
},
"edit-reason": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"redaction-remove-only-here": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"redaction-remove-from-dictionary": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"redaction-false-positive": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"recommendation-accept-or-reject": {
"en": "",
"de": "",
"it": "",
"fr": ""
},
"document-features": {
"en": "",
"de": "",
"it": "",
"fr": ""
}
}

@ -1 +1 @@
Subproject commit 67ae381607fa946231e44c2946a66bef1b13498f
Subproject commit 6286eea9dbfbf4f34de8da4c5ad486e555c99af7

0
package-lock.json generated Normal file
View File

View File

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

Binary file not shown.