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

minor changes

Browse Source
This commit is contained in:
Timo Bejan 2020-10-29 15:11:08 +02:00
parent cabe7f834d
commit 576a4914ff
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,7 @@
attr.annotation-id="{{ annotation.id }}"
attr.annotation-page="{{ page }}"
[ngClass]="{ active: selectedAnnotation?.id === annotation.id }"
(click)="selectAnnotation(annotation.annotation)"
(click)="selectAnnotation(annotation)"
>
<redaction-annotation-icon
[typeValue]="

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

@ -10,7 +10,7 @@ import {
import { ActivatedRoute, Router } from '@angular/router';
import { ManualRedactionEntry, ReanalysisControllerService } from '@redaction/red-ui-http';
import { AppStateService } from '../../../state/app-state.service';
import { Annotations, WebViewerInstance } from '@pdftron/webviewer';
import { WebViewerInstance } from '@pdftron/webviewer';
import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component';
import { AnnotationUtils } from '../../../utils/annotation-utils';
import { UserService } from '../../../user/user.service';
@ -235,7 +235,7 @@ export class FilePreviewScreenComponent implements OnInit {
if (this.selectedAnnotation?.pageNumber === this.activeViewerPage) {
return;
}
this._scrollAnnotationsToPage(this.activeViewerPage);
this._scrollAnnotationsToPage(this.activeViewerPage, 'always');
}
private _scrollAnnotationsToPage(page: number, mode: 'always' | 'if-needed' = 'if-needed') {
@ -483,9 +483,11 @@ export class FilePreviewScreenComponent implements OnInit {
}
private _getColor(manualRedactionEntry: ManualRedactionEntry) {
// if you're the owner, use the request color, otherwise use the actual dict color
const color = this.appStateService.isActiveProjectOwner
? this.appStateService.getDictionaryColor('request')
: this.appStateService.getDictionaryColor(manualRedactionEntry.type);
? this.appStateService.getDictionaryColor(manualRedactionEntry.type)
: this.appStateService.getDictionaryColor('request');
const rgbColor = hexToRgb(color);
return new this.activeViewer.Annotations.Color(rgbColor.r, rgbColor.g, rgbColor.b);
}